Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
author: Jonathan Duran 2012-05-31 08:54:48 -0700
committer: Jonathan Duran 2012-05-31 08:54:48 -0700
commit: f297093b5bfa62c9832829751a12f0e556bb5cc0 (patch)
tree: 6e04cdf142cb1b36e2197970c9dc2141017a2be7 /js/io/templates
parent: 9253e2ce98d748edd8c3929f113a597923960387 (diff)
parent: d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff)
download: ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz
4 files changed, 111 insertions, 4 deletions
diff --git a/js/io/templates/descriptor.json b/js/io/templates/descriptor.json
index 21c4b58c..9c9c4ac8 100644
--- a/js/io/templates/descriptor.json
+++ b/js/io/templates/descriptor.json
@@ -1,13 +1,21 @@
 {
        "categories":{
-                "children":["/"]
+                "children":["/basic", "/template"]
        },
-        "/":{
+        
+        "/basic":{
                "name":"Blank File",
-                "uri":"/",
+                "uri":"/basic",
                "type":"directory",
        "children":["js/io/templates/files/html.txt", "js/io/templates/files/js.txt", "js/io/templates/files/css.txt", "js/io/templates/files/json.txt", "js/io/templates/files/php.txt", "js/io/templates/files/pl.txt", "js/io/templates/files/py.txt", "js/io/templates/files/rb.txt", "js/io/templates/files/xml.txt"]
        },
+        "/template":{
+                "name":"Template",
+                "uri":"/template",
+                "type":"directory",
+        "children":["js/io/templates/files/banner.txt", "js/io/templates/files/animation.txt"]
+        },
+        
        "js/io/templates/files/html.txt":{
                "name":"HTML",
                "uri":"js/io/templates/files/html.txt",
@@ -75,6 +83,58 @@
        "name": "Basic",
        "uri": "defaultTemplate",
        "type":"file"
+    },
+    
+    "js/io/templates/files/banner.txt":{
+                "name":"Banner",
+                "uri":"js/io/templates/files/banner.txt",
+                "type":"file",
+        "fileExtension":".html",
+        "children":["120x600", "160x600", "200x200", "250x250", "300x250", "336x280"]
+        },
+    
+    "120x600":{
+        "name": "Skyscraper",
+        "uri": "120x600",
+        "type":"file"
+    },
+    "160x600":{
+        "name": "Wide Skyscraper",
+        "uri": "160x600",
+        "type":"file"
+    },
+    "200x200":{
+        "name": "Small Square",
+        "uri": "200x200",
+        "type":"file"
+    },
+    "250x250":{
+        "name": "Square",
+        "uri": "250x250",
+        "type":"file"
+    },
+    "300x250":{
+        "name": "Medium Rectangle",
+        "uri": "300x250",
+        "type":"file"
+    },
+    "336x280":{
+        "name": "Large Rectangle",
+        "uri": "336x280",
+        "type":"file"
+    },
+    
+    "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"
    }
 }
 \ No newline at end of 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
new file mode 100755
index 00000000..fcfac14c
--- /dev/null
+++ b/js/io/templates/files/banner.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/html.txt b/js/io/templates/files/html.txt
index 15641348..3449ae39 100755
--- a/js/io/templates/files/html.txt
+++ b/js/io/templates/files/html.txt
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
        <head>
author	Jonathan Duran	2012-05-31 08:54:48 -0700
committer	Jonathan Duran	2012-05-31 08:54:48 -0700
commit	f297093b5bfa62c9832829751a12f0e556bb5cc0 (patch)
tree	6e04cdf142cb1b36e2197970c9dc2141017a2be7 /js/io/templates
parent	9253e2ce98d748edd8c3929f113a597923960387 (diff)
parent	d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff)
download	ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz

diff --git a/js/io/templates/descriptor.json b/js/io/templates/descriptor.json index 21c4b58c..9c9c4ac8 100644 --- a/js/io/templates/descriptor.json +++ b/js/io/templates/descriptor.json
@@ -1,13 +1,21 @@
1	{	1	{
2	"categories":{	2	"categories":{
3	"children":["/"]	3	"children":["/basic", "/template"]
4	},	4	},
5	"/":{	5
		6	"/basic":{
6	"name":"Blank File",	7	"name":"Blank File",
7	"uri":"/",	8	"uri":"/basic",
8	"type":"directory",	9	"type":"directory",
9	"children":["js/io/templates/files/html.txt", "js/io/templates/files/js.txt", "js/io/templates/files/css.txt", "js/io/templates/files/json.txt", "js/io/templates/files/php.txt", "js/io/templates/files/pl.txt", "js/io/templates/files/py.txt", "js/io/templates/files/rb.txt", "js/io/templates/files/xml.txt"]	10	"children":["js/io/templates/files/html.txt", "js/io/templates/files/js.txt", "js/io/templates/files/css.txt", "js/io/templates/files/json.txt", "js/io/templates/files/php.txt", "js/io/templates/files/pl.txt", "js/io/templates/files/py.txt", "js/io/templates/files/rb.txt", "js/io/templates/files/xml.txt"]
10	},	11	},
		12	"/template":{
		13	"name":"Template",
		14	"uri":"/template",
		15	"type":"directory",
		16	"children":["js/io/templates/files/banner.txt", "js/io/templates/files/animation.txt"]
		17	},
		18
11	"js/io/templates/files/html.txt":{	19	"js/io/templates/files/html.txt":{
12	"name":"HTML",	20	"name":"HTML",
13	"uri":"js/io/templates/files/html.txt",	21	"uri":"js/io/templates/files/html.txt",
@@ -75,6 +83,58 @@
75	"name": "Basic",	83	"name": "Basic",
76	"uri": "defaultTemplate",	84	"uri": "defaultTemplate",
77	"type":"file"	85	"type":"file"
		86	},
		87
		88	"js/io/templates/files/banner.txt":{
		89	"name":"Banner",
		90	"uri":"js/io/templates/files/banner.txt",
		91	"type":"file",
		92	"fileExtension":".html",
		93	"children":["120x600", "160x600", "200x200", "250x250", "300x250", "336x280"]
		94	},
		95
		96	"120x600":{
		97	"name": "Skyscraper",
		98	"uri": "120x600",
		99	"type":"file"
		100	},
		101	"160x600":{
		102	"name": "Wide Skyscraper",
		103	"uri": "160x600",
		104	"type":"file"
		105	},
		106	"200x200":{
		107	"name": "Small Square",
		108	"uri": "200x200",
		109	"type":"file"
		110	},
		111	"250x250":{
		112	"name": "Square",
		113	"uri": "250x250",
		114	"type":"file"
		115	},
		116	"300x250":{
		117	"name": "Medium Rectangle",
		118	"uri": "300x250",
		119	"type":"file"
		120	},
		121	"336x280":{
		122	"name": "Large Rectangle",
		123	"uri": "336x280",
		124	"type":"file"
		125	},
		126
		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",
		137	"uri": "550x400",
		138	"type":"file"
78	}	139	}
79
80	} \ No newline at end of file	140	} \ No newline at end of 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 @@
		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 new file mode 100755 index 00000000..fcfac14c --- /dev/null +++ b/js/io/templates/files/banner.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/html.txt b/js/io/templates/files/html.txt index 15641348..3449ae39 100755 --- a/js/io/templates/files/html.txt +++ b/js/io/templates/files/html.txt
@@ -1,3 +1,4 @@
		1	<!DOCTYPE html>
1	<html>	2	<html>
2		3
3	<head>	4	<head>