diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/io/ui | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/io/ui')
6 files changed, 39 insertions, 39 deletions
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html index a75266a3..753597e7 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.html +++ b/js/io/ui/cloudpopup.reel/cloudpopup.html | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | <body> | 29 | <body> |
30 | 30 | ||
31 | <div id="cloud_popup" class="cloud_popup"> | 31 | <div data-montage-id="cloud_popup" class="cloud_popup"> |
32 | <div class="content"> | 32 | <div class="content"> |
33 | 33 | ||
34 | <h3>Cloud Service Dialog</h3> | 34 | <h3>Cloud Service Dialog</h3> |
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html index 9113eb80..c3209654 100755 --- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html +++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html | |||
@@ -30,9 +30,9 @@ | |||
30 | </script> | 30 | </script> |
31 | </head> | 31 | </head> |
32 | <body> | 32 | <body> |
33 | <div id="fileInputField" class="fileInputField"> | 33 | <div data-montage-id="fileInputField" class="fileInputField"> |
34 | <input type="search" id="newFileDirectory" class="nj-skinned newFileDirectory" /> | 34 | <input type="search" data-montage-id="newFileDirectory" class="nj-skinned newFileDirectory" /> |
35 | <span id="findDirectory" class="findDirectory"></span> | 35 | <span data-montage-id="findDirectory" class="findDirectory"></span> |
36 | </div> | 36 | </div> |
37 | </body> | 37 | </body> |
38 | </html> \ No newline at end of file | 38 | </html> \ No newline at end of file |
diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html index 7100a738..34d6b53a 100755 --- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html +++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html | |||
@@ -38,41 +38,41 @@ | |||
38 | 38 | ||
39 | </head> | 39 | </head> |
40 | <body> | 40 | <body> |
41 | <div id="picker" class="picker" style="visibility:hidden;"> | 41 | <div data-montage-id="picker" class="picker" style="visibility:hidden;"> |
42 | <div><span id="error" class="error"></span></div> | 42 | <div><span data-montage-id="error" class="error"></span></div> |
43 | <div class="pickerHeader"> | 43 | <div class="pickerHeader"> |
44 | <div class="historyArrows"> | 44 | <div class="historyArrows"> |
45 | <span id="backArrow" class="backArrow disable">◀</span> | 45 | <span data-montage-id="backArrow" class="backArrow disable">◀</span> |
46 | <span id="forwardArrow" class="forwardArrow disable">▶</span> | 46 | <span data-montage-id="forwardArrow" class="forwardArrow disable">▶</span> |
47 | </div> | 47 | </div> |
48 | <img id="reload" alt="refresh" title="refresh" width="25px" height="15px" class="reload" src="data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%24%00%00%00%16%08%06%00%00%00%A8%B2%3E%3E%00%00%00%04gAMA%00%00%D6%D8%D4OX2%00%00%00%18tEXtSoftware%00Paint.NET%20v3.30%40%84G%10%00%00%03%96IDATHK%B5%96%CBK%5BA%14%C6%13Z%84%D2B%A1%AB%82%FF%82%60%E2%2B%BAs%A1%18_%88%22f%25n*%0A%25%8A%BAiEQD%11%C4%85%DA%85%8AK%05)U%0C%8A%18%15%8A%82n%8C%8F%12%04A%17%09%D1Z%C4%92%14%91P%2Cr%3A%BF%A1%09%86%C6%DCK%AD%81%8Fsg%CE%99%EF%FBr%E7q%C7j%B9%E7W%5E%5E%FEJ%A5%5CV%AB%D5%A9b%BA%8A6%15%9F%A8%A8G%C4%E2%7D%E3ED%A7%FE%C4%5B%15%BF%A8%E6W%15%BD*~%5C%5E%5E%0E%DF76%A1%BF%B4%B4%F4YYY%D9%BB%CA%CA%CA%1F%FD%FD%FD%B2%B1%B1!'''r%7B%0B%E7%BF%FD%18%0B%07%5Cp%C2%8D%06Z)M%A9%82%D7%AAp%A7%B1%B1Q%8E%8E%8E%B4%89%C7%00%DCh%A0%85fRSN%A73%5D%15%84%26%26%26%E4%FA%FAZnnn%1E%15h%A0%85%26%DA%09%A6JJJ%D2T%C27%3B%3B%2B%D1h%F4%BFall%CC%90%0BM%B4%F1%107%A5%1C%BE%EF%EB%EB%93%AB%AB%2B%D3888%90%D6%D6V)**%92%CC%CCL%1Di%D3%0F%CF%E8%E8%A8%D8l6S%7Ch%E3A%1BR%CE%5E%B2%C8%98%D7p8l%88%8B%8B%0B-%96%93%93%23%D9%D9%D9%92%9B%9B%2Byyy%3A%C6%DA%CD%CD%CD%FA%99%1A3%9Ch%E3%01%2F%16%F5%E0%EE%ED%ED%15%84%CC%A0%BB%BB%5B%B2%B2%B2%C4%E1p%C8%D0%D0%90%EC%EE%EEJ%24%12%D1%916%FD%98%8BE3%9C%D4%E0%01%2F%96%9A%9A%9A%CF%F3%F3%F3rvvf%88%D5%D5Um%26%3F%3F_oa%88%CE%CF%CF%F58%E2%C8%C8%886B%BE%A0%A0%40%1B3%C3K%0D%1E%F0%C2%1B%FA%EE%F3%F9%24%10%08%18%A2%A5%A5EO%C3%F0%F0%B0%84B%A1%84%FA%C1%C1A%3DM1C%98%A2%D6%0C%2F5x%C0%0Bk%E8%17sx%7C%7Cl%88%E2%E2b%FD%AFwvv%12j%07%06%06%C4n%B7%EB%1CFb%C0%90%19%5Ej%F0%80%17%8B%DAr%3F%F7%F6%F6%E4%F0%F0%D0%10%2C%5ED%FC~%7FB-%A7%F0%E9%E9iR%98%E1%A5%06%0Fx%B1TWW%7F%5B%5B%5B%D3%DB%D5%08%BC!%0C%99%AD7%E2%BB%9B%87%13%2F%96%FA%FAz%DF%D4%D4%94%9E%06%23%B0%86X'%3D%3D%3D)k%C7%C7%C7%85%0D%60%C4w7%8F%07%BCX%3A%3B%3B%3F%B4%B7%B7%CB%F6%F6%B6!%E6%E6%E6%E2g%CD%F4%F4t%D2%FA%99%99%19%BD%13YO%FCk3%BC%D4%E0%01%2F%16u~8***%A2%1E%8FGo%E5T%60%60GG%87%5E%C0%9C%CE%9C%CC%18%60%0C%916%FD%9C%D0mmm%B2%B9%B9i%C8%C9X%B4%F1%80%17%EE%2Bi%5D%5D%5D%9F%DCn%B7%AC%AF%AF%1B%02S%1Cb%AC%25%C4322%E2%A0M%3Fy%EA%CC%F0Q%836%1E%F0%A2%3F%1F%C1%60%D0QWW%17%E4%AE%B2%B2%B2%92%12%5E%AFW%B6%B6%B6dqqQ_!%0A%0B%0B%F5%1B%23%D2%A6%9F%3CuF%5C%E4%D1D%1B%0F%F1%8F%ABr%F6Tm%BB7UUU%115%8F%FA%15.--%A5%04%82%BC%05%0E%B4%FD%FD%7D%1Di%D3o4%96%3C%1Ah%A1%896%1E%12%AE%20%AA%E3%B9%9A%C3%16%97%CB%15P%8EerrR%16%16%16%1E%05p%A3%81%16%9Ah'%BD%A4%A9%C4%8B%CB%CB%CB%3A%F5%01%F5%A8C*%DA%D4%D4%A4%3F%98lcv%D8C%00%07%5Cp%C2%8D%06Zh%A6%BC%C6%F2%EA%14%ECjN%DF%AA%EF%D3lCC%83%BF%B6%B66%C4%A1%F8%10%C0%01%17%9Cp%A3%F1%D74)g%BF%01%E1'%8B%DA%0F%0A%90%D8%00%00%00%00IEND%AEB%60%82" /> | 48 | <img data-montage-id="reload" alt="refresh" title="refresh" width="25px" height="15px" class="reload" src="data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%24%00%00%00%16%08%06%00%00%00%A8%B2%3E%3E%00%00%00%04gAMA%00%00%D6%D8%D4OX2%00%00%00%18tEXtSoftware%00Paint.NET%20v3.30%40%84G%10%00%00%03%96IDATHK%B5%96%CBK%5BA%14%C6%13Z%84%D2B%A1%AB%82%FF%82%60%E2%2B%BAs%A1%18_%88%22f%25n*%0A%25%8A%BAiEQD%11%C4%85%DA%85%8AK%05)U%0C%8A%18%15%8A%82n%8C%8F%12%04A%17%09%D1Z%C4%92%14%91P%2Cr%3A%BF%A1%09%86%C6%DCK%AD%81%8Fsg%CE%99%EF%FBr%E7q%C7j%B9%E7W%5E%5E%FEJ%A5%5CV%AB%D5%A9b%BA%8A6%15%9F%A8%A8G%C4%E2%7D%E3ED%A7%FE%C4%5B%15%BF%A8%E6W%15%BD*~%5C%5E%5E%0E%DF76%A1%BF%B4%B4%F4YYY%D9%BB%CA%CA%CA%1F%FD%FD%FD%B2%B1%B1!'''r%7B%0B%E7%BF%FD%18%0B%07%5Cp%C2%8D%06Z)M%A9%82%D7%AAp%A7%B1%B1Q%8E%8E%8E%B4%89%C7%00%DCh%A0%85fRSN%A73%5D%15%84%26%26%26%E4%FA%FAZnnn%1E%15h%A0%85%26%DA%09%A6JJJ%D2T%C27%3B%3B%2B%D1h%F4%BFall%CC%90%0BM%B4%F1%107%A5%1C%BE%EF%EB%EB%93%AB%AB%2B%D3888%90%D6%D6V)**%92%CC%CCL%1Di%D3%0F%CF%E8%E8%A8%D8l6S%7Ch%E3A%1BR%CE%5E%B2%C8%98%D7p8l%88%8B%8B%0B-%96%93%93%23%D9%D9%D9%92%9B%9B%2Byyy%3A%C6%DA%CD%CD%CD%FA%99%1A3%9Ch%E3%01%2F%16%F5%E0%EE%ED%ED%15%84%CC%A0%BB%BB%5B%B2%B2%B2%C4%E1p%C8%D0%D0%90%EC%EE%EEJ%24%12%D1%916%FD%98%8BE3%9C%D4%E0%01%2F%96%9A%9A%9A%CF%F3%F3%F3rvvf%88%D5%D5Um%26%3F%3F_oa%88%CE%CF%CF%F58%E2%C8%C8%886B%BE%A0%A0%40%1B3%C3K%0D%1E%F0%C2%1B%FA%EE%F3%F9%24%10%08%18%A2%A5%A5EO%C3%F0%F0%B0%84B%A1%84%FA%C1%C1A%3DM1C%98%A2%D6%0C%2F5x%C0%0Bk%E8%17sx%7C%7Cl%88%E2%E2b%FD%AFwvv%12j%07%06%06%C4n%B7%EB%1CFb%C0%90%19%5Ej%F0%80%17%8B%DAr%3F%F7%F6%F6%E4%F0%F0%D0%10%2C%5ED%FC~%7FB-%A7%F0%E9%E9iR%98%E1%A5%06%0Fx%B1TWW%7F%5B%5B%5B%D3%DB%D5%08%BC!%0C%99%AD7%E2%BB%9B%87%13%2F%96%FA%FAz%DF%D4%D4%94%9E%06%23%B0%86X'%3D%3D%3D)k%C7%C7%C7%85%0D%60%C4w7%8F%07%BCX%3A%3B%3B%3F%B4%B7%B7%CB%F6%F6%B6!%E6%E6%E6%E2g%CD%F4%F4t%D2%FA%99%99%19%BD%13YO%FCk3%BC%D4%E0%01%2F%16u~8***%A2%1E%8FGo%E5T%60%60GG%87%5E%C0%9C%CE%9C%CC%18%60%0C%916%FD%9C%D0mmm%B2%B9%B9i%C8%C9X%B4%F1%80%17%EE%2Bi%5D%5D%5D%9F%DCn%B7%AC%AF%AF%1B%02S%1Cb%AC%25%C4322%E2%A0M%3Fy%EA%CC%F0Q%836%1E%F0%A2%3F%1F%C1%60%D0QWW%17%E4%AE%B2%B2%B2%92%12%5E%AFW%B6%B6%B6dqqQ_!%0A%0B%0B%F5%1B%23%D2%A6%9F%3CuF%5C%E4%D1D%1B%0F%F1%8F%ABr%F6Tm%BB7UUU%115%8F%FA%15.--%A5%04%82%BC%05%0E%B4%FD%FD%7D%1Di%D3o4%96%3C%1Ah%A1%896%1E%12%AE%20%AA%E3%B9%9A%C3%16%97%CB%15P%8EerrR%16%16%16%1E%05p%A3%81%16%9Ah'%BD%A4%A9%C4%8B%CB%CB%CB%3A%F5%01%F5%A8C*%DA%D4%D4%A4%3F%98lcv%D8C%00%07%5Cp%C2%8D%06Zh%A6%BC%C6%F2%EA%14%ECjN%DF%AA%EF%D3lCC%83%BF%B6%B66%C4%A1%F8%10%C0%01%17%9Cp%A3%F1%D74)g%BF%01%E1'%8B%DA%0F%0A%90%D8%00%00%00%00IEND%AEB%60%82" /> |
49 | <div class="addressbar"> | 49 | <div class="addressbar"> |
50 | <input id="addressbarUri" class="nj-skinned addressbarUri" type="search" value="" /> | 50 | <input data-montage-id="addressbarUri" class="nj-skinned addressbarUri" type="search" value="" /> |
51 | <!--<span id="go" class="go">✈</span>--> | 51 | <!--<span id="go" class="go">✈</span>--> |
52 | <span class="dropdownArrow">▼</span> | 52 | <span class="dropdownArrow">▼</span> |
53 | <div class="dropdown hide"></div> | 53 | <div class="dropdown hide"></div> |
54 | </div> | 54 | </div> |
55 | <div class="viewSwitcher"> | 55 | <div class="viewSwitcher"> |
56 | <span id="iconView" class="iconView" title="icon view">¤</span> | 56 | <span data-montage-id="iconView" class="iconView" title="icon view">¤</span> |
57 | <span id="treeView" class="treeView" title="tree view">¥</span> | 57 | <span data-montage-id="treeView" class="treeView" title="tree view">¥</span> |
58 | </div> | 58 | </div> |
59 | </div> | 59 | </div> |
60 | <div id="left-nav" class="container left-nav"></div> | 60 | <div data-montage-id="left-nav" class="container left-nav"></div> |
61 | <div class="container right-nav"> | 61 | <div class="container right-nav"> |
62 | <div id="right-top" class="right-top"> | 62 | <div data-montage-id="right-top" class="right-top"> |
63 | <div id="iconViewContainer" class="iconViewContainer" style="display:block;"></div> | 63 | <div data-montage-id="iconViewContainer" class="iconViewContainer" style="display:block;"></div> |
64 | <div id="treeViewContainer" class="treeViewContainer" style="display:none;"></div> | 64 | <div data-montage-id="treeViewContainer" class="treeViewContainer" style="display:none;"></div> |
65 | </div> | 65 | </div> |
66 | <div id="right-bottom" class="right-bottom"></div> | 66 | <div data-montage-id="right-bottom" class="right-bottom"></div> |
67 | </div> | 67 | </div> |
68 | <div class="buttons"> | 68 | <div class="buttons"> |
69 | <button id="cancelButton" value="CANCEL" class="cancelButton nj-skinned">Cancel</button> | 69 | <button data-montage-id="cancelButton" value="CANCEL" class="cancelButton nj-skinned">Cancel</button> |
70 | <button id="okButton" disabled="true" value="OK" class="okButton nj-skinned">Ok</button> | 70 | <button data-montage-id="okButton" disabled="true" value="OK" class="okButton nj-skinned">Ok</button> |
71 | </div> | 71 | </div> |
72 | <div id="filters" class="filters" style="display:block;"> | 72 | <div data-montage-id="filters" class="filters" style="display:block;"> |
73 | <div class="dropdown hide"></div> | 73 | <div class="dropdown hide"></div> |
74 | <span class="dropdownArrow">▼</span> | 74 | <span class="dropdownArrow">▼</span> |
75 | <span id="filterVal" class="filterVal">*.*</span> | 75 | <span data-montage-id="filterVal" class="filterVal">*.*</span> |
76 | </div> | 76 | </div> |
77 | </div> | 77 | </div> |
78 | </body> | 78 | </body> |
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> |