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

author: Valerio Virgillito 2012-05-15 16:05:41 -0700
committer: Valerio Virgillito 2012-05-15 16:05:41 -0700
commit: 17bbf73c73eadf018b03bb21a7da571901b5a389 (patch)
tree: bd478adcc531685d874ec186cbb20ea277f55c61 /js/io/templates
parent: 3be58f9391cc2ef7f1d27ec69c98ea600cb93a22 (diff)
parent: 1c91748d8517656c0982c6fc194cd0010d02fb63 (diff)
download: ninja-17bbf73c73eadf018b03bb21a7da571901b5a389.tar.gz
3 files changed, 34 insertions, 9 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..8a3dbd41
--- /dev/null
+++ b/js/io/templates/files/animation.txt
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<div class="ninja-content-wrapper">
+        
+        <div class="ninja-banner">
+        
+                <!-- Created with Motorola Mobility Ninja -->
+                <!-- Ninja-Banner Dimensions@@@ -->
+        
+                <style type="text/css">
+                        .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 33b45e53..f26accf6 100755
--- a/js/io/templates/files/banner.txt
+++ b/js/io/templates/files/banner.txt
@@ -2,12 +2,11 @@
 <div class="ninja-content-wrapper">
        
-        <!-- Created with Motorola Mobility Ninja -->
-        
-        <!-- Ninja-Banner Dimensions@@@ -->
-        
        <div class="ninja-banner">
-        
+                
+                <!-- Created with Motorola Mobility Ninja -->
+                <!-- Ninja-Banner Dimensions@@@ -->
+                
                <style type="text/css">
                        .ninja-content-wrapper {}
                        .ninja-banner {}
author	Valerio Virgillito	2012-05-15 16:05:41 -0700
committer	Valerio Virgillito	2012-05-15 16:05:41 -0700
commit	17bbf73c73eadf018b03bb21a7da571901b5a389 (patch)
tree	bd478adcc531685d874ec186cbb20ea277f55c61 /js/io/templates
parent	3be58f9391cc2ef7f1d27ec69c98ea600cb93a22 (diff)
parent	1c91748d8517656c0982c6fc194cd0010d02fb63 (diff)
download	ninja-17bbf73c73eadf018b03bb21a7da571901b5a389.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..8a3dbd41 --- /dev/null +++ b/js/io/templates/files/animation.txt
@@ -0,0 +1,17 @@
		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	.ninja-content-wrapper {}
		12	.ninja-banner {}
		13	</style>
		14
		15	</div>
		16
		17	</div> \ No newline at end of file


diff --git a/js/io/templates/files/banner.txt b/js/io/templates/files/banner.txt index 33b45e53..f26accf6 100755 --- a/js/io/templates/files/banner.txt +++ b/js/io/templates/files/banner.txt
@@ -2,12 +2,11 @@
2		2
3	<div class="ninja-content-wrapper">	3	<div class="ninja-content-wrapper">
4		4
5	<!-- Created with Motorola Mobility Ninja -->
6
7	<!-- Ninja-Banner Dimensions@@@ -->
8
9	<div class="ninja-banner">	5	<div class="ninja-banner">
10		6
		7	<!-- Created with Motorola Mobility Ninja -->
		8	<!-- Ninja-Banner Dimensions@@@ -->
		9
11	<style type="text/css">	10	<style type="text/css">
12	.ninja-content-wrapper {}	11	.ninja-content-wrapper {}
13	.ninja-banner {}	12	.ninja-banner {}