diff options
| author | John Mayhew | 2012-07-09 17:28:24 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-07-09 17:28:24 -0700 |
| commit | 770bcb52422742ff741a88a75ecefbeb90bc9247 (patch) | |
| tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/components/popup.reel/popup.html | |
| parent | 8c5ecaf90062f9e030386f338bdc19fd62b826c8 (diff) | |
| parent | 2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842 (diff) | |
| download | ninja-770bcb52422742ff741a88a75ecefbeb90bc9247.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
manifest.json
Diffstat (limited to 'js/components/popup.reel/popup.html')
| -rwxr-xr-x | js/components/popup.reel/popup.html | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/js/components/popup.reel/popup.html b/js/components/popup.reel/popup.html index ee468827..11b62c93 100755 --- a/js/components/popup.reel/popup.html +++ b/js/components/popup.reel/popup.html | |||
| @@ -1,25 +1,26 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility LLC. |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| 5 | BSD License. | ||
| 6 | 5 | ||
| 7 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
| 8 | modification, are permitted provided that the following conditions are met: | 7 | modification, are permitted provided that the following conditions are met: |
| 9 | 8 | ||
| 10 | - Redistributions of source code must retain the above copyright notice, | 9 | * Redistributions of source code must retain the above copyright notice, |
| 11 | this list of conditions and the following disclaimer. | 10 | this list of conditions and the following disclaimer. |
| 12 | - Redistributions in binary form must reproduce the above copyright | 11 | |
| 13 | notice, this list of conditions and the following disclaimer in the | 12 | * Redistributions in binary form must reproduce the above copyright notice, |
| 14 | documentation and/or other materials provided with the distribution. | 13 | this list of conditions and the following disclaimer in the documentation |
| 15 | - Neither the name of Motorola Mobility nor the names of its contributors | 14 | and/or other materials provided with the distribution. |
| 16 | may be used to endorse or promote products derived from this software | 15 | |
| 17 | without specific prior written permission. | 16 | * Neither the name of Motorola Mobility LLC nor the names of its |
| 17 | contributors may be used to endorse or promote products derived from this | ||
| 18 | software without specific prior written permission. | ||
| 18 | 19 | ||
| 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
| 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
| 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
| 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
| 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
| 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
| @@ -29,11 +30,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
| 29 | POSSIBILITY OF SUCH DAMAGE. | 30 | POSSIBILITY OF SUCH DAMAGE. |
| 30 | </copyright> --> | 31 | </copyright> --> |
| 31 | <html lang="en"> | 32 | <html lang="en"> |
| 32 | <head> | 33 | <head> |
| 33 | 34 | ||
| 34 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 35 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
| 35 | 36 | ||
| 36 | <link rel="stylesheet" type="text/css" href="css/popup.css"> | 37 | <link rel="stylesheet" type="text/css" href="css/popup.css"> |
| 37 | 38 | ||
| 38 | <script type="text/montage-serialization"> | 39 | <script type="text/montage-serialization"> |
| 39 | { | 40 | { |
| @@ -47,16 +48,16 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 47 | } | 48 | } |
| 48 | } | 49 | } |
| 49 | </script> | 50 | </script> |
| 50 | 51 | ||
| 51 | </head> | 52 | </head> |
| 52 | 53 | ||
| 53 | <body> | 54 | <body> |
| 54 | 55 | ||
| 55 | <div data-montage-id="default_popup" class="default_popup"> | 56 | <div data-montage-id="default_popup" class="default_popup"> |
| 56 | <div data-montage-id="tooltip" class="tooltip"><span/></div> | 57 | <div data-montage-id="tooltip" class="tooltip"><span/></div> |
| 57 | <div data-montage-id="content" class="content"></div> | 58 | <div data-montage-id="content" class="content"></div> |
| 58 | </div> | 59 | </div> |
| 59 | 60 | ||
| 60 | </body> | 61 | </body> |
| 61 | 62 | ||
| 62 | </html> | 63 | </html> |