aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
diff options
context:
space:
mode:
authorEric Guzman2012-05-10 14:51:31 -0700
committerEric Guzman2012-05-10 14:51:31 -0700
commit39f23ad4868482f395d2e210490a2d73545a9d84 (patch)
treec702d67585f72cddf55932411e7100133bc58452 /js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
parent733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html')
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html14
1 files changed, 7 insertions, 7 deletions
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
index 58303a57..e0df60ae 100755
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
@@ -35,25 +35,25 @@
35 </script> 35 </script>
36</head> 36</head>
37<body> 37<body>
38<div id="newfile" class="newfile"> 38<div data-montage-id="newfile" class="newfile">
39 <div class="title">Create New File</div> 39 <div class="title">Create New File</div>
40 <div class="container left-nav"> 40 <div class="container left-nav">
41 <div class="projectTypeHeader"><span>Choose Type</span></div> 41 <div class="projectTypeHeader"><span>Choose Type</span></div>
42 <div id="projectTypeTree" class="projectTypeTree"></div> 42 <div data-montage-id="projectTypeTree" class="projectTypeTree"></div>
43 </div> 43 </div>
44 <div class="container right-nav"> 44 <div class="container right-nav">
45 <div id="right-top" class="right-top"> 45 <div data-montage-id="right-top" class="right-top">
46 <div id="templateIcons" class="templateIcons" style="display:block;"></div> 46 <div data-montage-id="templateIcons" class="templateIcons" style="display:block;"></div>
47 </div> 47 </div>
48 <div id="right-bottom" class="right-bottom"> 48 <div data-montage-id="right-bottom" class="right-bottom">
49 <div class="templateIcon">templateIcon</div> 49 <div class="templateIcon">templateIcon</div>
50 <div class="selections">selections</div> 50 <div class="selections">selections</div>
51 </div> 51 </div>
52 </div> 52 </div>
53 <div class="errorMsg"><span id="error" class="error"></span></div> 53 <div class="errorMsg"><span id="error" class="error"></span></div>
54 <div class="buttons"> 54 <div class="buttons">
55 <button id="cancelButton" value="CANCEL" class="nj-skinned cancelButton">Cancel</button> 55 <button data-montage-id="cancelButton" value="CANCEL" class="nj-skinned cancelButton">Cancel</button>
56 <button id="okButton" value="OK" disabled="true" class="nj-skinned okButton">Ok</button> 56 <button data-montage-id="okButton" value="OK" disabled="true" class="nj-skinned okButton">Ok</button>
57 </div> 57 </div>
58</div> 58</div>
59</body> 59</body>