Drobna zmiana w .gitignore (dev.db -> dev.sqlite).

[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 3f50659..5c8dbf0 100644 (file)
--- a/project/templates/explorer/file_xml.html
+++ b/project/templates/explorer/file_xml.html
@@ -1,49 +1,28 @@
 {% extends "base.html" %}
 
 {% block extrahead %}
 {% extends "base.html" %}
 
 {% 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 type="text/javascript" charset="utf-8">        
     <script src="/static/js/jquery.lazyload.js" type="text/javascript" charset="utf-8"></script>
     <script type="text/javascript" charset="utf-8">        

-        function aboveViewport(container, element, treshold) {
-            return $(container).offset().top >= $(element).offset().top + $(element).height() + treshold;
-        }
-        
-        function belowViewport(container, element, treshold) {
-            return $(container).offset().top + $(container).height() + treshold <= $(element).offset().top;
-        }
-        
-        var TRESHOLD = 600;
-        var lastScroll = -1000;
-                    
-        function checkScroll() {
-            console.log('checkScroll', $('#images').scrollTop(), lastScroll);
-            
-            if (Math.abs($('#images').scrollTop() - lastScroll) > 300) {
-                console.log('checking!');
-                
-                var container = $('#images');
-                lastScroll = container.scrollTop();
-                
-                $('#images .image-box').each(function() {
-                    if (aboveViewport(container, this, TRESHOLD)) {
-                        $(this).html('loading...');
-                    } else if (belowViewport(container, this, TRESHOLD)) {
-                        $(this).html('loading...');
-                    } else {
-                        $(this).html('<img src="' + $(this).attr('src') + '" width="460" height="460"/>');
-                    }
-                })
-            }
-            setTimeout(checkScroll, 2000);
+        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');

         }
         
         $(function() {
             $('#id_folders').change(function() {
                 $('#images').load('/images/' + $('#id_folders').val() + '/', function() {
         }
         
         $(function() {
             $('#id_folders').change(function() {
                 $('#images').load('/images/' + $('#id_folders').val() + '/', function() {

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

                 });
             });
                 });
             });

+
+            addEditorButton('utwór', function(text) { return '<utwor>' + text + '</utwor>'; });
+            addEditorButton('akap', function(text) { return '<akap>' + text + '</akap>'; });

             
             

-            setTimeout(checkScroll, 2000);
+            $('#images').lazyload('.image-box', {threshold: 600});

         });
     </script>
 {% endblock extrahead %}
         });
     </script>
 {% endblock extrahead %}


@@ -54,12 +33,14 @@
     <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>    
 
     <div id="images">
     <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>    
 
     <div id="images">

-        <div class="image-box">
-            <p>Aby zobaczyć obrazki wybierz folder z obrazkami powyżej.</p>
-        </div>
+        <p>Aby zobaczyć obrazki wybierz folder z obrazkami powyżej.</p>

     </div>
     <form action="." method="post" accept-charset="utf-8">
     </div>
     <form action="." method="post" accept-charset="utf-8">

+        <div id="buttons"></div>

         {{ form.text }}
         {{ form.text }}

-        <p><input type="submit" value="Zapisz"/></p>
+        {{ form.user.errors }}
+        <p>Użytkownik: {{ form.user }}</p> 
+        {{ form.commit_message.errors }}
+        <p>Opis zmian: {{ form.commit_message }} <input type="submit" value="Zapisz"/></p>

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