Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into dom-architecture

author: Valerio Virgillito 2012-05-16 00:54:40 -0700
committer: Valerio Virgillito 2012-05-16 00:54:40 -0700
commit: a9672abd32c2e03b8607c1af4903c90f7ff9531c (patch)
tree: 30da60ed624d3d60b09fc04672c502bbed3b11f8 /js/io/templates
parent: 6dfe2e62b1d7a71daf097aac3a31213d564e6122 (diff)
parent: 2b21e91a3343229bb87179e08be1e532fcf9b8f9 (diff)
download: ninja-a9672abd32c2e03b8607c1af4903c90f7ff9531c.tar.gz
3 files changed, 53 insertions, 11 deletions
diff --git a/js/io/templates/descriptor.json b/js/io/templates/descriptor.json
index 0b2b70e5..9c9c4ac8 100644
--- a/js/io/templates/descriptor.json
+++ b/js/io/templates/descriptor.json
@@ -13,7 +13,7 @@
                "name":"Template",
                "uri":"/template",
                "type":"directory",
-        "children":["js/io/templates/files/banner.txt"]
+        "children":["js/io/templates/files/banner.txt", "js/io/templates/files/animation.txt"]
        },
        
        "js/io/templates/files/html.txt":{
@@ -90,7 +90,7 @@
                "uri":"js/io/templates/files/banner.txt",
                "type":"file",
        "fileExtension":".html",
-        "children":["120x600", "160x600", "200x200", "250x250", "300x250", "336x280", "550x400"]
+        "children":["120x600", "160x600", "200x200", "250x250", "300x250", "336x280"]
        },
    
    "120x600":{
@@ -123,8 +123,17 @@
        "uri": "336x280",
        "type":"file"
    },
-    "550x400":{
+    
-        "name": "Animation Default",
+    "js/io/templates/files/animation.txt":{
+                "name":"Animation",
+                "uri":"js/io/templates/files/animation.txt",
+                "type":"file",
+        "fileExtension":".html",
+        "children":["550x400"]
+        },
+        
+        "550x400":{
+        "name": "Default",
        "uri": "550x400",
        "type":"file"
    }
diff --git a/js/io/templates/files/animation.txt b/js/io/templates/files/animation.txt
new file mode 100755
index 00000000..a850f186
--- /dev/null
+++ b/js/io/templates/files/animation.txt
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<div class="ninja-content-wrapper">
+        
+        <div class="ninja-banner">
+        
+                <!-- Created with Motorola Mobility Ninja -->
+                <!-- Ninja-Banner Dimensions@@@ -->
+        
+                <style type="text/css">
+                        html, body {
+                        width: 100%;
+                        height: 100%;
+                        margin: 0;
+                        padding: 0;
+                }
+                        .ninja-content-wrapper {}
+                        .ninja-banner {}
+                </style>
+        </div>
+</div>
+\ No newline at end of file
diff --git a/js/io/templates/files/banner.txt b/js/io/templates/files/banner.txt
index fdafe4f6..fcfac14c 100755
--- a/js/io/templates/files/banner.txt
+++ b/js/io/templates/files/banner.txt
@@ -1,13 +1,23 @@
 <!DOCTYPE html>
-<div class="ninja-banner">
+<div class="ninja-content-wrapper">
        
-        <!-- Created with Motorola Mobility Ninja -->
+        <div class="ninja-banner">
-        
+                
-        <!-- Ninja-Banner Dimensions@@@ -->
+                <!-- Created with Motorola Mobility Ninja -->
+                <!-- Ninja-Banner Dimensions@@@ -->
                
-        <style type="text/css">
+                <style type="text/css">
-                .ninja-banner {}
+                        html, body {
-        </style>
+                        width: 100%;
+                        height: 100%;
+                        margin: 0;
+                        padding: 0;
+                }
+                        .ninja-content-wrapper {}
+                        .ninja-banner {}
+                </style>
+        </div>
 </div>
 \ No newline at end of file
author	Valerio Virgillito	2012-05-16 00:54:40 -0700
committer	Valerio Virgillito	2012-05-16 00:54:40 -0700
commit	a9672abd32c2e03b8607c1af4903c90f7ff9531c (patch)
tree	30da60ed624d3d60b09fc04672c502bbed3b11f8 /js/io/templates
parent	6dfe2e62b1d7a71daf097aac3a31213d564e6122 (diff)
parent	2b21e91a3343229bb87179e08be1e532fcf9b8f9 (diff)
download	ninja-a9672abd32c2e03b8607c1af4903c90f7ff9531c.tar.gz

diff --git a/js/io/templates/descriptor.json b/js/io/templates/descriptor.json index 0b2b70e5..9c9c4ac8 100644 --- a/js/io/templates/descriptor.json +++ b/js/io/templates/descriptor.json
@@ -13,7 +13,7 @@
13	"name":"Template",	13	"name":"Template",
14	"uri":"/template",	14	"uri":"/template",
15	"type":"directory",	15	"type":"directory",
16	"children":["js/io/templates/files/banner.txt"]	16	"children":["js/io/templates/files/banner.txt", "js/io/templates/files/animation.txt"]
17	},	17	},
18		18
19	"js/io/templates/files/html.txt":{	19	"js/io/templates/files/html.txt":{
@@ -90,7 +90,7 @@
90	"uri":"js/io/templates/files/banner.txt",	90	"uri":"js/io/templates/files/banner.txt",
91	"type":"file",	91	"type":"file",
92	"fileExtension":".html",	92	"fileExtension":".html",
93	"children":["120x600", "160x600", "200x200", "250x250", "300x250", "336x280", "550x400"]	93	"children":["120x600", "160x600", "200x200", "250x250", "300x250", "336x280"]
94	},	94	},
95		95
96	"120x600":{	96	"120x600":{
@@ -123,8 +123,17 @@
123	"uri": "336x280",	123	"uri": "336x280",
124	"type":"file"	124	"type":"file"
125	},	125	},
126	"550x400":{	126
127	"name": "Animation Default",	127	"js/io/templates/files/animation.txt":{
		128	"name":"Animation",
		129	"uri":"js/io/templates/files/animation.txt",
		130	"type":"file",
		131	"fileExtension":".html",
		132	"children":["550x400"]
		133	},
		134
		135	"550x400":{
		136	"name": "Default",
128	"uri": "550x400",	137	"uri": "550x400",
129	"type":"file"	138	"type":"file"
130	}	139	}


