Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts: js/io/system/ninjalibrary.json
author: hwc487 2012-05-31 17:11:08 -0700
committer: hwc487 2012-05-31 17:11:08 -0700
commit: 1c445cf5d905f79937998cf2f1115594ea8c1074 (patch)
tree: 35271ad7ffec86fde9102af3dd954fa3a2974582 /js/panels/css-panel/style-sheet.reel/style-sheet.html
parent: 335ce503996e3ccbd2909086328d0a31fbd03370 (diff)
parent: 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff)
download: ninja-1c445cf5d905f79937998cf2f1115594ea8c1074.tar.gz
1 files changed, 101 insertions, 0 deletions
diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.html b/js/panels/css-panel/style-sheet.reel/style-sheet.html
new file mode 100644
index 00000000..7e27dd93
--- /dev/null
+++ b/js/panels/css-panel/style-sheet.reel/style-sheet.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<!-- <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> -->
+<html lang="en">
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <link href="style-sheet.css" rel="stylesheet" type="text/css">
+    <script type="text/montage-serialization">
+        {
+            "owner": {
+                "prototype" : "js/panels/css-panel/style-sheet.reel",
+                "properties" : {
+                    "element" : {"#" : "style-sheet-container"},
+                    "nameText": {"@": "name"},
+                    "mediaInput": {"@": "mediaInput"},
+                    "editButton": {"@": "editButton"},
+                    "editView": {"#": "style-sheet-edit"},
+                    "disableButton": {"@": "disableButton"},
+                    "deleteButton": {"@": "deleteButton"}
+                }
+            },
+            "name": {
+                "prototype": "montage/ui/dynamic-text.reel",
+                "properties": {
+                    "element": {"#": "sheet-name"},
+                    "identifier": "nameText",
+                    "defaultText": "Style sheet"
+                },
+                "bindings": {
+                    "value": {"<-": "@owner.name"}
+                }
+            },
+            "mediaInput": {
+                "prototype": "js/components/textfield.reel[TextField]",
+                "properties": {
+                    "element": {"#": "media-input"}
+                }
+            },
+            "editButton": {
+                "prototype": "montage/ui/button.reel",
+                "properties": {
+                    "element": {"#": "edit-button"},
+                    "identifier": "editButton",
+                    "label": " "
+                },
+                "listeners": [{
+                    "type": "action",
+                    "listener": {"@": "owner"}
+                }]
+            },
+            "disableButton": {
+                "prototype": "montage/ui/button.reel",
+                "properties": {
+                    "element": {"#": "disable-button"},
+                    "identifier": "disableButton",
+                    "label": "Disable"
+                },
+                "listeners": [{
+                    "type": "action",
+                    "listener": {"@": "owner"}
+                }]
+            },
+            "deleteButton": {
+                "prototype": "montage/ui/button.reel",
+                "properties": {
+                    "element": {"#": "delete-button"},
+                    "identifier": "deleteButton",
+                    "label": "Delete"
+                },
+                "listeners": [{
+                    "type": "action",
+                    "listener": {"@": "owner"}
+                }]
+            }
+        }
+    </script>
+</head>
+<body>
+<div data-montage-id="style-sheet-container" class="style-sheet-container">
+    <div class="ss-icon"></div>
+    <!--<div id="disable-checkbox"></div>-->
+    <span data-montage-id="sheet-name"></span>
+    <label>Media:</label>
+    <div data-montage-id="media-input"></div>
+    <div data-montage-id="style-sheet-edit" class="style-sheet-edit">
+        <button data-montage-id="edit-button" class="ss-edit-button"></button>
+        <button data-montage-id="delete-button" class="ss-delete-button nj-skinned"></button>
+        <button data-montage-id="disable-button" class="ss-disable-button nj-skinned"></button>
+    </div>
+</div>
+</body>
+</html>
+\ No newline at end of file
author	hwc487	2012-05-31 17:11:08 -0700
committer	hwc487	2012-05-31 17:11:08 -0700
commit	1c445cf5d905f79937998cf2f1115594ea8c1074 (patch)
tree	35271ad7ffec86fde9102af3dd954fa3a2974582 /js/panels/css-panel/style-sheet.reel/style-sheet.html
parent	335ce503996e3ccbd2909086328d0a31fbd03370 (diff)
parent	6042bdc5f2aada4412912fd01602d32c9088dc26 (diff)
download	ninja-1c445cf5d905f79937998cf2f1115594ea8c1074.tar.gz

diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.html b/js/panels/css-panel/style-sheet.reel/style-sheet.html new file mode 100644 index 00000000..7e27dd93 --- /dev/null +++ b/js/panels/css-panel/style-sheet.reel/style-sheet.html
@@ -0,0 +1,101 @@
	1	<!DOCTYPE html>
	2	<!-- <copyright>
	3	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
	4	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
	5	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
	6	</copyright> -->
	7	<html lang="en">
	8	<head>
	9	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
	10	<link href="style-sheet.css" rel="stylesheet" type="text/css">
	11	<script type="text/montage-serialization">
	12	{
	13	"owner": {
	14	"prototype" : "js/panels/css-panel/style-sheet.reel",
	15	"properties" : {
	16	"element" : {"#" : "style-sheet-container"},
	17	"nameText": {"@": "name"},
	18	"mediaInput": {"@": "mediaInput"},
	19	"editButton": {"@": "editButton"},
	20	"editView": {"#": "style-sheet-edit"},
	21	"disableButton": {"@": "disableButton"},
	22	"deleteButton": {"@": "deleteButton"}
	23	}
	24	},
	25	"name": {
	26	"prototype": "montage/ui/dynamic-text.reel",
	27	"properties": {
	28	"element": {"#": "sheet-name"},
	29	"identifier": "nameText",
	30	"defaultText": "Style sheet"
	31	},
	32	"bindings": {
	33	"value": {"<-": "@owner.name"}
	34	}
	35	},
	36	"mediaInput": {
	37	"prototype": "js/components/textfield.reel[TextField]",
	38	"properties": {
	39	"element": {"#": "media-input"}
	40	}
	41	},
	42	"editButton": {
	43	"prototype": "montage/ui/button.reel",
	44	"properties": {
	45	"element": {"#": "edit-button"},
	46	"identifier": "editButton",
	47	"label": " "
	48	},
	49	"listeners": [{
	50	"type": "action",
	51	"listener": {"@": "owner"}
	52	}]
	53
	54	},
	55	"disableButton": {
	56	"prototype": "montage/ui/button.reel",
	57	"properties": {
	58	"element": {"#": "disable-button"},
	59	"identifier": "disableButton",
	60	"label": "Disable"
	61	},
	62	"listeners": [{
	63	"type": "action",
	64	"listener": {"@": "owner"}
	65	}]
	66
	67	},
	68	"deleteButton": {
	69	"prototype": "montage/ui/button.reel",
	70	"properties": {
	71	"element": {"#": "delete-button"},
	72	"identifier": "deleteButton",
	73	"label": "Delete"
	74	},
	75	"listeners": [{
	76	"type": "action",
	77	"listener": {"@": "owner"}
	78	}]
	79
	80	}
	81	}
	82	</script>
	83	</head>
	84	<body>
	85	<div data-montage-id="style-sheet-container" class="style-sheet-container">
	86	<div class="ss-icon"></div>
	87	<!--<div id="disable-checkbox"></div>-->
	88	<span data-montage-id="sheet-name"></span>
	89	<label>Media:</label>
	90	<div data-montage-id="media-input"></div>
	91
	92	<div data-montage-id="style-sheet-edit" class="style-sheet-edit">
	93
	94	<button data-montage-id="edit-button" class="ss-edit-button"></button>
	95	<button data-montage-id="delete-button" class="ss-delete-button nj-skinned"></button>
	96	<button data-montage-id="disable-button" class="ss-disable-button nj-skinned"></button>
	97
	98	</div>
	99	</div>
	100	</body>
	101	</html> \ No newline at end of file