Merge pull request #1503 from ajaxorg/ui/save_as

Fix saveas dialog
gero3 · May 13, 2012 · 1429f8b · 1429f8b
2 parents 86cde2d + 65d9309
commit 1429f8b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     },
 
     "mappings": {
-        "ace":          ["npm", "https://github.com/ajaxorg/ace/tarball/3e404b953ec25b38f45f5f1808928e39f295dd78"],
+        "ace":          ["npm", "https://github.com/ajaxorg/ace/tarball/f4b5a13855997e60abe8b57bfcc56755ea00dc7d"],
         "apf":          ["npm", "https://github.com/ajaxorg/apf/tarball/10179a17662c221c72bb010bd7e4feda485d2b34"],
         "architect":    ["npm", "https://github.com/c9/architect/tarball/6a7069e6d1b65a515af73d1dd92757da33bfc2a9"],
         "asyncjs":      ["npm", "https://github.com/ajaxorg/async.js/tarball/0b4ed5608a32c280a7690b5f52883d8d1fc0de08"],

diff --git a/plugins-client/ext.extmgr/extmgr.xml b/plugins-client/ext.extmgr/extmgr.xml
@@ -92,6 +92,7 @@
                   "
                 />
                 <a:button
+                  class   = "btn-green"
                   caption = "Done"
                   margin = "0 0 0 10"
                   skin = "btn-default-css3"

diff --git a/plugins-client/ext.save/save.css b/plugins-client/ext.save/save.css
@@ -3,7 +3,7 @@
     color: #323232;
 }
 .lbl_filepath {
-    padding-left: 57px;
+    padding-left: 7px;
     font-size: 11px;
     color: #bababa;
     text-shadow: rgba(255, 255, 255, 1) 0px 1px 0px;

diff --git a/plugins-client/ext.save/save.xml b/plugins-client/ext.save/save.xml
@@ -62,16 +62,21 @@
             <a:hbox
               align     = "center"
               padding   = "5">
-                <a:label flex="1" class="lbl_saveas">Save as:</a:label>
+                <a:label class="lbl_saveas">Save as:</a:label>
                 <a:textbox
                   id           = "txtSaveAs"
                   flex         = "7"
                   focusselect  = "true"
                   onkeydown    = "if (event.keyCode == 13) require('ext/save/save').choosePath(lblPath.getProperty('caption') + this.getValue())" />
             </a:hbox>
-            <a:label id="lblPath" class="lbl_filepath" />
-
-            <div class="dgLikeContaier">
+            <a:hbox
+              align     = "center"
+              padding   = "5">
+                <a:label class="lbl_saveas">Where:</a:label>
+                <a:label id="lblPath" class="lbl_filepath" />
+            </a:hbox>
+
+            <div class="dgLikeContaier"  flex="1">
                 <div class="heading">Project folder</div>
                 <a:hbox
                   anchors  = "20 0 0 0"
@@ -110,7 +115,7 @@
                             action="tree-append" copy="{event.ctrlKey}" />
                     </a:tree>
                 </a:hbox>
-            </div>
+            </div> 
             <a:hbox padding="15" align="center">
                 <a:button
                   width    = "104"
@@ -133,22 +138,22 @@
                         apf.setStyleClass(trSaveAs.$ext, 'hidefiles');
                   ">Show files in tree</a:checkbox>
             </a:hbox>
-            <a:hbox
-              edge    = "23 0 10"
-              pack    = "end"
-              padding = "8">
+
+            <a:hbox edge="23 0 10" pack="end" padding = "8">
                 <a:button
-                  skin    = "btn-default-css3"
-                  onclick = "winSaveAs.hide()">
-                    Cancel
-                </a:button>
+                  skin     = "btn-default-css3"
+                  caption  = "Cancel"
+                  margin   = "0 10 0 0"
+                  onclick  = "winSaveAs.hide()"
+                />
                 <a:button
-                  class    = "btn-green"
+                  class   = "btn-green"
+                  caption = "Save"
                   default  = "2"
-                  skin     = "btn-default-css3"
-                  onclick  = "require('ext/save/save').confirmSaveAs()">
-                    Save
-                </a:button>
+                  margin = "0 0 0 10"
+                  skin = "btn-default-css3"
+                  onclick = "require('ext/save/save').confirmSaveAs()"
+                />
             </a:hbox>
         </a:vbox>
     </a:window>

diff --git a/plugins-client/ext.tabsessions/tabsessions.js b/plugins-client/ext.tabsessions/tabsessions.js
@@ -36,7 +36,7 @@ module.exports = ext.register("ext/tabsessions/tabsessions", {
             name: "savetabsession",
             hint: "save the current tab state as a new session", 
             msg: "Save tab session.",
-            bindKey: {mac: "Command-Shift-S", win: "Shift-Ctrl-S"},
+            bindKey: {mac: "Shift-Ctrl-S", win: "Shift-Ctrl-S"},
             exec: function () {
                 ext.initExtension(_self);
                 winSaveSessionAs.show();