Merge branch 'pentool' into brushtool

Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
author: Pushkar Joshi 2012-02-24 12:08:49 -0800
committer: Pushkar Joshi 2012-02-24 12:08:49 -0800
commit: 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
tree: c51112223ceb9121cd595a60335eb2795215590f /js/io/ui/cloudpopup.reel/cloudpopup.html
parent: fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent: 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
download: ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
1 files changed, 66 insertions, 0 deletions
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
new file mode 100755
index 00000000..e58041ec
--- /dev/null
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<!-- <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> -->
+ 
+<html lang="en">
+        <head>
+        
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        
+        <link rel="stylesheet" type="text/css" href="css/cloudpopup.css">
+                
+                <script type="text/montage-serialization">
+        {
+            "owner": {
+                "module": "js/io/ui/cloudpopup.reel",
+                "name": "cloudpopup",
+                "properties": {
+                    "element": {"#": "cloud_popup"}
+                }
+            }
+        }
+                </script>
+                
+        </head>
+        
+        <body>
+    
+        <div id="cloud_popup" class="cloud_popup">
+                <div class="content">
+                        
+                        <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>
+                        
+                        <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>
+                        
+                        <label>Status:</label><div class="status">&nbsp;</div>
+                        
+                        <button class="btn_cancel nj-skinned">Cancel</button>
+                        
+                        <button class="btn_ok nj-skinned">Ok</button>
+                        
+                        <section>
+                                
+                                <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>
+                                
+                                <div class="cloud_icon"></div>
+                                
+                                <button class="btn_download nj-skinned">Download</button>
+                                
+                        </section>
+                        
+                </div>
+        </div>
+    
+        </body>
+</html>
+\ No newline at end of file
author	Pushkar Joshi	2012-02-24 12:08:49 -0800
committer	Pushkar Joshi	2012-02-24 12:08:49 -0800
commit	03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
tree	c51112223ceb9121cd595a60335eb2795215590f /js/io/ui/cloudpopup.reel/cloudpopup.html
parent	fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent	053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
download	ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz

diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html new file mode 100755 index 00000000..e58041ec --- /dev/null +++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -0,0 +1,66 @@
	1	<!DOCTYPE html>
	2
	3	<!-- <copyright>
	4	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
	5	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
	6	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
	7	</copyright> -->
	8
	9	<html lang="en">
	10	<head>
	11
	12	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
	13
	14	<link rel="stylesheet" type="text/css" href="css/cloudpopup.css">
	15
	16	<script type="text/montage-serialization">
	17	{
	18	"owner": {
	19	"module": "js/io/ui/cloudpopup.reel",
	20	"name": "cloudpopup",
	21	"properties": {
	22	"element": {"#": "cloud_popup"}
	23	}
	24	}
	25	}
	26	</script>
	27
	28	</head>
	29
	30	<body>
	31
	32	<div id="cloud_popup" class="cloud_popup">
	33	<div class="content">
	34
	35	<h3>Cloud Service Dialog</h3>
	36
	37	<p>Connection to the Cloud Server was not detected. Please verify <br />that the server is running and the URL below is correct.</p>
	38
	39	<label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="" />
	40
	41	<button class="btn_test nj-skinned">Test</button>
	42
	43	<label>Status:</label><div class="status"> </div>
	44
	45	<button class="btn_cancel nj-skinned">Cancel</button>
	46
	47	<button class="btn_ok nj-skinned">Ok</button>
	48
	49	<section>
	50
	51	<h4>Install Ninja Cloud App</h4>
	52
	53	<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>
	54
	55	<div class="cloud_icon"></div>
	56
	57	<button class="btn_download nj-skinned">Download</button>
	58
	59	</section>
	60
	61	</div>
	62	</div>
	63
	64	</body>
	65
	66	</html> \ No newline at end of file