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/panels/css-panel/styles-view-container.reel/styles-view-container.html
parent: 9253e2ce98d748edd8c3929f113a597923960387 (diff)
parent: d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff)
download: ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz
1 files changed, 82 insertions, 0 deletions
diff --git a/js/panels/css-panel/styles-view-container.reel/styles-view-container.html b/js/panels/css-panel/styles-view-container.reel/styles-view-container.html
new file mode 100644
index 00000000..93ac3793
--- /dev/null
+++ b/js/panels/css-panel/styles-view-container.reel/styles-view-container.html
@@ -0,0 +1,82 @@
+<!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="styles-view-container.css" rel="stylesheet" type="text/css">
+    <script type="text/montage-serialization">
+        {
+            "owner": {
+                "prototype" : "js/panels/css-panel/styles-view-container.reel",
+                "properties" : {
+                    "element" : {"#" : "container"},
+                    "ruleListContainer": {"@": "ruleListContainer" },
+                    "computedStyleView": {"@": "computedStyleView" },
+                    "substitution": {"@": "substitution" },
+                    "delegate": {"@": "stylesViewDelegate"},
+                    "toolbar": {"@": "toolbar"}
+                }
+            },
+            "substitution": {
+                "prototype": "montage/ui/substitution.reel",
+                "properties": {
+                    "element": {"#": "sub-panel-slot"},
+                    "switchComponents": {
+                        "rules": {"@": "ruleListContainer"},
+                        "computed": {"@": "computedStyleView"}
+                    }
+                },
+                "bindings": {
+                    "switchValue": { "<-": "@owner.contentPanel" }
+                }
+            },
+            "stylesViewDelegate" : {
+                "prototype": "js/panels/css-panel/styles-view-delegate",
+                "properties": {
+                    "ruleListContainer": {"@": "ruleListContainer"}
+                }
+            },
+            "ruleListContainer": {
+                "prototype": "js/panels/css-panel/rule-list-container.reel",
+                "properties": {
+                    "focusDelegate": {"@": "stylesViewDelegate"}
+                }
+            },
+            "computedStyleView": {
+                "prototype": "js/panels/CSSPanel/ComputedStyleSubPanel.reel"
+            },
+            "toolbar": {
+                "prototype": "js/components/toolbar.reel",
+                "properties": {
+                    "element": {"#": "styles-view-toolbar"},
+                    "delegate": {"@": "stylesViewDelegate" },
+                    "buttons": [
+                        {
+                            "title": "Add",
+                            "identifier": "add"
+                        },
+                        {
+                            "title": "Computed Styles",
+                            "identifier": "computed",
+                            "leftAlign": true
+                        }
+                    ]
+                }
+            }
+        }
+    </script>
+</head>
+<body>
+<div id="container" class="styles-view-container">
+    <h4 data-montage-id="no-styles-message" class="panel-message">No styles to display.</h4>
+    <div data-montage-id="sub-panel-slot" class="sub-panel-slot"></div>
+    <div class="styles-view-toolbar-container">
+        <div data-montage-id="styles-view-toolbar"></div>
+    </div>
+</div>
+</body>
+</html>
+\ No newline at end of file
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/panels/css-panel/styles-view-container.reel/styles-view-container.html
parent	9253e2ce98d748edd8c3929f113a597923960387 (diff)
parent	d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff)
download	ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz

diff --git a/js/panels/css-panel/styles-view-container.reel/styles-view-container.html b/js/panels/css-panel/styles-view-container.reel/styles-view-container.html new file mode 100644 index 00000000..93ac3793 --- /dev/null +++ b/js/panels/css-panel/styles-view-container.reel/styles-view-container.html
@@ -0,0 +1,82 @@
	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="styles-view-container.css" rel="stylesheet" type="text/css">
	11	<script type="text/montage-serialization">
	12	{
	13	"owner": {
	14	"prototype" : "js/panels/css-panel/styles-view-container.reel",
	15	"properties" : {
	16	"element" : {"#" : "container"},
	17	"ruleListContainer": {"@": "ruleListContainer" },
	18	"computedStyleView": {"@": "computedStyleView" },
	19	"substitution": {"@": "substitution" },
	20	"delegate": {"@": "stylesViewDelegate"},
	21	"toolbar": {"@": "toolbar"}
	22	}
	23	},
	24	"substitution": {
	25	"prototype": "montage/ui/substitution.reel",
	26	"properties": {
	27	"element": {"#": "sub-panel-slot"},
	28	"switchComponents": {
	29	"rules": {"@": "ruleListContainer"},
	30	"computed": {"@": "computedStyleView"}
	31	}
	32	},
	33	"bindings": {
	34	"switchValue": { "<-": "@owner.contentPanel" }
	35	}
	36	},
	37	"stylesViewDelegate" : {
	38	"prototype": "js/panels/css-panel/styles-view-delegate",
	39	"properties": {
	40	"ruleListContainer": {"@": "ruleListContainer"}
	41	}
	42	},
	43	"ruleListContainer": {
	44	"prototype": "js/panels/css-panel/rule-list-container.reel",
	45	"properties": {
	46	"focusDelegate": {"@": "stylesViewDelegate"}
	47	}
	48	},
	49	"computedStyleView": {
	50	"prototype": "js/panels/CSSPanel/ComputedStyleSubPanel.reel"
	51	},
	52	"toolbar": {
	53	"prototype": "js/components/toolbar.reel",
	54	"properties": {
	55	"element": {"#": "styles-view-toolbar"},
	56	"delegate": {"@": "stylesViewDelegate" },
	57	"buttons": [
	58	{
	59	"title": "Add",
	60	"identifier": "add"
	61	},
	62	{
	63	"title": "Computed Styles",
	64	"identifier": "computed",
	65	"leftAlign": true
	66	}
	67	]
	68	}
	69	}
	70	}
	71	</script>
	72	</head>
	73	<body>
	74	<div id="container" class="styles-view-container">
	75	<h4 data-montage-id="no-styles-message" class="panel-message">No styles to display.</h4>
	76	<div data-montage-id="sub-panel-slot" class="sub-panel-slot"></div>
	77	<div class="styles-view-toolbar-container">
	78	<div data-montage-id="styles-view-toolbar"></div>
	79	</div>
	80	</div>
	81	</body>
	82	</html> \ No newline at end of file