diff --git a/js/io/templates/files/animation.txt b/js/io/templates/files/animation.txt new file mode 100755 index 00000000..a850f186 --- /dev/null +++ b/js/io/templates/files/animation.txt
@@ -0,0 +1,23 @@
		1	<!DOCTYPE html>
		2
		3	<div class="ninja-content-wrapper">
		4
		5	<div class="ninja-banner">
		6
		7	<!-- Created with Motorola Mobility Ninja -->
		8	<!-- Ninja-Banner Dimensions@@@ -->
		9
		10	<style type="text/css">
		11	html, body {
		12	width: 100%;
		13	height: 100%;
		14	margin: 0;
		15	padding: 0;
		16	}
		17	.ninja-content-wrapper {}
		18	.ninja-banner {}
		19	</style>
		20
		21	</div>
		22
		23	</div> \ No newline at end of file


diff --git a/js/io/templates/files/banner.txt b/js/io/templates/files/banner.txt index fdafe4f6..fcfac14c 100755 --- a/js/io/templates/files/banner.txt +++ b/js/io/templates/files/banner.txt
@@ -1,13 +1,23 @@
1	<!DOCTYPE html>	1	<!DOCTYPE html>
2		2
3	<div class="ninja-banner">	3	<div class="ninja-content-wrapper">
4		4
5	<!-- Created with Motorola Mobility Ninja -->	5	<div class="ninja-banner">
6		6
7	<!-- Ninja-Banner Dimensions@@@ -->	7	<!-- Created with Motorola Mobility Ninja -->
		8	<!-- Ninja-Banner Dimensions@@@ -->
8		9
9	<style type="text/css">	10	<style type="text/css">
10	.ninja-banner {}	11	html, body {
11	</style>	12	width: 100%;
		13	height: 100%;
		14	margin: 0;
		15	padding: 0;
		16	}
		17	.ninja-content-wrapper {}
		18	.ninja-banner {}
		19	</style>
		20
		21	</div>
12		22
13	</div> \ No newline at end of file	23	</div> \ No newline at end of file