aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
diff options
context:
space:
mode:
authorJon Reid2012-04-10 14:49:20 -0700
committerJon Reid2012-04-10 14:49:20 -0700
commit4c492e2f9d01a699aba8ccdd1a2b04238749ea3c (patch)
tree070749003be8889daca52350e2b64625a2757d1d /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
parentd343c7b3f482c17176cca3ddb6e7f8753169ad48 (diff)
downloadninja-4c492e2f9d01a699aba8ccdd1a2b04238749ea3c.tar.gz
Timeline: New Features: Tag name now present in each layer. Configuration
dropdown in Master Layer; Show Only Animated Layers toggle.
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html13
1 files changed, 12 insertions, 1 deletions
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 @@
32 "container_tracks" : {"#" : "container-tracks"}, 32 "container_tracks" : {"#" : "container-tracks"},
33 "end_hottext" : {"@" : "endHottext"}, 33 "end_hottext" : {"@" : "endHottext"},
34 "container_layers" : {"#" : "container-layers"}, 34 "container_layers" : {"#" : "container-layers"},
35 "timeline_disabler" : {"#" : "timeline-disabler"} 35 "timeline_disabler" : {"#" : "timeline-disabler"},
36 "checkable_relative" : {"#" : "checkable_relative"},
37 "checkable_absolute" : {"#" : "checkable_absolute"},
38 "checkable_animated" : {"#" : "checkable_animated"}
36 } 39 }
37 }, 40 },
38 41
@@ -179,6 +182,14 @@
179 <div id="user_layers" class="userlayers"> 182 <div id="user_layers" class="userlayers">
180 <div id="master_layer" class="masterlayer"> 183 <div id="master_layer" class="masterlayer">
181 <div>Master Layer</div> 184 <div>Master Layer</div>
185 <div class="tl-configbutton">
186 <div class="tl-dropdown">
187 <div class="checkable checked" data-montage-id="checkable_relative">Use relative positioning</div>
188 <div class="checkable" data-montage-id="checkable_absolute">Use absolute positioning</div>
189 <div class="nj-divider divider-horizontal"></div>
190 <div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div>
191 </div>
192 </div>
182 </div> 193 </div>
183 <div id="container-layers" style="position: relative;" class="container-layers"> 194 <div id="container-layers" style="position: relative;" class="container-layers">
184 <div id="container-layer"></div> 195 <div id="container-layer"></div>