Merge branch 'master' of git@stigma.nowoczesnapolska.org.pl:platforma

[redakcja.git] / project / templates / explorer / file_xml.html

diff --git a/project/templates/explorer/file_xml.html b/project/templates/explorer/file_xml.html
index c1521c6..53d536a 100644 (file)
--- a/project/templates/explorer/file_xml.html
+++ b/project/templates/explorer/file_xml.html
@@ -2,36 +2,27 @@
 {% load toolbar_tags %}
 
 {% block extrahead %}
 {% load toolbar_tags %}
 
 {% block extrahead %}

-    <script src="/static/js/jquery.fieldselection.js" type="text/javascript" charset="utf-8"></script>

     <script src="/static/js/jquery.lazyload.js" type="text/javascript" charset="utf-8"></script>
     <script src="/static/js/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
     <script src="/static/js/jquery.autoscroll.js" type="text/javascript" charset="utf-8"></script>
     <script src="/static/js/jquery.wtooltip.js" type="text/javascript" charset="utf-8"></script>
     <script src="/static/js/jquery.lazyload.js" type="text/javascript" charset="utf-8"></script>
     <script src="/static/js/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
     <script src="/static/js/jquery.autoscroll.js" type="text/javascript" charset="utf-8"></script>
     <script src="/static/js/jquery.wtooltip.js" type="text/javascript" charset="utf-8"></script>

+    <script src="/static/js/jquery.resizable.js" type="text/javascript" charset="utf-8"></script>

     <script type="text/javascript" charset="utf-8">        
         $(function() {
             $('#id_folders').change(function() {
                 $('#images').load('{% url folder_image_ajax %}' + $('#id_folders').val() + '/', function() {
     <script type="text/javascript" charset="utf-8">        
         $(function() {
             $('#id_folders').change(function() {
                 $('#images').load('{% url folder_image_ajax %}' + $('#id_folders').val() + '/', function() {

-                    $('#images').data('lastScroll', -1000);
+                    $('#images-wrap').data('lazyload:lastCheckedScrollTop', -10000);

                 });
             });
             
             function resizePanels() {
                 $('iframe').width($(window).width() - $('#sidebar').outerWidth());
                 });
             });
             
             function resizePanels() {
                 $('iframe').width($(window).width() - $('#sidebar').outerWidth());

-                $('iframe').height($(window).height() - 100);
-                $('#images-wrap, #toggle-sidebar').height($(window).height() - 100);
+                $('iframe').height($(window).height() - $('iframe').position().top);
+                $('#toggle-sidebar').height($(window).height() - $('#toggle-sidebar').position().top);
+                $('#images-wrap').height($(window).height() - $('#images-wrap').position().top);
+                $('#images-wrap, #sidebar-toolbar').width($('#sidebar').width() - 10);

             }
             
             }
             

-            $('#toggle-sidebar').toggle(function() {
-                $('#images-wrap').width(480);
-                $('#sidebar').width(488);
-                $('#images-wrap').data('lazyload:lastCheckedScrollTop', -10000);
-                resizePanels();
-            }, function() {
-                $('#images-wrap').width(0);
-                $('#sidebar').width(8);
-                resizePanels();
-            })
-            

             $(window).resize(function() {
                 resizePanels();
             })
             $(window).resize(function() {
                 resizePanels();
             })


@@ -80,14 +71,16 @@
                     });
                     
                     editor.grabKeys(function(event) { 
                     });
                     
                     editor.grabKeys(function(event) { 

-                        console.log('handle', event, event.keyCode)

                         if (keys[event.keyCode]) {
                             keys[event.keyCode]();
                         }
                     }, function(event) {
                         if (keys[event.keyCode]) {
                             keys[event.keyCode]();
                         }
                     }, function(event) {

-                        return event.ctrlKey && keys[event.keyCode];
+                        return event.altKey && keys[event.keyCode];

                     });
 
                     });
 

+                    $('#sidebar').bind('resizable:resize', resizePanels)
+                        .resizable('#toggle-sidebar', {minWidth: 8});
+                    

                     resizePanels();
                 }
             });
                     resizePanels();
                 }
             });


@@ -111,30 +104,39 @@
 {% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> ❯ plik {{ hash }}{% endblock breadcrumbs %}
 
 {% block maincontent %}
 {% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> ❯ plik {{ hash }}{% endblock breadcrumbs %}
 
 {% block maincontent %}

-    {% toolbar %}
-    

     <form action="." method="post" accept-charset="utf-8">
         <div id="panels">
             <div id="sidebar">
     <form action="." method="post" accept-charset="utf-8">
         <div id="panels">
             <div id="sidebar">

-                <div id="images-wrap">
-                    <div id="images">
-                        <p>Aby zobaczyć obrazki wybierz folder poniżej:</p>
-                        <p>{{ image_folders_form.folders }}</p>
+                <div id="toggle-sidebar" style="float: right"></div>
+                <div id="whatever">
+                    <div id="sidebar-toolbar">
+                        <ol id="sidebar-tabs">
+                            <li>Tab</li>
+                            <li>Tab 2</li>
+                        </ol>
+                    </div>
+                    <div id="images-wrap">
+
+                        <div style="clear: both; height: 0; width: 0">&nbsp;</div>
+                        <div id="images">
+                            <p>Aby zobaczyć obrazki wybierz folder poniżej:</p>
+                            <p>{{ image_folders_form.folders }}</p>
+                        </div>

                     </div>
                 </div>
                     </div>
                 </div>

-                <div id="toggle-sidebar"></div>

             </div>
             </div>

+            {% toolbar %}

             <textarea id="id_text" name="text" width="480px">{{ form.text.field.initial }}</textarea>
         </div>
         
             <textarea id="id_text" name="text" width="480px">{{ form.text.field.initial }}</textarea>
         </div>
         

-        <div id="status-bar">
-            {{ form.user.errors }} {{ form.commit_message.errors }}
-            <p>
-                Użytkownik: {{ form.user }}
-                Opis zmian: {{ form.commit_message }}
-                <input type="submit" value="Zapisz"/>
-                <a href="#" class="toggleAutoscroll" style="float: right">Nie synchronizuj przewijania</a>
-            </p>
-        </div>
+        {# <div id="status-bar"> #}
+        {#     {{ form.user.errors }} {{ form.commit_message.errors }} #}
+        {#     <p> #}
+        {#         Użytkownik: {{ form.user }} #}
+        {#         Opis zmian: {{ form.commit_message }} #}
+        {#         <input type="submit" value="Zapisz"/> #}
+        {#         <a href="#" class="toggleAutoscroll" style="float: right">Nie synchronizuj przewijania</a> #}
+        {#     </p> #}
+        {# </div> #}

     </form>
 {% endblock maincontent %}    
     </form>
 {% endblock maincontent %}