aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui/new-file-dialog
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 16:30:19 -0700
committerJohn Mayhew2012-05-07 16:30:19 -0700
commitdb4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/io/ui/new-file-dialog
parent843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'js/io/ui/new-file-dialog')
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html10
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html14
2 files changed, 12 insertions, 12 deletions
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
index 236b4f4e..f9a42887 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
@@ -74,23 +74,23 @@
74 </script> 74 </script>
75</head> 75</head>
76<body> 76<body>
77<div id="newfileLocation" class="newfileLocation"> 77<div data-montage-id="newfileLocation" class="newfileLocation">
78 <div class="templateSelection"> 78 <div class="templateSelection">
79 <div class="template"></div> 79 <div class="template"></div>
80 </div> 80 </div>
81 <div class="locationSelection"> 81 <div class="locationSelection">
82 <div> 82 <div>
83 <span class="nameText">NAME:</span> 83 <span class="nameText">NAME:</span>
84 <input id="newFileName" class="nj-skinned newFileName" type="search" value="" /> 84 <input data-montage-id="newFileName" class="nj-skinned newFileName" type="search" value="" />
85 <span class="fileExtension"></span> 85 <span class="fileExtension"></span>
86 </div> 86 </div>
87 <div> 87 <div>
88 <span>DIRECTORY:</span> 88 <span>DIRECTORY:</span>
89 <div id="fileInputField"></div> 89 <div data-montage-id="fileInputField"></div>
90 </div> 90 </div>
91 <br /> 91 <br />
92 <div style="display:none;"><span>WIDTH:</span><span class="templatePx" id="templateWidth"></span></div> 92 <div style="display:none;"><span>WIDTH:</span><span class="templatePx" data-montage-id="templateWidth"></span></div>
93 <div style="display:none;"><span>HEIGHT:</span><span class="templatePx" id="templateHeight"></span></div> 93 <div style="display:none;"><span>HEIGHT:</span><span class="templatePx" data-montage-id="templateHeight"></span></div>
94 </div> 94 </div>
95</div> 95</div>
96</body> 96</body>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 05:21:43 +0000