From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 27 Jan 2012 12:05:17 -0800 Subject: Merged old FileIO --- .../pickerNavigator.reel/pickerNavigator.html | 31 +++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) mode change 100644 => 100755 js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html (limited to 'js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html') diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html old mode 100644 new mode 100755 index bf421247..b4aee4b2 --- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html +++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html @@ -10,6 +10,35 @@ <link rel="stylesheet" type="text/css" href="pickerNavigator.css"> <script type="text/montage-serialization"> { + "okButton": { + "module": "montage/ui/button.reel", + "name": "Button", + "properties": { + "element": {"#": "okButton"}, + "identifier": "okButton" + }, + "listeners": [ + { + "type": "action", + "listener": {"@": "owner"} + } + ] + }, + + "cancelButton": { + "module": "montage/ui/button.reel", + "name": "Button", + "properties": { + "element": {"#": "cancelButton"}, + "identifier": "cancelButton" + }, + "listeners": [ + { + "type": "action", + "listener": {"@": "owner"} + } + ] + }, "owner":{ "module": "js/components/ui/FilePicker/pickerNavigator.reel", @@ -71,7 +100,7 @@ <input id="cancelButton" type="button" value="CANCEL" class="cancelButton" /> <input id="okButton" disabled="true" type="button" value="OK" class="okButton" /> </div> - <div id="filters" class="filters"> + <div id="filters" class="filters" style="display:block;"> <div class="dropdown hide"></div> <span class="dropdownArrow">▼</span> <span id="filterVal" class="filterVal">*.*</span> -- cgit v1.2.3 From 8504b61aefb25fdab931f02c4568916d2bf8345c Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Thu, 2 Feb 2012 00:52:44 -0800 Subject: changes to open multiple code view tabs and switch between the code views, added nj-skinned css class for the buttons in file picker, new file dialog and save as dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> --- js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html') diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html index b4aee4b2..b5da0e6e 100755 --- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html +++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html @@ -97,8 +97,8 @@ <div id="right-bottom" class="right-bottom"></div> </div> <div class="buttons"> - <input id="cancelButton" type="button" value="CANCEL" class="cancelButton" /> - <input id="okButton" disabled="true" type="button" value="OK" class="okButton" /> + <input id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" /> + <input id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" /> </div> <div id="filters" class="filters" style="display:block;"> <div class="dropdown hide"></div> -- cgit v1.2.3 From 7618cabe1945acc6392c48f3b57820f67f7973b0 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Fri, 3 Feb 2012 10:22:26 -0800 Subject: removed using montage button, since it has changed in Montafe 0.6 Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> --- .../pickerNavigator.reel/pickerNavigator.html | 30 ---------------------- 1 file changed, 30 deletions(-) (limited to 'js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html') diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html index b5da0e6e..bd427f97 100755 --- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html +++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html @@ -10,36 +10,6 @@ <link rel="stylesheet" type="text/css" href="pickerNavigator.css"> <script type="text/montage-serialization"> { - "okButton": { - "module": "montage/ui/button.reel", - "name": "Button", - "properties": { - "element": {"#": "okButton"}, - "identifier": "okButton" - }, - "listeners": [ - { - "type": "action", - "listener": {"@": "owner"} - } - ] - }, - - "cancelButton": { - "module": "montage/ui/button.reel", - "name": "Button", - "properties": { - "element": {"#": "cancelButton"}, - "identifier": "cancelButton" - }, - "listeners": [ - { - "type": "action", - "listener": {"@": "owner"} - } - ] - }, - "owner":{ "module": "js/components/ui/FilePicker/pickerNavigator.reel", "name":"PickerNavigator", -- cgit v1.2.3 From 5b6c62b7164cbde2845a3f7af810568e5ba53a6a Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Mon, 13 Feb 2012 22:39:28 -0800 Subject: File IO UI tweaks Making minor tweaks to the UI for file IO, will need to make much more at a later time. --- js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html') diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html index bd427f97..20cb0c68 100755 --- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html +++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html @@ -67,8 +67,8 @@ <div id="right-bottom" class="right-bottom"></div> </div> <div class="buttons"> - <input id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" /> - <input id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" /> + <button id="cancelButton" value="CANCEL" class="cancelButton nj-skinned">Cancel</button> + <button id="okButton" disabled="true" value="OK" class="okButton nj-skinned">Ok</button> </div> <div id="filters" class="filters" style="display:block;"> <div class="dropdown hide"></div> -- cgit v1.2.3