From e842ce3bdca5460f2dcca253e8882b5509f8a478 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Thu, 9 Feb 2012 09:29:31 -0800 Subject: Updated fav icon to the final image --- images/favicon.png | Bin 1085 -> 564 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/favicon.png b/images/favicon.png index b578b2bf..dba96b25 100644 Binary files a/images/favicon.png and b/images/favicon.png differ -- cgit v1.2.3 From 937fcd971085d53e3c44eb9554a2e8597c168f74 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Thu, 9 Feb 2012 09:30:06 -0800 Subject: fixed error with initializing and accessing the ninja version object from the main reel --- js/ninja.reel/ninja.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 90015f5a..469d38f7 100644 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js @@ -14,7 +14,7 @@ exports.Ninja = Montage.create(Component, { _preload: { value: false }, ninjaVersion: { - value: window.ninjaVersion.ninja.version + value: null }, toolsData: { value: null }, @@ -34,6 +34,7 @@ exports.Ninja = Montage.create(Component, { templateDidLoad: { value: function() { + this.ninjaVersion = window.ninjaVersion.ninja.version; this.eventManager.addEventListener( "preloadFinish", this, false); } }, -- cgit v1.2.3 From 5708e1728b92c750b9cbdf1b2ff10a8e0e46253c Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Thu, 9 Feb 2012 09:30:42 -0800 Subject: Implemented final splash screen, the credits page and the license page --- credits.html | Bin 0 -> 5692 bytes index.html | 291 ++++++++++++----------------------------------------------- license.html | 52 +++++++++++ 3 files changed, 111 insertions(+), 232 deletions(-) create mode 100644 credits.html create mode 100644 license.html diff --git a/credits.html b/credits.html new file mode 100644 index 00000000..4c7060b4 Binary files /dev/null and b/credits.html differ diff --git a/index.html b/index.html index 53bd6605..306906c2 100644 --- a/index.html +++ b/index.html @@ -8,20 +8,19 @@ - Ninja + Motorola Ninja - + @@ -340,17 +169,15 @@ - - - +
+ +
+

Version: 0.0.0.0

+

Copyright © 2012 Motorola Mobility, Inc. All rights reserved.

+

The Ninja application is made possible by the Ninja open source project and other open source software.

+

Ninja is available under BSD License.

+
+
diff --git a/license.html b/license.html new file mode 100644 index 00000000..d8fcc975 --- /dev/null +++ b/license.html @@ -0,0 +1,52 @@ + + + + + + Motorola Ninja - BSD License + + + + + + + + + + + + + + + +

Motorola Mobility, Inc. Ninja BSD License

+

Copyright © 2010-2012, Motorola Mobility, Inc. All rights reserved.

+

+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ * Neither the name of the Motorola Mobility Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+

+

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Motorola Mobility Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ + + -- cgit v1.2.3 From 42192a0ca726b1e6ef086090551693a1be1521a8 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Thu, 9 Feb 2012 10:50:57 -0800 Subject: removed null characters at the end of this file that made GIT treat it as a binary file --- credits.html | Bin 5692 -> 4148 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/credits.html b/credits.html index 4c7060b4..b2623600 100644 Binary files a/credits.html and b/credits.html differ -- cgit v1.2.3