aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui/new-file-dialog
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/io/ui/new-file-dialog
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/io/ui/new-file-dialog')
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html24
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html22
2 files changed, 20 insertions, 26 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 1f9d9b9f..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
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "hottextHeight": { 13 "hottextHeight": {
14 "module": "js/components/hottextunit.reel", 14 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
15 "name": "HotTextUnit",
16 "properties": { 15 "properties": {
17 "element": {"#": "templateHeight"}, 16 "element": {"#": "templateHeight"},
18 "minValue":25, 17 "minValue":25,
@@ -31,8 +30,7 @@
31 }, 30 },
32 31
33 "hottextWidth": { 32 "hottextWidth": {
34 "module": "js/components/hottextunit.reel", 33 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
35 "name": "HotTextUnit",
36 "properties": { 34 "properties": {
37 "element": {"#": "templateWidth"}, 35 "element": {"#": "templateWidth"},
38 "minValue":25, 36 "minValue":25,
@@ -51,8 +49,7 @@
51 }, 49 },
52 50
53 "fileInputField":{ 51 "fileInputField":{
54 "module": "js/io/ui/file-picker/file-input-field.reel", 52 "prototype": "js/io/ui/file-picker/file-input-field.reel",
55 "name": "FileInputField",
56 "properties": { 53 "properties": {
57 "element": {"#": "fileInputField"} 54 "element": {"#": "fileInputField"}
58 } 55 }
@@ -66,8 +63,7 @@
66 }, 63 },
67 64
68 "owner":{ 65 "owner":{
69 "module": "js/io/ui/new-file-dialog/new-file-location.reel", 66 "prototype": "js/io/ui/new-file-dialog/new-file-location.reel",
70 "name": "NewFileLocation",
71 "properties": { 67 "properties": {
72 "element": {"#": "newfileLocation"}, 68 "element": {"#": "newfileLocation"},
73 "fileInputField": {"@": "fileInputField"}, 69 "fileInputField": {"@": "fileInputField"},
@@ -78,23 +74,23 @@
78 </script> 74 </script>
79</head> 75</head>
80<body> 76<body>
81<div id="newfileLocation" class="newfileLocation"> 77<div data-montage-id="newfileLocation" class="newfileLocation">
82 <div class="templateSelection"> 78 <div class="templateSelection">
83 <div class="template"></div> 79 <div class="template"></div>
84 </div> 80 </div>
85 <div class="locationSelection"> 81 <div class="locationSelection">
86 <div> 82 <div>
87 <span class="nameText">NAME:</span> 83 <span class="nameText">NAME:</span>
88 <input id="newFileName" class="nj-skinned newFileName" type="search" value="" /> 84 <input data-montage-id="newFileName" class="nj-skinned newFileName" type="search" value="" />
89 <span class="fileExtension"></span> 85 <span class="fileExtension"></span>
90 </div> 86 </div>
91 <div> 87 <div>
92 <span>DIRECTORY:</span> 88 <span>DIRECTORY:</span>
93 <div id="fileInputField"></div> 89 <div data-montage-id="fileInputField"></div>
94 </div> 90 </div>
95 <br /> 91 <br />
96 <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>
97 <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>
98 </div> 94 </div>
99</div> 95</div>
100</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 d4043658..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
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,16 +11,14 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "newFileLocation":{ 13 "newFileLocation":{
14 "module": "js/io/ui/new-file-dialog/new-file-location.reel", 14 "prototype": "js/io/ui/new-file-dialog/new-file-location.reel",
15 "name": "NewFileLocation",
16 "properties": { 15 "properties": {
17 "element": {"#": "right-bottom"} 16 "element": {"#": "right-bottom"}
18 } 17 }
19 }, 18 },
20 19
21 "owner":{ 20 "owner":{
22 "module": "js/io/ui/new-file-dialog/new-file-options-navigator.reel", 21 "prototype": "js/io/ui/new-file-dialog/new-file-options-navigator.reel",
23 "name": "NewFileOptionsNavigator",
24 "properties": { 22 "properties": {
25 "element": {"#": "newfile"}, 23 "element": {"#": "newfile"},
26 "projectTypeTree": {"#": "projectTypeTree"}, 24 "projectTypeTree": {"#": "projectTypeTree"},
@@ -37,25 +35,25 @@
37 </script> 35 </script>
38</head> 36</head>
39<body> 37<body>
40<div id="newfile" class="newfile"> 38<div data-montage-id="newfile" class="newfile">
41 <div class="title">Create New File</div> 39 <div class="title">Create New File</div>
42 <div class="container left-nav"> 40 <div class="container left-nav">
43 <div class="projectTypeHeader"><span>Choose Type</span></div> 41 <div class="projectTypeHeader"><span>Choose Type</span></div>
44 <div id="projectTypeTree" class="projectTypeTree"></div> 42 <div data-montage-id="projectTypeTree" class="projectTypeTree"></div>
45 </div> 43 </div>
46 <div class="container right-nav"> 44 <div class="container right-nav">
47 <div id="right-top" class="right-top"> 45 <div data-montage-id="right-top" class="right-top">
48 <div id="templateIcons" class="templateIcons" style="display:block;"></div> 46 <div data-montage-id="templateIcons" class="templateIcons" style="display:block;"></div>
49 </div> 47 </div>
50 <div id="right-bottom" class="right-bottom"> 48 <div data-montage-id="right-bottom" class="right-bottom">
51 <div class="templateIcon">templateIcon</div> 49 <div class="templateIcon">templateIcon</div>
52 <div class="selections">selections</div> 50 <div class="selections">selections</div>
53 </div> 51 </div>
54 </div> 52 </div>
55 <div class="errorMsg"><span id="error" class="error"></span></div> 53 <div class="errorMsg"><span id="error" class="error"></span></div>
56 <div class="buttons"> 54 <div class="buttons">
57 <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>
58 <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>
59 </div> 57 </div>
60</div> 58</div>
61</body> 59</body>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 00:26:34 +0000