Merge branch 'master' into view-refactor

Conflicts:
	project/static/css/master.css

diff --combined project/static/css/master.css
index d554a5f,b413b2c..6ba367b
--- 1/project/static/css/master.css
--- 2/project/static/css/master.css
+++ b/project/static/css/master.css
@@@ -35,6 -35,7 +35,6 @@@ body 
      top: 2.4em; left: 0px; right: 0px; bottom: 0px;
      overflow: auto;    
      background-color: white;
 -    padding: 0.2em 1em;
  }
  
  ul {
@@@ -106,8 -107,8 +106,8 @@@ label 
  /* ========== */
  
  #panels {
 -    position: absolute;
 -    bottom: 0px; left: 0px; right: 0px; top: 0px;
 +    height: 100%;
 +    width: 100%;
  }
  
  .panel-wrap {
@@@ -342,61 -343,13 +342,60 @@@ text#commit-dialog-message 
      margin: 0.5em;
  }
  
 -.CodeMirror-line-numbers
 -{
 -    text-align: right;
 -    padding-top: 0.4em;
 -    padding-right: 2px;
 -    width: 28px;
 -    font-size: 10pt;
 -    background: black;
 -    color: white;
 -}
 +/* ======= */
 +/* = New = */
 +/* ======= */
 +#splitview {
 +    width: 100%;
 +    height: 100%;
 +    padding: 0;
 +    margin: 0;
 +}
 +
 +.splitview-splitbar {
 +    width: 5px;
 +    border-left: 1px solid #999;
 +    border-right: 1px solid #999;
 +    height: 100%;
 +    background-color: #CCC;
 +    z-index: 100;
 +}
 +
 +.splitview-overlay {
 +    z-index: 90;
 +    background: #FFF;
 +    opacity: 0.5;
 +}
 +
 +.panel-container {
 +    height: 100%;
 +    position: relative;
 +}
 +
 +.content-view {
 +    position: absolute;
 +    top: 20px;
 +    right: 0;
 +    bottom: 0;
 +    left: 0;
 +    overflow: none;
 +}
 +
 +.xmlview {
 +    height: 100%;
 +}
 +
 +.view-overlay {
 +    z-index: 1000;
 +    background: #FFF;
 +    opacity: 0.8;
 +    text-align: center;
 +    text-valign: center;
 +}
 +
 +.view-overlay p {
 +    display: block;
 +    position: relative;
 +    top: auto;
 +    bottom: auto;
 +    height: 40px;
- }

diff --combined project/static/js/editor.js
index d81a7b0,79b7fa9..6918f9e
--- 1/project/static/js/editor.js
--- 2/project/static/js/editor.js
+++ b/project/static/js/editor.js
@@@ -152,9 -152,7 +152,7 @@@ Panel.prototype.connectToolbar = functi
      // move the extra
      var extra_buttons = $('span.panel-toolbar-extra button', toolbar);
      var placeholder = $('div.panel-toolbar span.panel-toolbar-extra > span', this.wrap);
-     placeholder.replaceWith(extra_buttons);    
- 
-     var action_buttons = $('button', extra_buttons);
+     placeholder.replaceWith(extra_buttons);       
  
      // connect group-switch buttons
      var group_buttons = $('*.toolbar-tabs-container button', toolbar);
@@@ -185,7 -183,7 +183,7 @@@
      });
  
      // connect action buttons
-     var allbuttons = $.makeArray(action_buttons);
+     var allbuttons = $.makeArray(extra_buttons);
      $.merge(allbuttons,
          $.makeArray($('*.toolbar-button-groups-container button', toolbar)) );
          
@@@ -322,30 -320,30 +320,30 @@@ Editor.prototype.loadConfig = function(
  };
  
  Editor.prototype.loadPanelOptions = function() {
 -    var self = this;
 -    var totalWidth = 0;
 -    
 -    $('.panel-wrap', self.rootDiv).each(function(index) {
 -        var panelWidth = self.fileOptions.panels[index].ratio * self.rootDiv.width();
 -        if ($(this).hasClass('last-panel')) {
 -            $(this).css({
 -                left: totalWidth,
 -                right: 0
 -            });
 -        } else {
 -            $(this).css({
 -                left: totalWidth,
 -                width: panelWidth
 -            });
 -            totalWidth += panelWidth;               
 -        }
 -        $.log('panel:', this, $(this).css('left'));
 -        $('.panel-toolbar option', this).each(function() {
 -            if ($(this).attr('p:panel-name') == self.fileOptions.panels[index].name) {
 -                $(this).parent('select').val($(this).attr('value'));
 -            }
 -        });
 -    });   
 +    // var self = this;
 +    // var totalWidth = 0;
 +    // 
 +    // $('.panel-wrap', self.rootDiv).each(function(index) {
 +    //     var panelWidth = self.fileOptions.panels[index].ratio * self.rootDiv.width();
 +    //     if ($(this).hasClass('last-panel')) {
 +    //         $(this).css({
 +    //             left: totalWidth,
 +    //             right: 0
 +    //         });
 +    //     } else {
 +    //         $(this).css({
 +    //             left: totalWidth,
 +    //             width: panelWidth
 +    //         });
 +    //         totalWidth += panelWidth;               
 +    //     }
 +    //     $.log('panel:', this, $(this).css('left'));
 +    //     $('.panel-toolbar option', this).each(function() {
 +    //         if ($(this).attr('p:panel-name') == self.fileOptions.panels[index].name) {
 +    //             $(this).parent('select').val($(this).attr('value'));
 +    //         }
 +    //     });
 +    // });   
  };
  
  Editor.prototype.savePanelOptions = function() {