Merge branch 'master' of git@stigma: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 cef1800..1f074fc 100644 (file)
--- a/project/templates/explorer/file_xml.html
+++ b/project/templates/explorer/file_xml.html
@@ -1,4 +1,5 @@
 {% 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>
 
 {% block extrahead %}
     <script src="/static/js/jquery.fieldselection.js" type="text/javascript" charset="utf-8"></script>


@@ -47,28 +48,37 @@
                         $(this).html('Nie synchronizuj przewijania');
                         $('#images').enableAutoscroll();
                     })
                         $(this).html('Nie synchronizuj przewijania');
                         $('#images').enableAutoscroll();
                     })

-
-                    keys = {}

                     
                     

-                    function addEditorButton(editor, label, keyCode, fn) {
+                    // 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();
                         var handler = function() {
                             var text = editor.selection();

-                            editor.replaceSelection(fn(text));
+                            editor.replaceSelection('<' + tag + '>' + text + '</' + tag + '>');
+                            if (text.length == 0) {
+                                var pos = editor.cursorPosition();
+                                editor.selectLines(pos.line, pos.character + tag.length + 2);
+                            }

                         }
                         }

-                        
-                        keys[keyCode] = handler;
-                        
-                        $('<button type="button">' + label + '</button>').click(function(event) {
-                            event.preventDefault();
-                            handler();
-                        }).appendTo('#buttons');
-                    }
-                    
-                    addEditorButton(editor, 'utwór', 65, function(text) { return '<utwor>' + text + '</utwor>'; });
-                    addEditorButton(editor, 'akap', 83, function(text) { return '<akap>' + text + '</akap>'; });
+                        if ($(this).attr('p:key')) {
+                            keys[$(this).attr('p:key')] = handler;
+                        }
+                        $(this).click(handler)
+                    });

                     
                     editor.grabKeys(function(event) { 
                     
                     editor.grabKeys(function(event) { 

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

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


@@ -77,7 +87,7 @@
                     resizePanels();
                 }
             });
                     resizePanels();
                 }
             });

-
+            

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


@@ -87,12 +97,7 @@
 {% 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="float: left" id="buttons"></div>
-        <div style="clear: both; height: 0; width: 0">&nbsp;</div>
-    </div>
+    {% toolbar %}

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