From: Łukasz Rekucki Date: Fri, 28 Aug 2009 09:53:13 +0000 (+0200) Subject: Merge branch 'master' of git@stigma:platforma X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/0602376974810e6709409a69b010c5a68b5c3040?ds=sidebyside;hp=--cc Merge branch 'master' of git@stigma:platforma Conflicts: project/static/js/editor.js project/templates/explorer/editor.html --- 0602376974810e6709409a69b010c5a68b5c3040 diff --cc project/static/js/editor.js index 05232b23,cde04604..eb87f431 --- a/project/static/js/editor.js +++ b/project/static/js/editor.js @@@ -113,60 -102,27 +112,32 @@@ function Editor() Editor.prototype.setupUI = function() { // set up the UI visually and attach callbacks var self = this; - var panelRoot = $('#panels'); - self.rootDiv = panelRoot; ++ ++ $('*.panel-wrap:last', this.rootDiv).addClass('last-panel'); - $('*.panel-wrap:last', panelRoot).addClass('last-panel'); - - // Set panel widths from options.panelRatios - if (self.options && self.options.panelRatios) { - var totalWidth = 0; - $('.panel-wrap', panelRoot).each(function(index) { - var panelWidth = self.options.panelRatios[index] * panelRoot.width(); - if ($(this).hasClass('last-panel')) { - $(this).css({ - left: totalWidth, - right: 0, - }); - } else { - $(this).css({ - left: totalWidth, - width: panelWidth, - }); - totalWidth += panelWidth; - } - }); - } - - panelRoot.makeHorizPanel({}); // TODO: this probably doesn't belong into jQuery - panelRoot.css('top', ($('#header').outerHeight() ) + 'px'); + self.rootDiv.makeHorizPanel({}); // TODO: this probably doesn't belong into jQuery + self.rootDiv.css('top', ($('#header').outerHeight() ) + 'px'); $('#panels > *.panel-wrap').each(function() { var panelWrap = $(this); $.log('wrap: ', panelWrap); - panelWrap.data('ctrl', new Panel(panelWrap)); // attach controllers to wraps - - $('.panel-toolbar select', panelWrap).change(function() { - panelWrap.data('ctrl').load( $(this).val() ); - }); - }); - - $('#toolbar-button-save').click( function (event, data) { self.saveToBranch(); } ); - - panelRoot.bind('stopResize', function() { - var panelRatios = []; - $('.panel-wrap', panelRoot).each(function() { - panelRatios.push($(this).width() / panelRoot.width()); + panel = new Panel(panelWrap); + panelWrap.data('ctrl', panel); // attach controllers to wraps + panel.load($('.panel-toolbar select', panelWrap).val()); + + $('.panel-toolbar select', panelWrap).change(function() { + var url = $(this).val(); + panelWrap.data('ctrl').load(url); + self.savePanelOptions(); }); - self.options.panelRatios = panelRatios; - $.log($.toJSON(self.options)); - $.cookie('options', $.toJSON(self.options), { expires: 7, path: '/'}); - }); + }); + + $(document).bind('panel:contentChanged', function(event, data) { + $('#toolbar-button-save').removeAttr('disabled'); + }); - + + $('#toolbar-button-save').click( function (event, data) { self.saveToBranch(); } ); - + self.rootDiv.bind('stopResize', function() { self.savePanelOptions() }); } Editor.prototype.loadConfig = function() { diff --cc project/templates/explorer/editor.html index 66320462,dd5c736f..2d63419f --- a/project/templates/explorer/editor.html +++ b/project/templates/explorer/editor.html @@@ -18,15 -18,14 +18,15 @@@ {% endblock %} {% block maincontent %}
-
-
- - - - - - + + + +