fnp / redakcja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2310708)
Dodanie toolbara z przyciskami.
authorzuber <marek@stepniowski.com>
Wed, 19 Aug 2009 10:46:03 +0000 (12:46 +0200)
committerzuber <marek@stepniowski.com>
Wed, 19 Aug 2009 10:46:03 +0000 (12:46 +0200)
project/static/css/master.css patch | blob | history
project/templates/base.html patch | blob | history
project/templates/explorer/file_xml.html patch | blob | history

diff --git a/project/static/css/master.css b/project/static/css/master.css
index f699cd6..66997a9 100644 (file)
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@ -1,6 +1,6 @@
 body {
     margin: 0;
 body {
     margin: 0;
-    font: 100%/1.5 Georgia, Verdana, sans-serif;
+    font: 14px Helvetica, Verdana, sans-serif;
     overflow: hidden;
 }
 
     overflow: hidden;
 }
 
@@ -127,3 +127,29 @@ p {
 .image-box {
     border-top: 1px solid #DDD;
 }
 .image-box {
     border-top: 1px solid #DDD;
 }
+
+#toolbar, #toolbar ol {
+    display: block;
+    margin: 0;
+    padding: 0;
+    background-color: #CCC;
+    border-bottom: 1px solid #AAA;
+}
+
+#toolbar li {
+    display: block;
+    float: left;
+    margin: 0;
+    padding: 0;
+    border-left: 1px solid #EEE;
+    border-right: 1px solid #AAA;
+}
+
+#toolbar li p, #toolbar ol li {
+    padding: 2px 10px;
+}
+
+#toolbar li p:hover {
+    cursor:pointer;
+    background-color: #EEE;
+}
\ No newline at end of file
diff --git a/project/templates/base.html b/project/templates/base.html
index 7ddfc18..6e9c389 100644 (file)
--- a/project/templates/base.html
+++ b/project/templates/base.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:p="http://platforma.wolnelektury.pl/">
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
         <title>{% block title %}Platforma Redakcyjna{% endblock %}</title>
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
         <title>{% block title %}Platforma Redakcyjna{% endblock %}</title>
diff --git a/project/templates/explorer/file_xml.html b/project/templates/explorer/file_xml.html
index cef1800..2d502cd 100644 (file)
--- a/project/templates/explorer/file_xml.html
+++ b/project/templates/explorer/file_xml.html
@@ -47,28 +47,31 @@
                         $(this).html('Nie synchronizuj przewijania');
                         $('#images').enableAutoscroll();
                     })
                         $(this).html('Nie synchronizuj przewijania');
                         $('#images').enableAutoscroll();
                     })
-
-                    keys = {}
                     
                     
-                    function addEditorButton(editor, label, keyCode, fn) {
+                    $('#toolbar li p').click(function() {
+                        $('#toolbar ol:visible').hide();
+                        $(this).next('ol').show('fast');
+                    })
+
+                    var keys = {};
+                    $('#toolbar ol 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 +80,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 +90,65 @@
 {% 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>
+    <ol id="toolbar">
+        <li>
+            <p>Nagłówki</p>
+            <ol style="display:none">
+                <li p:tag="czesc" p:key="65">część/księga</li>
+                <li p:tag="rozdzial" p:key="83">rozdział</li>
+                <li p:tag="podrozdzial">podrozdział</li>
+                <li p:tag="srodtytul">śródtytuł</li>
+                <li p:tag="akt">akt</li>
+            </ol>
+        </li>
+        <li>
+            <p>Struktr. i mastery</p>
+            <ol style="display:none">
+                <li p:tag="utwor">tagi główne</li>
+                <li p:tag="opowiadanie">opowiadanie</li>
+                <li p:tag="powiesc">powieść</li>
+                <li p:tag="dramat_wierszowany_l">dramat wiersz.</li>
+                <li p:tag="dramat_wierszowany_lp">dramat wiersz./w. łam</li>
+                <li p:tag="dramat_wspolczesny">dramat współcz.</li>
+                <li p:tag="liryka_l">liryka</li>
+                <li p:tag="liryka_lp">liryka/w. łam</li>
+                <li p:tag="wywiad">wywiad</li>
+            </ol>
+        </li>
+        <li>
+            <p>Dramat wiersz.</p>
+            <ol style="display:none">
+                <li p:tag="wers_wciety">wers m. wcięty</li>
+                <li p:tag="wers_cd">wers cd.</li>
+                <li p:tag="wers_wciety">wers wcięty</li>
+                <li p:tag="wers_akap">wers akap.</li>
+                <li p:tag="strofa">kwestiostrofa cd.</li>
+                <li p:tag="kwestia">kwestia</li>
+                <li p:tag="strofa">kwestiostrofa</li>
+                <li p:tag="strofa">strofa</li>
+                <li p:tag="strofa">strofa cd.</li>
+                <li p:tag="didaskalia">didask.</li>
+                <li p:tag="akap">kwestioakap</li>
+            </ol>
+        </li>
+        <li>
+            <p>Elementy początk.</p>
+            <ol style="display:none">
+                <li p:tag="autor">autor</li>
+                <li p:tag="tytul">tytuł</li>
+                <li p:tag="podtytul">podtytuł</li>
+                <li p:tag="nota">nota</li>
+                <li p:tag="dedykacja">dedykacja</li>
+                <li p:tag="motto">motto</li>
+                <li p:tag="motto_podpis">motto-podp.</li>
+                <li p:tag="dzielo_nadrzedne">dzieło nadrzędne</li>
+            </ol>
+        </li>
+        {# <li>Akapity i dł. cyt.</li> #}
+        {# <li>Style znakowe</li> #}
+        
         <div style="clear: both; height: 0; width: 0">&nbsp;</div>
         <div style="clear: both; height: 0; width: 0">&nbsp;</div>
-    </div>
+    </ol>
     
     <form action="." method="post" accept-charset="utf-8">
         <div id="panels">
     
     <form action="." method="post" accept-charset="utf-8">
         <div id="panels">