3 files changed, 216 insertions, 36 deletions
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
index bed3acfe..39294779 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
@@ -1,8 +1,32 @@
 /* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+Copyright (c) 2012, Motorola Mobility, Inc
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+All Rights Reserved.
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+BSD License.
- </copyright> */
+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 Motorola Mobility 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
+</copyright> */
 .materials_library_panel hr {
    float: left;
@@ -15,6 +39,12 @@
    margin: 4px 0 4px 0;
 }
+.materials_library_panel .ml_tree_holder {
+    height: 200px;
+    min-height: 200px;
+    max-height: 200px;
+    overflow-y: scroll;
+}
 .ml_buttons {
    clear:both;
@@ -30,9 +60,19 @@
    cursor: pointer;
    margin: 0 1px;
    float: left;
+    width: 40px;
+}
+.ml_buttons .ml_duplicate_btn {
    width: 60px;
 }
-.ml_buttons .nj-skinned:last-child {
+.ml_buttons .ml_delete_btn {
+    width: 50px;
    float: right;
+}
+.ml_buttons .nj-skinned:hover,
+.ml_buttons .nj-skinned:active {
+    color: white;
 }
 \ No newline at end of file
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
index 6fa54495..e9a2d20d 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -1,21 +1,45 @@
 <!DOCTYPE html>
 <!-- <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+Copyright (c) 2012, Motorola Mobility, Inc
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+All Rights Reserved.
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+BSD License.
- </copyright> -->
+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 Motorola Mobility 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
+</copyright> -->
 <html lang="en">
        <head>
        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
        <link rel="stylesheet" type="text/css" href="materials-library-panel.css">
         <script type="text/montage-serialization">
        {
-            "addButton": {
+            "duplicateButton": {
                "prototype": "montage/ui/button.reel",
                "properties": {
-                    "element": {"#": "ml_add_btn"},
+                    "element": {"#": "ml_duplicate_btn"},
-                                        "enabled": false
+                                        "enabled": true
-                },
+               },
                "listeners": [
                    {
                        "type": "action",
@@ -23,11 +47,10 @@
                    }
                ]
             },
-            "copyButton": {
+            "editButton": {
                "prototype": "montage/ui/button.reel",
                "properties": {
-                    "element": {"#": "ml_copy_btn"},
+                    "element": {"#": "ml_edit_btn"}
-                                        "enabled": false
               },
                "listeners": [
                    {
@@ -82,7 +105,9 @@
                "prototype": "js/panels/Materials/materials-library-panel.reel[MaterialsLibraryPanels]",
                "properties": {
                    "element": {"#": "materials_library_panel"},
-                    "_materialInfo": {"@": "materialInfo"}
+                    "_materialInfo": {"@": "materialInfo"},
+                    "materialsController": {"@": "materialsController"},
+                    "deleteButton": {"@": "deleteButton"}
                }
            }
        }
@@ -92,16 +117,16 @@
        <body>
        <div data-montage-id="materials_library_panel" class="materials_library_panel">
-            <section data-montage-id="ml_tree_holder" class="animationsLibrary">
+            <section data-montage-id="ml_tree_holder" class="ml_tree_holder">
                <div data-montage-id="materials_library_tree"></div>
            </section>
            <hr />
            <div data-montage-id="ml_buttons" class="ml_buttons">
-                <button data-montage-id="ml_add_btn" class="nj-skinned">Add</button>
+                <button data-montage-id="ml_duplicate_btn" class="nj-skinned ml_duplicate_btn">Duplicate</button>
-                <button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button>
+                <button data-montage-id="ml_edit_btn" class="nj-skinned ml_edit_btn">Edit<

diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css index bed3acfe..39294779 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
@@ -1,8 +1,32 @@
1	/* <copyright>	1	/* <copyright>
2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>	2	Copyright (c) 2012, Motorola Mobility, Inc
3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>	3	All Rights Reserved.
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	4	BSD License.
5	</copyright> */	5
		6	Redistribution and use in source and binary forms, with or without
		7	modification, are permitted provided that the following conditions are met:
		8
		9	- Redistributions of source code must retain the above copyright notice,
		10	this list of conditions and the following disclaimer.
		11	- Redistributions in binary form must reproduce the above copyright
		12	notice, this list of conditions and the following disclaimer in the
		13	documentation and/or other materials provided with the distribution.
		14	- Neither the name of Motorola Mobility nor the names of its contributors
		15	may be used to endorse or promote products derived from this software
		16	without specific prior written permission.
		17
		18	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
		19	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		20	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		21	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
		22	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		23	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		24	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		25	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		26	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		27	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
		28	POSSIBILITY OF SUCH DAMAGE.
		29	</copyright> */
6		30
7	.materials_library_panel hr {	31	.materials_library_panel hr {
8	float: left;	32	float: left;
@@ -15,6 +39,12 @@
15	margin: 4px 0 4px 0;	39	margin: 4px 0 4px 0;
16	}	40	}
17		41
		42	.materials_library_panel .ml_tree_holder {
		43	height: 200px;
		44	min-height: 200px;
		45	max-height: 200px;
		46	overflow-y: scroll;
		47	}
18		48
19	.ml_buttons {	49	.ml_buttons {
20	clear:both;	50	clear:both;
@@ -30,9 +60,19 @@
30	cursor: pointer;	60	cursor: pointer;
31	margin: 0 1px;	61	margin: 0 1px;
32	float: left;	62	float: left;
		63	width: 40px;
		64	}
		65
		66	.ml_buttons .ml_duplicate_btn {
33	width: 60px;	67	width: 60px;
34	}	68	}
35		69
36	.ml_buttons .nj-skinned:last-child {	70	.ml_buttons .ml_delete_btn {
		71	width: 50px;
37	float: right;	72	float: right;
		73	}
		74
		75	.ml_buttons .nj-skinned:hover,
		76	.ml_buttons .nj-skinned:active {
		77	color: white;
38	} \ No newline at end of file	78	} \ No newline at end of file


diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html index 6fa54495..e9a2d20d 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -1,21 +1,45 @@
1	<!DOCTYPE html>	1	<!DOCTYPE html>
2	<!-- <copyright>	2	<!-- <copyright>
3	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>	3	Copyright (c) 2012, Motorola Mobility, Inc
4	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>	4	All Rights Reserved.
5	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	5	BSD License.
6	</copyright> -->	6
		7	Redistribution and use in source and binary forms, with or without
		8	modification, are permitted provided that the following conditions are met:
		9
		10	- Redistributions of source code must retain the above copyright notice,
		11	this list of conditions and the following disclaimer.
		12	- Redistributions in binary form must reproduce the above copyright
		13	notice, this list of conditions and the following disclaimer in the
		14	documentation and/or other materials provided with the distribution.
		15	- Neither the name of Motorola Mobility nor the names of its contributors
		16	may be used to endorse or promote products derived from this software
		17	without specific prior written permission.
		18
		19	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
		20	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		21	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		22	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
		23	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		24	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		25	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		26	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		27	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		28	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
		29	POSSIBILITY OF SUCH DAMAGE.
		30	</copyright> -->
7	<html lang="en">	31	<html lang="en">
8	<head>	32	<head>
9	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
10	<link rel="stylesheet" type="text/css" href="materials-library-panel.css">	34	<link rel="stylesheet" type="text/css" href="materials-library-panel.css">
11	<script type="text/montage-serialization">	35	<script type="text/montage-serialization">
12	{	36	{
13	"addButton": {	37	"duplicateButton": {
14	"prototype": "montage/ui/button.reel",	38	"prototype": "montage/ui/button.reel",
15	"properties": {	39	"properties": {
16	"element": {"#": "ml_add_btn"},	40	"element": {"#": "ml_duplicate_btn"},
17	"enabled": false	41	"enabled": true
18	},	42	},
19	"listeners": [	43	"listeners": [
20	{	44	{
21	"type": "action",	45	"type": "action",
@@ -23,11 +47,10 @@
23	}	47	}
24	]	48	]
25	},	49	},
26	"copyButton": {	50	"editButton": {
27	"prototype": "montage/ui/button.reel",	51	"prototype": "montage/ui/button.reel",
28	"properties": {	52	"properties": {
29	"element": {"#": "ml_copy_btn"},	53	"element": {"#": "ml_edit_btn"}
30	"enabled": false
31	},	54	},
32	"listeners": [	55	"listeners": [
33	{	56	{
@@ -82,7 +105,9 @@
82	"prototype": "js/panels/Materials/materials-library-panel.reel[MaterialsLibraryPanels]",	105	"prototype": "js/panels/Materials/materials-library-panel.reel[MaterialsLibraryPanels]",
83	"properties": {	106	"properties": {
84	"element": {"#": "materials_library_panel"},	107	"element": {"#": "materials_library_panel"},
85	"_materialInfo": {"@": "materialInfo"}	108	"_materialInfo": {"@": "materialInfo"},
		109	"materialsController": {"@": "materialsController"},
		110	"deleteButton": {"@": "deleteButton"}
86	}	111	}
87	}	112	}
88	}	113	}
@@ -92,16 +117,16 @@
92	<body>	117	<body>
93		118
94	<div data-montage-id="materials_library_panel" class="materials_library_panel">	119	<div data-montage-id="materials_library_panel" class="materials_library_panel">
95	<section data-montage-id="ml_tree_holder" class="animationsLibrary">	120	<section data-montage-id="ml_tree_holder" class="ml_tree_holder">
96	<div data-montage-id="materials_library_tree"></div>	121	<div data-montage-id="materials_library_tree"></div>
97	</section>	122	</section>
98	<hr />	123	<hr />
99	<div data-montage-id="ml_buttons" class="ml_buttons">	124	<div data-montage-id="ml_buttons" class="ml_buttons">
100	<button data-montage-id="ml_add_btn" class="nj-skinned">Add</button>	125	<button data-montage-id="ml_duplicate_btn" class="nj-skinned ml_duplicate_btn">Duplicate</button>
101	<button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button>	126	<button data-montage-id="ml_edit_btn" class="nj-skinned ml_edit_btn">Edit<