Usunięcie zagubionego console.log z kodu.

[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 350d078..314c08e 100644 (file)
--- a/project/templates/explorer/file_xml.html
+++ b/project/templates/explorer/file_xml.html
@@ -1,21 +1,16 @@
 {% extends "base.html" %}
 {% extends "base.html" %}

+{% 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>
 
 {% 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 type="text/javascript" charset="utf-8">
-        function addEditorButton(label, fn) {
-            $('<button type="button">' + label + '</button>').click(function(event) {
-                var text = $('#id_text').getSelection().text;
-                $('#id_text').replaceSelection(fn(text));
-                event.preventDefault();
-            }).appendTo('#buttons');
-        }
-        
+    <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 type="text/javascript" charset="utf-8">        

         $(function() {
             $('#id_folders').change(function() {
         $(function() {
             $('#id_folders').change(function() {

-                $('#images').load('/images/' + $('#id_folders').val() + '/', function() {
+                $('#images').load('{% url folder_image_ajax %}' + $('#id_folders').val() + '/', function() {

                     $('#images').data('lastScroll', -1000);
                 });
             });
                     $('#images').data('lastScroll', -1000);
                 });
             });


@@ -27,12 +22,13 @@
             }
             
             $('#toggle-sidebar').toggle(function() {
             }
             
             $('#toggle-sidebar').toggle(function() {

-                $('#images-wrap').width(0);
-                $('#sidebar').width(8);
-                resizePanels();
-            }, function() {

                 $('#images-wrap').width(480);
                 $('#sidebar').width(488);
                 $('#images-wrap').width(480);
                 $('#sidebar').width(488);

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

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


@@ -44,22 +40,68 @@
                 parserfile: 'parsexml.js',
                 path: "/static/js/codemirror/",
                 stylesheet: "/static/css/xmlcolors.css",
                 parserfile: 'parsexml.js',
                 path: "/static/js/codemirror/",
                 stylesheet: "/static/css/xmlcolors.css",

-                parserConfig: {useHTMLKludges: false}
+                parserConfig: {useHTMLKludges: false},
+                initCallback: function() {
+                    $('#images').autoscroll('iframe');
+                    $('.toggleAutoscroll').toggle(function() {
+                        $(this).html('Synchronizuj przewijanie');
+                        $('#images').disableAutoscroll();
+                    }, function() {
+                        $(this).html('Nie synchronizuj przewijania');
+                        $('#images').enableAutoscroll();
+                    })
+                    
+                    // Toolbar
+                    $('#toolbar-tabs li').click(function() {
+                        var id = $(this).attr('p:button-list');
+                        $('#toolbar-tabs li').removeClass('active');
+                        $(this).addClass('active');
+                        if (!$('#' + id).is(':visible')) {
+                            $('#toolbar-buttons ol').not('#' + id).hide();
+                            $('#' + id).show();
+                        }
+                    })
+
+                    var keys = {};
+                    $('#toolbar-buttons li').each(function() {
+                        var tag = $(this).attr('p:tag');
+                        var handler = function() {
+                            var text = editor.selection();
+                            editor.replaceSelection('<' + tag + '>' + text + '</' + tag + '>');
+                            if (text.length == 0) {
+                                var pos = editor.cursorPosition();
+                                editor.selectLines(pos.line, pos.character + tag.length + 2);
+                            }
+                        }
+                        if ($(this).attr('p:key')) {
+                            keys[$(this).attr('p:key')] = handler;
+                        }
+                        $(this).click(handler)
+                    });
+                    
+                    editor.grabKeys(function(event) { 
+                        if (keys[event.keyCode]) {
+                            keys[event.keyCode]();
+                        }
+                    }, function(event) {
+                        return event.ctrlKey && keys[event.keyCode];
+                    });
+
+                    resizePanels();
+                }

             });
             
             });
             

-            $('iframe').load(function() {
-                $($('iframe').contents()).scroll(function() {
-                    var percentScrolled = $('body', this).scrollTop() / $('body', this).height();
-                    $('#images-wrap').scrollTop(percentScrolled * $('#images').height());
-                });
-                
-                setTimeout(function() {resizePanels();}, 10);
-            })
-            
-            addEditorButton('utwór', function(text) { return '<utwor>' + text + '</utwor>'; });
-            addEditorButton('akap', function(text) { return '<akap>' + text + '</akap>'; });
+            $('#toolbar-buttons li').wTooltip({
+                delay: 1000, 
+                style: {
+                    border: "1px solid #7F7D67",
+                    opacity: 0.9, 
+                    background: "#FBFBC6", 
+                    padding: "1px",
+                    fontSize: "12px",
+                }});

             
             

-            $('#images').lazyload('.image-box', {threshold: 600});
+            $('#images-wrap').lazyload('.image-box', {threshold: 640 * 10, scrollTreshold: 640 * 5});

         });
 
     </script>
         });
 
     </script>


@@ -68,14 +110,15 @@
 {% 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 %}

-    <div id="tabs"><a href="{% url file_xml hash %}" class="active">Źródło</a><a href="{% url file_html hash %}">HTML</a>    <div style="padding: 3px; margin-left: 10px">{{ image_folders_form.folders }}</div><div style="clear: both; height: 0; width: 0">&nbsp;</div></div>    
+    {% toolbar %}

     
     <form action="." method="post" accept-charset="utf-8">
         <div id="panels">
             <div id="sidebar">
                 <div id="images-wrap">
                     <div id="images">
     
     <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 z obrazkami powyżej.</p>
+                        <p>Aby zobaczyć obrazki wybierz folder poniżej:</p>
+                        <p>{{ image_folders_form.folders }}</p>

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


@@ -85,7 +128,12 @@
         
         <div id="status-bar">
             {{ form.user.errors }} {{ form.commit_message.errors }}
         
         <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"/></p>
+            <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 %}    
         </div>
     </form>
 {% endblock maincontent %}