diff options
author | Ananya Sen | 2012-07-09 16:52:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-07-09 16:52:49 -0700 |
commit | 2eb84584f44b8c774479d1af2ee1d810597474cf (patch) | |
tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/io/ui | |
parent | bf9dba001ec84243e2f12cd13b0c0ae020fba4a2 (diff) | |
parent | cee0deca695359ab468bd06d0e05ed3b2010b338 (diff) | |
download | ninja-2eb84584f44b8c774479d1af2ee1d810597474cf.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal
Conflicts:
js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/io/ui')
23 files changed, 535 insertions, 512 deletions
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html index cd6e4c94..b1e547e1 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.html +++ b/js/io/ui/cloudpopup.reel/cloudpopup.html | |||
@@ -1,26 +1,27 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | 2 | ||
3 | <!-- <copyright> | 3 | <!-- <copyright> |
4 | Copyright (c) 2012, Motorola Mobility, Inc | 4 | Copyright (c) 2012, Motorola Mobility LLC. |
5 | All Rights Reserved. | 5 | All Rights Reserved. |
6 | BSD License. | ||
7 | 6 | ||
8 | Redistribution and use in source and binary forms, with or without | 7 | Redistribution and use in source and binary forms, with or without |
9 | modification, are permitted provided that the following conditions are met: | 8 | modification, are permitted provided that the following conditions are met: |
10 | 9 | ||
11 | - Redistributions of source code must retain the above copyright notice, | 10 | * Redistributions of source code must retain the above copyright notice, |
12 | this list of conditions and the following disclaimer. | 11 | this list of conditions and the following disclaimer. |
13 | - Redistributions in binary form must reproduce the above copyright | 12 | |
14 | notice, this list of conditions and the following disclaimer in the | 13 | * Redistributions in binary form must reproduce the above copyright notice, |
15 | documentation and/or other materials provided with the distribution. | 14 | this list of conditions and the following disclaimer in the documentation |
16 | - Neither the name of Motorola Mobility nor the names of its contributors | 15 | and/or other materials provided with the distribution. |
17 | may be used to endorse or promote products derived from this software | 16 | |
18 | without specific prior written permission. | 17 | * Neither the name of Motorola Mobility LLC nor the names of its |
18 | contributors may be used to endorse or promote products derived from this | ||
19 | software without specific prior written permission. | ||
19 | 20 | ||
20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 21 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 22 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 23 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 24 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 25 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 26 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 27 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -29,16 +30,16 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||
29 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 30 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
30 | POSSIBILITY OF SUCH DAMAGE. | 31 | POSSIBILITY OF SUCH DAMAGE. |
31 | </copyright> --> | 32 | </copyright> --> |
32 | 33 | ||
33 | <html lang="en"> | 34 | <html lang="en"> |
34 | <head> | 35 | <head> |
35 | 36 | ||
36 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 37 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
37 | 38 | ||
38 | <link rel="stylesheet" type="text/css" href="css/cloudpopup.css"> | 39 | <link rel="stylesheet" type="text/css" href="css/cloudpopup.css"> |
39 | 40 | ||
40 | <script type="text/montage-serialization"> | 41 | <script type="text/montage-serialization"> |
41 | { | 42 | { |
42 | "owner": { | 43 | "owner": { |
43 | "prototype": "js/io/ui/cloudpopup.reel[cloudpopup]", | 44 | "prototype": "js/io/ui/cloudpopup.reel[cloudpopup]", |
44 | "properties": { | 45 | "properties": { |
@@ -46,44 +47,44 @@ POSSIBILITY OF SUCH DAMAGE. | |||
46 | } | 47 | } |
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="cloud_popup" class="cloud_popup"> | 56 | <div data-montage-id="cloud_popup" class="cloud_popup"> |
56 | <div class="content"> | 57 | <div class="content"> |
57 | 58 | ||
58 | <h3>Cloud Service Dialog</h3> | 59 | <h3>Cloud Service Dialog</h3> |
59 | 60 | ||
60 | <p>Connection to the Cloud Server was not detected. Please verify <br />that the server is running and the URL below is correct.</p> | 61 | <p>Connection to the Cloud Server was not detected. Please verify <br />that the server is running and the URL below is correct.</p> |
61 | 62 | ||
62 | <label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="" /> | 63 | <label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="" /> |
63 | 64 | ||
64 | <button class="btn_test nj-skinned">Test</button> | 65 | <button class="btn_test nj-skinned">Test</button> |
65 | 66 | ||
66 | <label>Status:</label><div class="status"> </div> | 67 | <label>Status:</label><div class="status"> </div> |
67 | 68 | ||
68 | <button class="btn_cancel nj-skinned">Cancel</button> | 69 | <button class="btn_cancel nj-skinned">Cancel</button> |
69 | 70 | ||
70 | <button class="btn_ok nj-skinned">Ok</button> | 71 | <button class="btn_ok nj-skinned">Ok</button> |
71 | 72 | ||
72 | <section> | 73 | <section> |
73 | 74 | ||
74 | <h4>Install Ninja Cloud App</h4> | 75 | <h4>Install Ninja Cloud App</h4> |
75 | 76 | ||
76 | <p>The Local Cloud App is required to run Ninja. Please download and unzip the file. Start the Local Cloud and copy/paste the server URL into the field above. Click the ‘Test’ button to verify the connection.</p> | 77 | <p>The Local Cloud App is required to run Ninja. Please download and unzip the file. Start the Local Cloud and copy/paste the server URL into the field above. Click the ‘Test’ button to verify the connection.</p> |
77 | 78 | ||
78 | <div class="cloud_icon"></div> | 79 | <div class="cloud_icon"></div> |
79 | 80 | ||
80 | <button class="btn_download nj-skinned">Download</button> | 81 | <button class="btn_download nj-skinned">Download</button> |
81 | 82 | ||
82 | </section> | 83 | </section> |
83 | 84 | ||
84 | </div> | 85 | </div> |
85 | </div> | 86 | </div> |
86 | 87 | ||
87 | </body> | 88 | </body> |
88 | 89 | ||
89 | </html> | 90 | </html> |
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js index c64d8974..200eb703 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.js +++ b/js/io/ui/cloudpopup.reel/cloudpopup.js | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
8 | 7 | ||
9 | - Redistributions of source code must retain the above copyright notice, | 8 | * Redistributions of source code must retain the above copyright notice, |
10 | this list of conditions and the following disclaimer. | 9 | this list of conditions and the following disclaimer. |
11 | - Redistributions in binary form must reproduce the above copyright | 10 | |
12 | notice, this list of conditions and the following disclaimer in the | 11 | * Redistributions in binary form must reproduce the above copyright notice, |
13 | documentation and/or other materials provided with the distribution. | 12 | this list of conditions and the following disclaimer in the documentation |
14 | - Neither the name of Motorola Mobility nor the names of its contributors | 13 | and/or other materials provided with the distribution. |
15 | may be used to endorse or promote products derived from this software | 14 | |
16 | without specific prior written permission. | 15 | * Neither the name of Motorola Mobility LLC nor the names of its |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
17 | 18 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |