From: zuber Date: Mon, 17 Aug 2009 16:48:31 +0000 (+0200) Subject: - Dopracowanie dopasowywania paneli Platformy Redakcyjnej do X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/d30c85700a77653b48a5c28b5242dbe22b99a174?ds=sidebyside;hp=-c - Dopracowanie dopasowywania paneli Platformy Redakcyjnej do wielkości okna przeglądarki. - Dodanie możliwości chowania panelu z galerią skanów. --- d30c85700a77653b48a5c28b5242dbe22b99a174 diff --git a/project/static/css/master.css b/project/static/css/master.css index 79820591..aeb1f099 100644 --- a/project/static/css/master.css +++ b/project/static/css/master.css @@ -1,6 +1,7 @@ body { margin: 0; font: 100%/1.5 Georgia, Verdana, sans-serif; + overflow: hidden; } #breadcrumbs { @@ -71,19 +72,34 @@ label { padding: 5px 10px; overflow-x: hidden; overflow-y: scroll; - width: 480px; - height: 480px; - border: 1px solid #999; } #images-wrap { - float: left; - width: 49%; + width: 480px; height: 480px; - border: 1px solid #999; -/* padding: 5px 10px;*/ + border-right: 1px solid #999; overflow-y: scroll; overflow-x: hidden; + background-color: #fff; + float: left; +} + +#sidebar { + float: left; + width: 488px; +} + +#toggle-sidebar { + background-color: #999; + width: 7px; + height: 100%; + float: left; +} + +#status-bar { + border-top: 1px solid #999; + background-color: #EEE; + padding: 2px 10px; } .errorlist { diff --git a/project/templates/explorer/file_html.html b/project/templates/explorer/file_html.html index f3fe1876..23a13679 100644 --- a/project/templates/explorer/file_html.html +++ b/project/templates/explorer/file_html.html @@ -10,6 +10,14 @@ }); }); + function resizePanels() { + $('#images-wrap').height($(window).height() - 80); + $('#file-text').height($(window).height() - 80); + } + + $(window).resize(resizePanels) + resizePanels(); + $('#images').lazyload('.image-box', {threshold: 600}); }); @@ -20,8 +28,13 @@ {% block maincontent %}
ŹródłoHTML
{{ image_folders_form.folders }}
 
-
-

Aby zobaczyć obrazki wybierz folder z obrazkami powyżej.

+
{{ object|safe }} diff --git a/project/templates/explorer/file_xml.html b/project/templates/explorer/file_xml.html index bd022e9f..350d0788 100644 --- a/project/templates/explorer/file_xml.html +++ b/project/templates/explorer/file_xml.html @@ -19,7 +19,27 @@ $('#images').data('lastScroll', -1000); }); }); - + + function resizePanels() { + $('iframe').width($(window).width() - $('#sidebar').outerWidth()); + $('iframe').height($(window).height() - 100); + $('#images-wrap, #toggle-sidebar').height($(window).height() - 100); + } + + $('#toggle-sidebar').toggle(function() { + $('#images-wrap').width(0); + $('#sidebar').width(8); + resizePanels(); + }, function() { + $('#images-wrap').width(480); + $('#sidebar').width(488); + resizePanels(); + }) + + $(window).resize(function() { + resizePanels(); + }) + var editor = CodeMirror.fromTextArea("id_text", { parserfile: 'parsexml.js', path: "/static/js/codemirror/", @@ -32,6 +52,8 @@ var percentScrolled = $('body', this).scrollTop() / $('body', this).height(); $('#images-wrap').scrollTop(percentScrolled * $('#images').height()); }); + + setTimeout(function() {resizePanels();}, 10); }) addEditorButton('utwór', function(text) { return '' + text + ''; }); @@ -47,18 +69,23 @@ {% block maincontent %}
ŹródłoHTML
{{ image_folders_form.folders }}
 
- -
-
-

Aby zobaczyć obrazki wybierz folder z obrazkami powyżej.

-
-
+
- {#
#} - - {{ form.user.errors }} -

Użytkownik: {{ form.user }}

- {{ form.commit_message.errors }} -

Opis zmian: {{ form.commit_message }}

+
+ + +
+ +
+ {{ form.user.errors }} {{ form.commit_message.errors }} +

Użytkownik: {{ form.user }} Opis zmian: {{ form.commit_message }}

+
{% endblock maincontent %}