Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts: js/helper-classes/3D/StageLine.js
author: hwc487 2012-07-09 16:08:02 -0700
committer: hwc487 2012-07-09 16:08:02 -0700
commit: 5085d0f67df89a21715308956004164597a6ba79 (patch)
tree: 2c896163143a66331205a39b0a3b1b45d51bf12a /js/io/ui/cloudpopup.reel/cloudpopup.html
parent: 51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download: ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
1 files changed, 49 insertions, 49 deletions
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
index cd6e4c94..7bfc110e 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
@@ -29,16 +29,16 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> -->
- 
 <html lang="en">
-        <head>
+    <head>
-        
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        
-        <link rel="stylesheet" type="text/css" href="css/cloudpopup.css">
+        <link rel="stylesheet" type="text/css" href="css/cloudpopup.css">
-                
-                <script type="text/montage-serialization">
+        <script type="text/montage-serialization">
-        {
+        {
            "owner": {
                "prototype": "js/io/ui/cloudpopup.reel[cloudpopup]",
                "properties": {
@@ -46,44 +46,44 @@ POSSIBILITY OF SUCH DAMAGE.
                }
            }
        }
-                </script>
+        </script>
-                
-        </head>
+    </head>
-        
-        <body>
+    <body>
-    
-        <div data-montage-id="cloud_popup" class="cloud_popup">
+        <div data-montage-id="cloud_popup" class="cloud_popup">
-                <div class="content">
+            <div class="content">
-                        
-                        <h3>Cloud Service Dialog</h3>
+                <h3>Cloud Service Dialog</h3>
-                        
-                        <p>Connection to the Cloud Server was not detected. Please verify <br />that the server is running and the URL below is correct.</p>
+                <p>Connection to the Cloud Server was not detected. Please verify <br />that the server is running and the URL below is correct.</p>
-                        
-                        <label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="" />
+                <label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="" />
-                        
-                        <button class="btn_test nj-skinned">Test</button>
+                <button class="btn_test nj-skinned">Test</button>
-                        
-                        <label>Status:</label><div class="status">&nbsp;</div>
+                <label>Status:</label><div class="status">&nbsp;</div>
-                        
-                        <button class="btn_cancel nj-skinned">Cancel</button>
+                <button class="btn_cancel nj-skinned">Cancel</button>
-                        
-                        <button class="btn_ok nj-skinned">Ok</button>
+                <button class="btn_ok nj-skinned">Ok</button>
-                        
-                        <section>
+                <section>
-                                
-                                <h4>Install Ninja Cloud App</h4>
+                    <h4>Install Ninja Cloud App</h4>
-                                
-                                <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>
+                    <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>
-                                
-                                <div class="cloud_icon"></div>
+                    <div class="cloud_icon"></div>
-                                
-                                <button class="btn_download nj-skinned">Download</button>
+                    <button class="btn_download nj-skinned">Download</button>
-                                
-                        </section>
+                </section>
-                        
-                </div>
+            </div>
-        </div>
+        </div>
-    
-        </body>
+    </body>
 </html>
author	hwc487	2012-07-09 16:08:02 -0700
committer	hwc487	2012-07-09 16:08:02 -0700
commit	5085d0f67df89a21715308956004164597a6ba79 (patch)
tree	2c896163143a66331205a39b0a3b1b45d51bf12a /js/io/ui/cloudpopup.reel/cloudpopup.html
parent	51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download	ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz

diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html index cd6e4c94..7bfc110e 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.html +++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -1,4 +1,4 @@
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, Inc
@@ -29,16 +29,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	29	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30	POSSIBILITY OF SUCH DAMAGE.	30	POSSIBILITY OF SUCH DAMAGE.
31	</copyright> -->	31	</copyright> -->
32		32
33	<html lang="en">	33	<html lang="en">
34	<head>	34	<head>
35		35
36	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	36	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
37		37
38	<link rel="stylesheet" type="text/css" href="css/cloudpopup.css">	38	<link rel="stylesheet" type="text/css" href="css/cloudpopup.css">
39		39
40	<script type="text/montage-serialization">	40	<script type="text/montage-serialization">
41	{	41	{
42	"owner": {	42	"owner": {
43	"prototype": "js/io/ui/cloudpopup.reel[cloudpopup]",	43	"prototype": "js/io/ui/cloudpopup.reel[cloudpopup]",
44	"properties": {	44	"properties": {
@@ -46,44 +46,44 @@ POSSIBILITY OF SUCH DAMAGE.
46	}	46	}
47	}	47	}
48	}	48	}
49	</script>	49	</script>
50		50
51	</head>	51	</head>
52		52
53	<body>	53	<body>
54		54
55	<div data-montage-id="cloud_popup" class="cloud_popup">	55	<div data-montage-id="cloud_popup" class="cloud_popup">
56	<div class="content">	56	<div class="content">
57		57
58	<h3>Cloud Service Dialog</h3>	58	<h3>Cloud Service Dialog</h3>
59		59
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>	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		61
62	<label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="" />	62	<label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="" />
63		63
64	<button class="btn_test nj-skinned">Test</button>	64	<button class="btn_test nj-skinned">Test</button>
65		65
66	<label>Status:</label><div class="status"> </div>	66	<label>Status:</label><div class="status"> </div>
67		67
68	<button class="btn_cancel nj-skinned">Cancel</button>	68	<button class="btn_cancel nj-skinned">Cancel</button>
69		69
70	<button class="btn_ok nj-skinned">Ok</button>	70	<button class="btn_ok nj-skinned">Ok</button>
71		71
72	<section>	72	<section>
73		73
74	<h4>Install Ninja Cloud App</h4>	74	<h4>Install Ninja Cloud App</h4>
75		75
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>	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		77
78	<div class="cloud_icon"></div>	78	<div class="cloud_icon"></div>
79		79
80	<button class="btn_download nj-skinned">Download</button>	80	<button class="btn_download nj-skinned">Download</button>
81		81
82	</section>	82	</section>
83		83
84	</div>	84	</div>
85	</div>	85	</div>
86		86
87	</body>	87	</body>
88		88
89	</html>	89	</html>