From 79e9e90afa0b42238d44057eb518ca50a47a4357 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Wed, 11 Apr 2012 16:18:33 -0700
Subject: Timeline: Change Master Layer configuration menu to be on click; bug
 fix: Master Layer config menu does not scroll with layers. Bug fix: New
 layers do not take into account "show only animated layers" feature.

---
 .../Timeline/TimelinePanel.reel/TimelinePanel.html | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 09c1f98c..5234b43d 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -35,7 +35,8 @@
                         "timeline_disabler" : {"#" : "timeline-disabler"},
                         "checkable_relative" : {"#" : "checkable_relative"},
                         "checkable_absolute" : {"#" : "checkable_absolute"},
-                        "checkable_animated" : {"#" : "checkable_animated"}
+                        "checkable_animated" : {"#" : "checkable_animated"},
+                        "tl_configbutton" : {"#" : "tl-configbutton"}
                     }
                 },
 
@@ -181,15 +182,18 @@
                         
                         <div id="user_layers" class="userlayers">
                             <div id="master_layer" class="masterlayer">
-                                <div>Master Layer</div>
-                                <div class="tl-configbutton">
-                                	<div class="tl-dropdown">
-										<div class="checkable checked" data-montage-id="checkable_relative">Use relative positioning</div>
-										<div class="checkable" data-montage-id="checkable_absolute">Use absolute positioning</div>
-										<div class="nj-divider divider-horizontal"></div>
-                                		<div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div>
-                                	</div>
+                                <div class="layer-master">Master Layer
+	                                <div class="tl-configbutton" data-montage-id="tl-configbutton">
+	                                	<div class="tl-dropdown">
+											<div class="checkable checked" data-montage-id="checkable_relative">Use relative positioning</div>
+											<div class="checkable" data-montage-id="checkable_absolute">Use absolute positioning</div>
+											<div class="nj-divider divider-horizontal"></div>
+	                                		<div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div>
+	                                	</div>
+	                                </div>
+                                
                                 </div>
+
                             </div>
                             <div id="container-layers" style="position: relative;" class="container-layers">
                             	<div id="container-layer"></div>
-- 
cgit v1.2.3