From 4c492e2f9d01a699aba8ccdd1a2b04238749ea3c Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 10 Apr 2012 14:49:20 -0700
Subject: Timeline: New Features: Tag name now present in each layer.
 Configuration dropdown in Master Layer; Show Only Animated Layers toggle.

---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(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 9eb126e0..09c1f98c 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -32,7 +32,10 @@
                         "container_tracks" : {"#" : "container-tracks"},
                         "end_hottext" : {"@" : "endHottext"},
                         "container_layers" : {"#" : "container-layers"},
-                        "timeline_disabler" : {"#" : "timeline-disabler"}
+                        "timeline_disabler" : {"#" : "timeline-disabler"},
+                        "checkable_relative" : {"#" : "checkable_relative"},
+                        "checkable_absolute" : {"#" : "checkable_absolute"},
+                        "checkable_animated" : {"#" : "checkable_animated"}
                     }
                 },
 
@@ -179,6 +182,14 @@
                         <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>
                             </div>
                             <div id="container-layers" style="position: relative;" class="container-layers">
                             	<div id="container-layer"></div>
-- 
cgit v1.2.3