Improving slaprunner editor with tab support

slapos/runner/static/css/editor.css

+.editor {
+    margin: 0;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+}
+
+.box_header{
+  background: #E4E4E4;
+  width: 100%;
+  height: 30px;
+  color: #737373;
+  border-bottom: 4px solid #7FAED3;
+}
+.box_header ul{float: left; padding-top: 2px; text-shadow: 0px 1px #F1F1F1;}
+.box_header li{float: left;border: 1px solid #AAB8C2;padding: 1px 5px 1px 0;margin-left: 5px; text-indent: 5px;}
+/*.box_header li:last-child{border:none}*/
+.box_header li > span{cursor: pointer; height: 20px; display: block;line-height: 20px;font-weight: bold;padding: 1px;}
+.box_header li:hover{border: 1px solid #57A1D6;background-color: #C7C7C7;}
+.box_header li:last-child{margin-right: 5px;}
+.box_header li>a{font-weight: bold; font-size:1em;display: block;padding: 2px;}
+.save_btn{background: url(../images/icon_save.png) center right no-repeat;width: 25px;}
+.expand_editor{background: url(../images/fullscreen.png) center right no-repeat;width: 23px;}
+.e_expanded{background: url(../images/fullscreen_exit.png) center right no-repeat;}
+.swith_btn{background: url(../images/gnome-session-switch.png) center right no-repeat;width: 105px;}
+.flist_btn{background: url(../images/list2_down.png) center right no-repeat;width: 26px;}
+.fmenu_btn{background: url(../images/ui_menu_blue.png) center right no-repeat;width: 58px;}
+
+#tabControl{overflow: hidden;}
+#tabControl .item{float:left; min-width: 60px; background: #D5D5D5; height: 22px; padding-top: 8px; font-size:1em;
+border-left:1px #E4E4E4 solid; cursor:pointer; color: #5C7077; text-shadow: 0px 1px #E6E6E6; position: relative;}
+#tabControl .item:hover{background: #C7C7C7;}
+#tabControl.item:last-child{margin-right:none; overflow: hidden}
+#tabControl .active{background: #7FAED3; color: #fff; text-shadow: none;}
+#tabControl .active:hover{background: #7FAED3;}
+#tabControl .item span{padding: 0 4px; display: block; float: left; text-overflow:clip; max-width: 126px; white-space:nowrap; overflow: hidden;}
+#tabControl .active span.bt_close{color: #DBDBDB;}
+#tabControl .active span.bt_close:hover{color: #fff;}
+#tabContent pre {display: none;}
+#tabContent pre.active {display: block;}
+.item-hide{display:none;}
+.bt_close {
+    text-decoration: none;
+    color: #999;
+    font-weight: bold;
+    font-size: 1em;
+    padding: 0 4px;
+    -webkit-border-radius: .2em;
+    -moz-border-radius: .2em;
+    border-radius: .2em;
+    cursor: pointer;
+}
+.bt_close:hover {
+    color: #333;
+}
+

slapos/runner/static/css/styles.css

@@ -8,7 +8,7 @@ img{border:0}
 /*YAHOO RESET FONT*/
 html{color:#000;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,select,p,blockquote,th,td{margin:0;padding:0}table{border-collapse:collapse;border-spacing:0}fieldset,img{border:0}address,button,caption,cite,code,dfn,em,input,optgroup,option,select,strong,textarea,th,var{font:inherit}del,ins{text-decoration:none}li{list-style:none}caption,th{text-align:left}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}q:before,q:after{content:''}abbr,acronym{border:0;font-variant:normal}sup{vertical-align:baseline}sub{vertical-align:baseline}legend{color:#000}body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small}select,input,textarea,button{font:99% arial,helvetica,clean,sans-serif}table{font-size:inherit;font:100%}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%}
 body{
-  background: #A2BDC5;
+  background: #8DABB4;/* #A2BDC5;*/
   height:100%;
 }
 
@@ -125,15 +125,6 @@ body {
      margin-left:5px
 }
 
-#editor, #editorViewer {
-    margin: 0;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-}
-
 #wmenu{
   margin: 1px 11px 1px 10px;
 }
@@ -164,7 +155,7 @@ body {
 }
 
 .main_head{
-    height: 15px;
+    height: 14px;
     background: url(../images/main_top.png) no-repeat;
     width: 966px;
 }
@@ -551,12 +542,10 @@ padding: 10px;height: 80px;padding-bottom:15px;}
 }
 
 .file_info{
-    margin-top:10px;
+    margin-top:5px;
     background: #e4e4e4;
     padding: 5px 10px 5px;
     box-shadow: 1px 1px 1px #888888;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
     color: #737373;
     font-weight: bold;
     text-shadow: 0px 1px #FFF;
@@ -640,26 +629,15 @@ a.no-right-border:focus{border-right:none}
 a.lshare img{
     margin: 5px;
 }
-.box_header{
-  background: #E4E4E4;
-  width: 100%;
-  height: 30px;
-  padding-top: 2px;
-  text-indent: 5px;
-  color: #737373;
-  text-shadow: 0px 1px #F1F1F1;
-  border-bottom: 3px solid #6DB9DD;
-}
-.box_header li{float: left;border: 1px solid #AAB8C2;padding: 1px 5px 1px 0;margin-left: 5px;}
-.box_header li:last-child{border:none}
-.box_header li > span{cursor: pointer; height: 22px; display: block;line-height: 22px;font-weight: bold;padding: 1px;}
-.box_header li:hover{border: 1px solid #57A1D6;background: #C7C7C7;}
-.box_header li:last-child:hover{background:none; border: none}
-.box_header li>a{font-weight: bold; font-size:15px;display: block;padding: 2px;}
-.save_btn{background: url(../images/icon_save.png) center right no-repeat;width: 60px;}
-.swith_btn{background: url(../images/gnome-session-switch.png) center right no-repeat;width: 105px;}
-.flist_btn{background: url(../images/list2_down.png) center right no-repeat;width: 26px;}
-.fmenu_btn{background: url(../images/ui_menu_blue.png) center right no-repeat;width: 58px;}
+
+#editor, #editorViewer {
+    margin: 0;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+}
 
 #error{
     padding: 0px;
@@ -790,22 +768,6 @@ padding:10px; font-size:14px; color:#03406A}
 .information{display:block; float:left; height:16px; margin-top:10px; margin-left:10px; font-weight:bold}
 .account{margin-left:60px;}
 
-.bt_close {
-    text-decoration: none;
-    color: #999;
-    font-weight: bold;
-    font-size: 16px;
-    padding: 0 4px;
-    -webkit-border-radius: .2em;
-    -moz-border-radius: .2em;
-    border-radius: .2em;
-    cursor: pointer;
-}
-.bt_close:hover {
-    background: #D6D6D6;
-    color: #333;
-}
-
 /*-------------------------ACE UPDATE------------------------*/
 .ace_search{
   width: 350px;

slapos/runner/static/js/scripts/common.js

@@ -20,6 +20,20 @@ String.prototype.trim = function () {
     return this.replace(/^\s*/, "").replace(/\s*$/, "");
 };
 
+String.prototype.hashCode = function(){
+    if (Array.prototype.reduce){
+        return this.split("").reduce(function(a,b){a=((a<<5)-a)+b.charCodeAt(0);return a&a},0);
+    }
+    var hash = 0;
+    if (this.length === 0) return hash;
+    for (var i = 0; i < this.length; i++) {
+        var character  = this.charCodeAt(i);
+        hash  = ((hash<<5)-hash)+character;
+        hash = hash & hash; // Convert to 32bit integer
+    }
+    return hash;
+}
+
 /****************************************/
 function setInput($elt) {
     "use strict";

slapos/runner/static/js/scripts/softwareFolder.js

@@ -7,9 +7,11 @@ $(document).ready(function () {
   "use strict";
 
     var viewer,
-        editor,
         modelist,
         config,
+        editorlist = Array(),
+        editorIndex = 0,
+        saveTimeOut = null,
         softwareDisplay = true,
         projectDir = $("input#project").val(),
         workdir = $("input#workdir").val(),
@@ -19,58 +21,283 @@ $(document).ready(function () {
         ajaxResult = false,
         clipboardNode = null,
         pasteMode = null,
-        selection = "",
-        edit_status = "",
-        current_file = null,
         favourite_list = new Array(),
+        editorWidth = $("#code").css("width"),
         base_path = function () {
             return softwareDisplay ? currentProject : 'workspace/';
         };
+    var MAX_TABITITLE_WIDTH = 126;
+    var TAB_EXTRA_WIDTH = 25;
+    var MIN_TABITEM_WIDTH = 61; //The minimum size of tabItem
+    var MAX_TAB_NUMBER = 10; //The maximum number of tab that could be opened
 
+    function alertStatus (jqXHR) {
+      if (jqXHR.status == 404) {
+          $("#error").Popup("Requested page not found. [404]", {type: 'error'});
+      } else if (jqXHR.status == 500) {
+          $("#error").Popup("Internal Error. Cannot respond to your request, please check your parameters", {type: 'error'});
+      } else {
+          $("#error").Popup("An Error occured: \n" + jqXHR.responseText, {type: 'error'});
+      }
+    }
+
+    // Open File in a new Tab and return status
     function openFile(file) {
-        if (send) {
-            return;
+      var status = false;
+      if (file.substr(-1) === "/" || send) {
+        return false;
       }
-        send = true;
-        edit = false;
-        if (file.substr(-1) !== "/") {
-          var info = $("#edit_info").html();
-          $("#edit_info").empty();
-          $("#edit_info").append("LOADING FILE... <img src='"+$SCRIPT_ROOT+"/static/images/loading.gif' />");
+      var hash = addTab (file, true);
+      if (hash === "") {
+        return false;
+      }
+      var activeSpan = getActiveTabTitleSelector(hash);
+      $(activeSpan).html('Loading file...');
       $.ajax({
           type: "POST",
           url: $SCRIPT_ROOT + '/getFileContent',
-            data: {file: file},
-            success: function (data) {
-                var name, start, path = file;
+          data: {file: file}
+        })
+        .done(function(data) {
+          var editor = editorlist[hash].editor;
           if (data.code === 1) {
-                    $("#edit_info").empty();
-                    name = file.split('/');
-                    if (file.length > 75) {
-                        //substring title.
-                        start = file.length - 75;
-                        path = "..." + file.substring(file.indexOf("/", (start + 1)));
-                    }
-                    $("#edit_info").append(" " + path);
             editor.getSession().setValue(data.result);
+            $(activeSpan).html(file.replace(/^.*(\\|\/|\:)/, ''));
             var mode = modelist.getModeForPath(file);
             editor.getSession().modeName = mode.name;
             editor.getSession().setMode(mode.mode);
-                    edit = true;
-                    current_file = file;
-                    $("span#edit_status").html("");
-                    edit_status = "";
-                    setCookie("EDIT_CURRENT_FILE", file);
+            editorlist[hash].busy = false;
+            status = true;
           } else {
             $("#error").Popup(data.result, {type: 'error', duration: 5000});
-                    $("#edit_info").html(info);
-                }
-                send = false;
+            $("#tabControl div.active span.bt_close").click();
           }
+        })
+        .fail(function(jqXHR, exception) {
+          alertStatus (jqXHR);
+          $("#tabControl div.active span.bt_close").click();
+        })
+        .always(function() {
+          // always
         });
+      return status;
     }
+
+    function runSaveFile(hash){
+      if ( !editorlist[hash].changed ) {
         return;
       }
+      editorlist[hash].busy = true;
+      $.ajax({
+          type: "POST",
+          url: $SCRIPT_ROOT + '/saveFileContent',
+          data: {
+              file: editorlist[hash].path,
+              content: editorlist[hash].editor.getSession().getValue()
+          }})
+        .done(function(data) {
+          if (data.code === 1) {
+            var currentSpan = getActiveTabTitleSelector(hash),
+              title = $(currentSpan).html();
+            editorlist[hash].changed = false;
+            $(currentSpan).html(title.substr(1));
+          } else {
+              $("#error").Popup(data.result, {type: 'error', duration: 5000});
+          }
+        })
+        .fail(function(jqXHR, exception) {
+          alertStatus (jqXHR);
+        })
+        .always(function() {
+          editorlist[hash].busy = false;
+        });
+    }
+
+    /******* MANAGE TAB CONTROL *****/
+
+    function getTabList () {
+      var list = [];
+      for (var x in editorlist) {
+        list.push(editorlist[x].path);
+      }
+      return list;
+    }
+
+    function saveTabList () {
+      if (saveTimeOut) clearTimeout(saveTimeOut);
+      saveTimeOut = setTimeout(function () {
+          setCookie("OPENED_TAB_LIST", getTabList().join("#"));
+        }, 2000);
+    }
+
+    function getMaxTab () {
+      var tabBarWidth = $(".box_header").width() - $(".box_header ul").width();
+      var max = (tabBarWidth - (tabBarWidth % MIN_TABITEM_WIDTH))/MIN_TABITEM_WIDTH;
+      return ( max > MAX_TAB_NUMBER ) ? MAX_TAB_NUMBER : max;
+    }
+
+    //Reduce TabItem title to have the minimal or maximal width
+    function resizeTabItems (addTab) {
+      var numberTab = $("#tabControl div.item").length;
+      var width = 0;
+      if (addTab) {
+        numberTab++;
+      }
+      if (numberTab == 0) {
+        return width;
+      }
+      var tabBarWidth = $(".box_header").width() - $(".box_header ul").width();
+      var rest = tabBarWidth % numberTab;
+      var averageWidth = ( tabBarWidth - rest )/numberTab;
+      if (averageWidth > MIN_TABITEM_WIDTH) {
+        averageWidth -= TAB_EXTRA_WIDTH;
+        width = averageWidth + rest;
+        if (averageWidth > MAX_TABITITLE_WIDTH) {
+          averageWidth = MAX_TABITITLE_WIDTH;
+          width = averageWidth;
+        }
+        $("#tabControl div.item span:nth-child(1)").each(function () {
+          $(this).css('width', averageWidth);
+        });
+        if ( !addTab && (rest !== 0) ) {
+          $("#tabControl div.item:last-child span:nth-child(1)").each(function () {
+            $(this).css('width', width);
+          });
+        }
+      }
+      return width;
+    }
+
+    //Add new tabItem
+    function addTab (path, selected) {
+      var numberTab = $("#tabControl div.item").length;
+      if ( numberTab >= getMaxTab() ) {
+        $("#error").Popup("Sorry! We cannot add more item, please close unused tab",
+            {type: 'info', duration: 5000});
+        return "";
+      }
+      var title = path.replace(/^.*(\\|\/|\:)/, '');
+      var hash =  path.hashCode() + '';
+      if (editorlist.hasOwnProperty(hash)) {
+        //this file already exist in editor. Select file and exit!
+        $("#tabControl div.item").each( function () {
+          var rel = $(this).attr('rel').split('#');
+          if ( (rel.length === 2) && (rel[1] === hash) ) {
+            $(this).click();
+            return "";
+          }
+        });
+        return "";
+      }
+      var width = resizeTabItems(true);
+      var tab  = '<div class="item" rel="' + path + '#' + hash
+                + '"><span style="width: '+ width +'px" '
+                + 'title="' + path + '">' + title + '</span>'
+                + '<span class="bt_close" title="Close this tab">×</span></div>';
+      var editorhtml = '<pre class="editor" id="editor' + (++editorIndex)
+                + '" rel="' + hash + '"></pre>';
+
+      //Add Elements
+      $("#tabControl").append(tab);
+      $("#tabContent").append(editorhtml);
+      addEditor(path, hash, 'editor'+editorIndex);
+
+      /* Change selected tab*/
+      $("#tabControl div.item:last").click(function () {
+        if ( $(this).hasClass('active') ) {
+          return false;
+        }
+        var rel = $(this).attr('rel').split('#'),
+            current = $("#tabContent pre.active").attr('rel');
+        if (current && current !== undefined) {
+          editorlist[current].isOpened = false;
+        }
+        $("#tabControl div.active").removeClass('active');
+        $("#tabContent pre.active").removeClass('active');
+        $(this).addClass('active');
+        $("#tabContent pre[rel='" + rel[1] + "']").addClass('active');
+        editorlist[rel[1]].isOpened = true;
+        editorlist[rel[1]].editor.resize();
+        return false;
+      });
+
+      /*Close Selected Tab*/
+      $("#tabControl div.item:last span.bt_close").click(function () {
+        var $tab = $(this).parent(), position = 0;
+        var rel = $tab.attr('rel').split('#');
+        //Remove tab
+        if ( $tab.hasClass('active') && $("#tabControl div.item").length > 0 ) {
+          position = ($tab.index() == 0) ? 1 : $tab.index();
+          $("#tabControl div.item:nth-child("+position+")").click();
+        }
+        editorlist[ rel[1] ].editor.destroy();
+        delete editorlist[ rel[1] ];
+        $tab.remove();
+        $("#tabContent pre[rel='" + rel[1] + "']").remove();
+        resizeTabItems ();
+        saveTabList ();
+        return false;
+      });
+      if (selected) {
+        $("#tabControl div.item:last").click();
+      }
+
+      return hash;
+    }
+
+    function addEditor (path, hash, id) {
+      var editor = ace.edit(id);
+      //Init Ace editor!!
+
+      editor.setTheme("ace/theme/crimson_editor");
+      editor.getSession().setMode("ace/mode/text");
+      editor.getSession().setTabSize(2);
+      editor.getSession().setUseSoftTabs(true);
+      editor.renderer.setHScrollBarAlwaysVisible(false);
+
+      editorlist[hash] = {editor: editor, changed: false, path: path,
+                          isOpened: false, busy: true};
+      editor.on("change", function (e) {
+        var activeToken = getActiveToken(),
+            activeSpan = getActiveTabTitleSelector();
+        if (!editorlist[activeToken].busy && !editorlist[activeToken].changed) {
+          editorlist[activeToken].changed = true;
+          $(activeSpan).html("*" + $(activeSpan).html());
+        }
+      });
+      editor.commands.addCommand({
+        name: 'myCommand',
+        bindKey: {win: 'Ctrl-S',  mac: 'Command-S'},
+        exec: function(editor) {
+          $("#save").click();
+        },
+        readOnly: false // false if this command should not apply in readOnly mode
+      });
+    }
+
+    function getCurrentEditor () {
+      var hash = $("#tabContent pre.active").attr('rel');
+      if ( editorlist.hasOwnProperty(hash) ) {
+        return editorlist[hash].editor;
+      }
+      else { return null }
+    }
+
+    function getActiveToken () {
+      return $("#tabContent pre.active").attr('rel');
+    }
+
+    function getActiveTabTitleSelector (hash) {
+      var rel = (hash) ? hash : $("#tabContent pre.active").attr('rel');
+      if ( editorlist.hasOwnProperty(rel) ) {
+        return "#tabControl div[rel='" + editorlist[rel].path + "#" + rel +
+              "']  span:nth-child(1)";
+      }
+      else { return ""; }
+    }
+
+
+    /****** END ******/
 
     function switchContent() {
         if (!softwareDisplay) {
@@ -86,7 +313,6 @@ $(document).ready(function () {
         }
         $("#info").empty();
         $("#info").append("Current work tree: " + base_path());
-        selection = "";
         clipboardNode = null;
         pasteMode = null;
     }
@@ -119,9 +345,10 @@ $(document).ready(function () {
         if (developList === null || developList.length <= 0) {
             return;
         }
+        var editor = getCurrentEditor();
         editor.navigateFileStart();
         editor.find('buildout', {caseSensitive: true, wholeWord: true});
-        if (!editor.getSelectionRange().isEmpty()) {
+        if (!getCurrentEditor().getSelectionRange().isEmpty()) {
             //editor.find("",{caseSensitive: true,wholeWord: true,regExp: true});
             //if (!editor.getSelectionRange().isEmpty()) {
                     //alert("found");
@@ -129,7 +356,8 @@ $(document).ready(function () {
             //else{alert("no found");
             //}
         } else {
-            $("#error").Popup("Can not found part [buildout]! Please make sure that you have a cfg file", {type: 'alert', duration: 3000});
+            $("#error").Popup("Can not found part [buildout]! Please make sure that you have a cfg file",
+                {type: 'alert', duration: 3000});
             return;
         }
         editor.navigateLineEnd();
@@ -139,7 +367,7 @@ $(document).ready(function () {
                 result = data.result.split('#');
                 editor.insert("\ndevelop =\n\t" + result[0] + "\n");
                 for (i = 1; i < result.length; i += 1) {
-                    editor.insert("\t" + result[i] + "\n");
+                    getCurrentEditor().insert("\t" + result[i] + "\n");
                 }
             }
         })
@@ -150,6 +378,7 @@ $(document).ready(function () {
         $("#option").click();
     }
 
+    /***** FILE TREE MANAGEMENT ******/
     // --- Implement Cut/Copy/Paste --------------------------------------------
 
     function copyPaste(action, node) {
@@ -229,7 +458,7 @@ $(document).ready(function () {
       node.setFocus();
       node.setActive();
       if (srcElement.hasClass('fancytree-folder')){
-        menu.disableContextMenuItems("#edit,#editfull,#view,#md5sum,#favorite");
+        menu.disableContextMenuItems("#edit,#view,#md5sum,#favorite");
       }
       else{
         menu.disableContextMenuItems("#nfile,#nfolder,#refresh,#paste");
@@ -254,13 +483,7 @@ $(document).ready(function () {
           }
         })
         .fail(function(jqXHR, exception) {
-          if (jqXHR.status == 404) {
-              $("#error").Popup("Requested page not found. [404]", {type: 'error'});
-          } else if (jqXHR.status == 500) {
-              $("#error").Popup("Internal Error. Cannot respond to your request, please check your parameters", {type: 'error'});
-          } else {
-              $("#error").Popup("An Error occured: \n" + jqXHR.responseText, {type: 'error'});
-          }
+          alertStatus (jqXHR);
         })
         .always(function() {
           //return result;
@@ -283,7 +506,8 @@ $(document).ready(function () {
         case "paste":
           copyPaste(action, node);
           break;
-        case "edit": openFile(node.data.path); break;
+        case "edit": openFile(node.data.path);
+          saveTabList (); break;
         case "view":
           $.colorbox.remove();
           $.ajax({
@@ -310,11 +534,6 @@ $(document).ready(function () {
             }
           });
           break;
-        case "editfull":
-          var url = $SCRIPT_ROOT+"/editFile?profile="+encodeURIComponent(node.data.path)+"&filename="+encodeURIComponent(node.title);
-          window.open(url, '_blank');
-          window.focus();
-          break;
         case "md5sum":
           getmd5sum(node.data.path);
           break;
@@ -424,6 +643,7 @@ $(document).ready(function () {
         dblclick: function(event, data) {
           if (!data.node.isFolder()){
             openFile(data.node.data.path);
+            saveTabList ();
           }
         },
         source: {
@@ -487,10 +707,13 @@ $(document).ready(function () {
       });
     }
 
+    /******* END ******/
+
     function openOnFavourite($elt){
       var index = parseInt($elt.attr('rel')),
           file = favourite_list[index];
       openFile(file);
+      saveTabList ();
       $("#filelist").click();
     }
 
@@ -519,9 +742,12 @@ $(document).ready(function () {
 
     function initEditor(){
       var tmp, filename;
-      current_file = getCookie("EDIT_CURRENT_FILE");
-      if (current_file) {
-          openFile(current_file);
+      var strList = getCookie("OPENED_TAB_LIST"), tabList;
+      if (strList) {
+        tabList = strList.split("#");
+        for (var i=0; i< tabList.length; i++) {
+          openFile(tabList[i]);
+        }
       }
       tmp = getCookie("FAV_FILE_LIST");
       if(tmp){
@@ -547,6 +773,7 @@ $(document).ready(function () {
         removeFavourite($(this));
         return false;
       });
+      saveTabList ();
     }
 
     function addToFavourite(filepath){
@@ -582,17 +809,10 @@ $(document).ready(function () {
     }
 
 
+    /************ INITIALIZE FUNTIONS CALLS  ************************/
 
-    editor = ace.edit("editor");
     modelist = require("ace/ext/modelist");
     config = require("ace/config");
-
-    editor.setTheme("ace/theme/crimson_editor");
-    editor.getSession().setMode("ace/mode/text");
-    editor.getSession().setTabSize(2);
-    editor.getSession().setUseSoftTabs(true);
-    editor.renderer.setHScrollBarAlwaysVisible(false);
-
     initTree('#fileTree', currentProject, 'pfolder');
     initTree('#fileTreeFull', 'workspace');
     //bindContextMenu('#fileTree');
@@ -603,46 +823,36 @@ $(document).ready(function () {
     $("#option").Tooltip();
     $("#filelist").Tooltip();
 
-    editor.on("change", function (e) {
-        if (edit_status === "" && edit) {
-            $("span#edit_status").html("*");
-        }
-    });
-    editor.commands.addCommand({
-      name: 'myCommand',
-      bindKey: {win: 'Ctrl-S',  mac: 'Command-S'},
-      exec: function(editor) {
-        $("#save").click();
-      },
-      readOnly: false // false if this command should not apply in readOnly mode
-    });
-
     $("#save").click(function () {
-        if (!edit) {
-            $("#error").Popup("Please select the file to edit", {type: 'alert', duration: 3000});
+      if ($("#tabControl div.item").length === 0) {
         return false;
       }
-        if (send) {
+      var hash = getActiveToken();
+      if (editorlist[hash].busy) {
           return false;
       }
-        send = true;
-        $.ajax({
-            type: "POST",
-            url: $SCRIPT_ROOT + '/saveFileContent',
-            data: {
-                file: current_file,
-                content: editor.getSession().getValue()
-            },
-            success: function (data) {
-                if (data.code === 1) {
-                    $("#error").Popup("File saved succefuly!", {type: 'confirm', duration: 3000});
-                    $("span#edit_status").html("");
-                } else {
-                    $("#error").Popup(data.result, {type: 'error', duration: 5000});
+      runSaveFile(hash);
+      return false;
+    });
+
+    $( "#tabControl" ).resize(function() {
+      resizeTabItems ();
+    });
+
+    $("#expand").click( function () {
+      if ( !$("#expand span").hasClass('e_expanded') ) {
+        $("#details_box").hide();
+        $("#code").css("width", "100%");
+        $("#expand span").addClass('e_expanded');
       }
-                send = false;
+      else {
+        $("#expand span").removeClass('e_expanded');
+        $("#details_box").show();
+        $("#code").css("width", editorWidth);
+      }
+      if ($("#tabControl div.item").length !== 0) {
+        getCurrentEditor().resize();
       }
-        });
       return false;
     });
 
@@ -656,23 +866,18 @@ $(document).ready(function () {
         return false;
     });
     $("#getmd5").click(function () {
-        getmd5sum(current_file);
+      if ($("#tabControl div.item").length === 0) {
+        return false;
+      }
+      getmd5sum(editorlist[getActiveToken()].path);
       $("#option").click();
       return false;
     });
 
-    $("#clearselect").click(function () {
-        edit = false;
-        $("#info").empty();
-        $("#info").append("Current work tree: " + base_path());
-        $("#edit_info").empty();
-        $("#edit_info").append("No file in editor");
-        editor.getSession().setValue("");
-        $("a#option").hide();
-        selection = "";
-        return false;
-    });
     $("#adddevelop").click(function () {
+      if ($("#tabControl div.item").length === 0) {
+        return false;
+      }
       var developList = [],
           i = 0;
       $("#plist li").each(function (index) {
@@ -688,23 +893,35 @@ $(document).ready(function () {
       }
       return false;
     });
-    $("a#addflist").click(function(){
-      addToFavourite(current_file);
+    $("a#addflist").click(function () {
+      if ($("#tabControl div.item").length === 0) {
+        return false;
+      }
+      addToFavourite(editorlist[getActiveToken()].path);
       $("#option").click();
       return false;
     });
 
-    $("a#find").click(function(){
-      config.loadModule("ace/ext/searchbox", function(e) {e.Search(editor)});
+    $("a#find").click(function () {
+      if ($("#tabControl div.item").length === 0) {
+        return false;
+      }
+      config.loadModule("ace/ext/searchbox", function(e) {
+        e.Search(getCurrentEditor())
+      });
       $("#option").click();
       return false;
     });
 
-    $("a#replace").click(function(){
-      config.loadModule("ace/ext/searchbox", function(e) {e.Search(editor, true)});
+    $("a#replace").click(function () {
+      if ($("#tabControl div.item").length === 0) {
+        return false;
+      }
+      config.loadModule("ace/ext/searchbox", function(e) {
+        e.Search(getCurrentEditor(), true)
+      });
       $("#option").click();
       return false;
     });
 
-
 });

slapos/runner/static/js/scripts/viewlog.js

@@ -102,7 +102,11 @@ $(document).ready(function () {
         })
         .always(function() {
           sending = false;
+          if (processState === "Stopped" || processState === "Checking" || $("#manual").is(":checked")) {
               $("#logheader").html(info);
+          } else {
+              $("#logheader").html("Inspecting slapgrid log - Click for more options");
+          }
         });
     }
 

slapos/runner/templates/softwareFolder.html

@@ -4,6 +4,7 @@
   {{ super() }}
   <link href="{{ url_for('static', filename='css/ui.fancytree.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
   <link href="{{ url_for('static', filename='css/jquery.contextMenu.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
+  <link href="{{ url_for('static', filename='css/editor.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
   <script src="{{ url_for('static', filename='js/jquery/jquery.contextMenu-custom.js') }}" type="text/javascript" charset="utf-8"></script>
   <script src="{{ url_for('static', filename='js/jquery/jquery.fancytree.min.js') }}" type="text/javascript" charset="utf-8"></script>
   <link href="{{ url_for('static', filename='css/colorbox.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
@@ -28,8 +29,7 @@
 <!-- Definition of context menu -->
 <ul id="fileTreeMenu" class="contextMenu">
   <li class="edit"><a href="#edit">Edit</a></li>
-  <li class="edit"><a href="#editfull">Open in new editor</a></li>
-  <li class="view"><a href="#view">Open in viewer</a></li>
+  <li class="view"><a href="#view">View this file</a></li>
   <li class="rename separator"><a href="#rename">Rename</a></li>
   <li class="delete "><a href="#delete">Delete</a></li>
   <li class="refresh separator"><a href="#refresh">Refresh</a></li>
@@ -41,26 +41,19 @@
   <li class="newfile separator"><a href="#nfile">New File</a></li>
   <li class="newdir"><a href="#nfolder">New Folder</a></li>
 </ul>
-
 <div id="software_folder">
-  <div>
-    <ul class='box_header'>
+  <div class='box_header'>
+    <ul>
       <li id="switch"><span class="swith_btn" title="Switch between differents file source">This project</span></li>
-      <li id="save"><span class="save_btn" title="Save current file. Hint: Use Ctrl+S">Save</span></li>
-      <li id="filelist"><span class="flist_btn" title="Recently opened files and favourites" rel='tooltip'>&nbsp;</span></li>
+      <li id="save"><span class="save_btn" title="Save current file. Hint: Use Ctrl+S">&nbsp;</span></li>
+      <li id="expand"><span class="expand_editor" title="Expand or reduce the editor area">&nbsp;</span></li>
+      <li id="filelist"><span class="flist_btn" title="Favourites files list" rel='tooltip'>&nbsp;</span></li>
       <li id="option"><span class="fmenu_btn" title='Show more option' rel='tooltip'>Menu</span></li>
-      <li>
-        <h2>
-          <span id="edit_info">No file in editor</span>
-          <span id="edit_status"></span>
-        </h2>
-      </li>
     </ul>
-
-    <!--<a href="#"  id="clearselect" class="lshare no-right-border" style="float:left">Clean</a>-->
-
+    <div id="tabControl"></div>
     <div class="clear"></div>
   </div>
+  <div class="clear"></div>
   <div class="software_details">
     <div id="details_box">
   	  <div id="fileTree" class="file_tree_short"></div>
@@ -69,15 +62,11 @@
   </div>
   <div id="code">
     <div class="main_content">
-<pre id="editor">
-
-</pre>
+      <div id="tabContent"></div>
     </div>
-	    <!--<input type=submit value="Save" id="save" class="button">-->
 	</div>
-
+  <div class="clear"></div>
 </div>
-<div class="clear"></div>
 <div id="file_info" class="file_info"><span id="info"></span></div>
 </form>
 
@@ -87,6 +76,7 @@
   <ul class="inline">
     <li><a id='getmd5' href="#">Get or Update md5sum</a></li>
     <li><a id='addflist' href="#">Add to favourites</a></li>
+    <li><a id='addflist' href="#">Full screen</a></li>
     <li><a id='find' href="#">Find in file &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[Ctrl+F]</a></li>
     <li><a id='replace' href="#">Replace in file &nbsp;&nbsp;[Ctrl+H]</a></li>
   </ul>

slapos/runner/templates/viewLog.html

@@ -11,7 +11,7 @@
 {% block body %}
 
 
-<h2 class="hight hide" id="logheader">Inspecting current slapgrid log - Click for more options</h2>
+<h2 class="hight hide" id="logheader">Inspecting slapgrid log - Click for more options</h2>
 <div class="log_btn" id="logconfigbox" style="display:none">
 <span style="margin-left:15px; font-size: 18px;"> Update parameters </span>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;