aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-07-09 15:15:04 -0700
committerJose Antonio Marquez2012-07-09 15:15:04 -0700
commita1c0c873e7ede1848a7aa090fb214af4765dbfaf (patch)
tree9f5ecf454bb3f4394200fdc9ada04213f0c23856
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-a1c0c873e7ede1848a7aa090fb214af4765dbfaf.tar.gz
Adding Google Analytics
Conflicts: index.html js/ninja.reel/ninja.html
Diffstat
-rwxr-xr-xindex.html25
-rwxr-xr-xjs/ninja.reel/ninja.html892
2 files changed, 470 insertions, 447 deletions
diff --git a/index.html b/index.html
index 1e567b9a..7a235143 100755
--- a/index.html
+++ b/index.html
@@ -281,19 +281,38 @@ POSSIBILITY OF SUCH DAMAGE.
281 } 281 }
282 } 282 }
283 </script> 283 </script>
284
285 <script type="text/javascript">
286
287 var _gaq = _gaq || [];
288 _gaq.push(['_setAccount', 'UA-33265831-1']);
289 _gaq.push(['_trackPageview']);
290
291 (function() {
292 var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
293 ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
294 var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
295 })();
296
297 </script>
284 298
285 </head> 299 </head>
286 300
287 <body> 301 <body>
302
288 <div class="mainSplashScreenContainer"> 303 <div class="mainSplashScreenContainer">
304
289 <div id="ninja_logo"></div> 305 <div id="ninja_logo"></div>
306
290 <div id="splashScreenTextBlock" class="baseSplashScreenText"> 307 <div id="splashScreenTextBlock" class="baseSplashScreenText">
291 <p class="mediumSplashScreenText">Version: <span id="splashScreenVersionNumber">0.0.0.0</span></p> 308 <p class="mediumSplashScreenText">Version: <span id="splashScreenVersionNumber">0.0.0.0</span></p>
292 <p>Copyright &copy 2012 Motorola Mobility, Inc. All rights reserved.</p> 309 <p>Copyright &copy 2012 Motorola Mobility, Inc. All rights reserved.</p>
293 <p>The Ninja application is made possible by the <a href="http://tetsubo.org/go/ninjaland" target="_blank" class="splashScreenAnchor">Ninja open source project</a> and <a href="credits.html" target="_blank" class="splashScreenAnchor">other open source software</a>.</p> 310 <p>The Ninja application is made possible by the <a href="http://tetsubo.org/go/ninjaland" target="_blank" class="splashScreenAnchor">Ninja open source project</a> and <a href="credits.html" target="_blank" class="splashScreenAnchor">other open source software</a>.</p>
294 <p>Ninja is available under <a href="license.html" target="_blank" class="splashScreenAnchor">BSD License</a>.</p> 311 <p>Ninja is available under <a href="license.html" target="_blank" class="splashScreenAnchor">BSD License</a>.</p>
295 </div> 312 </div>
313
296 </div> 314 </div>
297 </body> 315
316 </body>
298 317
299</html> 318</html>
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 05b37bba..a279ece9 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -31,482 +31,486 @@ POSSIBILITY OF SUCH DAMAGE.
31</copyright> --> 31</copyright> -->
32 32
33<html> 33<html>
34<head>
35 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
36 34
37 <link href="../../css/ninja.css" rel="stylesheet" type="text/css" media="screen"/> 35 <head>
36
37 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
38 38
39 <title>Main Ninja Component</title> 39 <link href="../../css/ninja.css" rel="stylesheet" type="text/css" media="screen"/>
40 40
41 <script type="text/montage-serialization"> 41 <title>Main Ninja Component</title>
42 {
43 "localStorage": {
44 "prototype": "js/controllers/local-storage-controller[LocalStorage]"
45 },
46 42
47 "toolsData1": { 43 <script type="text/montage-serialization">
48 "prototype": "js/data/tools-data" 44 {
49 }, 45 "localStorage": {
50 46 "prototype": "js/controllers/local-storage-controller[LocalStorage]"
51 "appModel": {
52 "prototype": "js/models/app-model",
53 "bindings": {
54 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
55 }
56 },
57
58 "materialsModel": {
59 "prototype": "js/models/materials-model"
60 },
61
62 "menu": {
63 "prototype": "js/components/menu/menu.reel",
64 "properties": {
65 "element": {"#": "mainMenuBar"}
66 }, 47 },
67 "bindings": { 48
68 "currentDocument": {"<-": "@documentList.selectedObjects.0"} 49 "toolsData1": {
69 } 50 "prototype": "js/data/tools-data"
70 }, 51 },
71 52
72 "splitter1": { 53 "appModel": {
73 "prototype": "js/panels/Splitter", 54 "prototype": "js/models/app-model",
74 "properties": { 55 "bindings": {
75 "element": {"#": "topSplitter"}, 56 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
76 "panel": {"#": "topPanelContainer"} 57 }
77 } 58 },
78 }, 59
79 60 "materialsModel": {
80 "splitter2": { 61 "prototype": "js/models/materials-model"
81 "prototype": "js/panels/Splitter", 62 },
82 "properties": { 63
83 "element": {"#": "leftSplitter"}, 64 "menu": {
84 "panel": {"#": "leftPanelContainer"} 65 "prototype": "js/components/menu/menu.reel",
85 } 66 "properties": {
86 }, 67 "element": {"#": "mainMenuBar"}
87 68 },
88 "splitter3": { 69 "bindings": {
89 "prototype": "js/panels/Splitter", 70 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
90 "properties": { 71 }
91 "element": {"#": "rightSplitter"}, 72 },
92 "panel": {"#": "rightPanelContainer"}, 73
93 "resizeBar": {"#": "rightPanelResizer"} 74 "splitter1": {
94 } 75 "prototype": "js/panels/Splitter",
95 }, 76 "properties": {
96 77 "element": {"#": "topSplitter"},
97 "splitter4": { 78 "panel": {"#": "topPanelContainer"}
98 "prototype": "js/panels/Splitter", 79 }
99 "properties": { 80 },
100 "element": {"#": "bottomSplitter"}, 81
101 "panel": {"@": "timeline"} 82 "splitter2": {
102 } 83 "prototype": "js/panels/Splitter",
103 }, 84 "properties": {
104 85 "element": {"#": "leftSplitter"},
105 "resizer1": { 86 "panel": {"#": "leftPanelContainer"}
106 "prototype": "js/panels/resize-composer", 87 }
107 "properties": { 88 },
108 "element": {"#": "rightPanelResizer"}, 89
109 "component": {"@": "owner"}, 90 "splitter3": {
110 "yAxis": false 91 "prototype": "js/panels/Splitter",
111 }, 92 "properties": {
112 "listeners": [ 93 "element": {"#": "rightSplitter"},
113 { 94 "panel": {"#": "rightPanelContainer"},
114 "type": "resizeStart", 95 "resizeBar": {"#": "rightPanelResizer"}
115 "listener": {"@": "owner"} 96 }
97 },
98
99 "splitter4": {
100 "prototype": "js/panels/Splitter",
101 "properties": {
102 "element": {"#": "bottomSplitter"},
103 "panel": {"@": "timeline"}
104 }
105 },
106
107 "resizer1": {
108 "prototype": "js/panels/resize-composer",
109 "properties": {
110 "element": {"#": "rightPanelResizer"},
111 "component": {"@": "owner"},
112 "yAxis": false
113 },
114 "listeners": [
115 {
116 "type": "resizeStart",
117 "listener": {"@": "owner"}
118 },
119 {
120 "type": "resizeMove",
121 "listener": {"@": "owner"}
122 },
123 {
124 "type": "resizeEnd",
125 "listener": {"@": "owner"}
126 }
127 ]
128 },
129
130 "resizer2": {
131 "prototype": "js/panels/resize-composer",
132 "properties": {
133 "element": {"#": "timelineResizer"},
134 "component": {"@": "owner"},
135 "xAxis": false
116 }, 136 },
117 { 137 "listeners": [
118 "type": "resizeMove", 138 {
119 "listener": {"@": "owner"} 139 "type": "resizeStart",
140 "listener": {"@": "owner"}
141 },
142 {
143 "type": "resizeMove",
144 "listener": {"@": "owner"}
145 },
146 {
147 "type": "resizeEnd",
148 "listener": {"@": "owner"}
149 }
150 ]
151 },
152
153 "resizer3": {
154 "prototype": "js/panels/resize-composer",
155 "properties": {
156 "element": {"#": "pasteboardResizer"},
157 "component": {"@": "owner"}
120 },