New tool: annotations from current text (fixes #862)

diff --git a/apps/wiki/templates/wiki/document_details.html b/apps/wiki/templates/wiki/document_details.html
index 71113b1..bdb2200 100644 (file)
--- a/apps/wiki/templates/wiki/document_details.html
+++ b/apps/wiki/templates/wiki/document_details.html
@@ -24,6 +24,7 @@
 
 {% block tabs-right %}
     {% include "wiki/tabs/gallery_view_item.html" %}
+    {% include "wiki/tabs/annotations_view_item.html" %}
     {% include "wiki/tabs/search_view_item.html" %}
 {% endblock %}
 
@@ -33,6 +34,7 @@
     </div>
     <div id="sidebar">
         {% include "wiki/tabs/gallery_view.html" %}
+        {% include "wiki/tabs/annotations_view.html" %}
         {% include "wiki/tabs/search_view.html" %}
     </div>
 {% endblock %}

diff --git a/apps/wiki/templates/wiki/tabs/annotations_view.html b/apps/wiki/templates/wiki/tabs/annotations_view.html
new file mode 100644 (file)
index 0000000..56c41b7
--- /dev/null
+++ b/apps/wiki/templates/wiki/tabs/annotations_view.html
@@ -0,0 +1,13 @@
+{% load i18n %}
+<div id="side-annotations">
+    <!-- annotations toolbar -->
+    <div class="toolbar">
+        <button class="refresh">{% trans "Refresh" %}</button>
+        <div class="toolbar-end">
+        </div>
+    </div>
+    <div class="error-message">
+    </div>
+    <div class="annotations-list">
+    </div>
+</div>

diff --git a/apps/wiki/templates/wiki/tabs/annotations_view_item.html b/apps/wiki/templates/wiki/tabs/annotations_view_item.html
new file mode 100644 (file)
index 0000000..f478e12
--- /dev/null
+++ b/apps/wiki/templates/wiki/tabs/annotations_view_item.html
@@ -0,0 +1,4 @@
+{% load i18n %}
+<li id="AnnotationsPerspective" data-ui-related="side-annotations" data-ui-jsclass="AnnotationsPerspective">
+    <super title="{% trans "Annotations" %}">[1]</super>
+</li>

diff --git a/apps/wiki/templates/wiki/tabs/gallery_view_item.html b/apps/wiki/templates/wiki/tabs/gallery_view_item.html
index 7325c82..20505d6 100644 (file)
--- a/apps/wiki/templates/wiki/tabs/gallery_view_item.html
+++ b/apps/wiki/templates/wiki/tabs/gallery_view_item.html
@@ -1,4 +1,4 @@
 {% load i18n %}
 <li id="ScanGalleryPerspective" data-ui-related="side-gallery" data-ui-jsclass="ScanGalleryPerspective" class='active'>
-    <span>{% trans "Gallery" %}</span>
+    <img src="{{STATIC_URL}}icons/image-x-generic.png" alt="{% trans "Gallery" %}" title="{% trans "Gallery" %}" />
 </li>

diff --git a/apps/wiki/templates/wiki/tabs/search_view_item.html b/apps/wiki/templates/wiki/tabs/search_view_item.html
index dbd4e09..7acfaac 100644 (file)
--- a/apps/wiki/templates/wiki/tabs/search_view_item.html
+++ b/apps/wiki/templates/wiki/tabs/search_view_item.html
@@ -1,4 +1,4 @@
 {% load i18n %}
 <li id="SearchPerspective" data-ui-related="side-search" data-ui-jsclass="SearchPerspective">
-    <span>{% trans "Search and replace" %}</span>
+    <img src="{{STATIC_URL}}icons/system-search.png" alt="{% trans "Search and replace" %}" title="{% trans "Search and replace" %}" />
 </li>

diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py
index 5e8d721..2ce6ac9 100644 (file)
--- a/redakcja/settings/compress.py
+++ b/redakcja/settings/compress.py
@@ -51,6 +51,7 @@ COMPRESS_JS = {
                 'js/wiki/view_editor_source.js',
                 'js/wiki/view_editor_wysiwyg.js',
                 'js/wiki/view_gallery.js',
+                'js/wiki/view_annotations.js',
                 'js/wiki/view_search.js',
                 'js/wiki/view_column_diff.js',
         ),

diff --git a/redakcja/static/css/gallery.css b/redakcja/static/css/gallery.css
index 9c6e3a5..1274321 100644 (file)
--- a/redakcja/static/css/gallery.css
+++ b/redakcja/static/css/gallery.css
@@ -18,6 +18,27 @@
     padding: .5em;
 }
 
+#side-annotations {
+    display: none;
+}
+
+.annotations-list {
+    position: absolute;
+    left: 0;
+    top: 28px;
+    right: 0;
+    bottom: 0;
+    overflow: auto;
+    padding: 1em 1em 0 1em;
+}
+
+#side-annotations p.akap {
+    font-size: 16px;
+    font-family: "Georgia", "Times New Roman", serif;
+    line-height: 1.5em;
+    margin-bottom: 1em;
+}
+
 /* =========== */
 /* = Gallery = */
 /* =========== */

diff --git a/redakcja/static/css/master.css b/redakcja/static/css/master.css
index bc62274..b71520f 100644 (file)
--- a/redakcja/static/css/master.css
+++ b/redakcja/static/css/master.css
@@ -149,7 +149,6 @@ body {
 }
 
 .tabs li {
-       height: 18px;
        margin-top: 6px;
        margin-bottom: 0px;
 
@@ -158,10 +157,6 @@ body {
     display: block;
     float: left;
 
-       padding-left: 12px;
-       padding-right: 12px;
-       padding-top: 5px;
-
     font-weight: bold;
     color: #222;
     margin-left: 4px;
@@ -179,10 +174,27 @@ body {
     -webkit-border-bottom-right-radius: 0px;
 }
 
+#tabs li {
+    height: 18px;
+    padding-left: 12px;
+    padding-right: 12px;
+    padding-top: 5px;
+}
+
 .tabs li.active {
     background-color: #C1C1C1;
 }
 
+
+#tabs-right li {
+    height: 20px;
+    padding-left: 12px;
+    padding-right: 12px;
+    padding-top: 3px;
+}
+
+
+
 #tools {
        float: right;
        clear: right;

diff --git a/redakcja/static/icons/image-x-generic.png b/redakcja/static/icons/image-x-generic.png
new file mode 100644 (file)
index 0000000..68da502
Binary files /dev/null and b/redakcja/static/icons/image-x-generic.png differ

diff --git a/redakcja/static/icons/system-search.png b/redakcja/static/icons/system-search.png
new file mode 100644 (file)
index 0000000..fd7f0b0
Binary files /dev/null and b/redakcja/static/icons/system-search.png differ

diff --git a/redakcja/static/js/wiki/loader.js b/redakcja/static/js/wiki/loader.js
index f051511..eb535a1 100644 (file)
--- a/redakcja/static/js/wiki/loader.js
+++ b/redakcja/static/js/wiki/loader.js
@@ -69,10 +69,12 @@ $(function()
                                $.wiki.state.perspectives.ScanGalleryPerspective.show = false;
                                $('#sidebar').hide();
                                $('.vsplitbar').css('right', 0).removeClass('active');
-                               if($(".vsplitbar-title").html() == "↓ SEARCH AND REPLACE ↓"){
-                                       $(".vsplitbar-title").html("↑ SEARCH AND REPLACE ↑");        
-                               } else {
-                                   $(".vsplitbar-title").html("↑ GALLERY ↑");
+                               if($(".vsplitbar-title").html() == "↓ ZNAJDŹ I ZAMIEŃ ↓"){
+                                       $(".vsplitbar-title").html("↑ ZNAJDŹ I ZAMIEŃ ↑");        
+                               } else if($(".vsplitbar-title").html() == "↓ PRZYPISY ↓"){
+                        $(".vsplitbar-title").html("↑ PRZYPISY ↑");        
+                } else {
+                                   $(".vsplitbar-title").html("↑ GALERIA ↑");
                                }
                                $('#editor .editor').css('right', 30);
                                $(window).resize();

diff --git a/redakcja/static/js/wiki/view_annotations.js b/redakcja/static/js/wiki/view_annotations.js
new file mode 100644 (file)
index 0000000..d51ce9c
--- /dev/null
+++ b/redakcja/static/js/wiki/view_annotations.js
@@ -0,0 +1,114 @@
+(function($){
+
+    /*
+     * Perspective
+     */
+    function AnnotationsPerspective(options){
+        var old_callback = options.callback || function() { };
+
+        this.noupdate_hash_onenter = true;
+
+        options.callback = function(){
+            var self = this;
+
+            this.$element = $("#side-annotations");
+            this.$error = $('.error-message', this.$element);
+            this.$annos = $('.annotations-list', this.$element);
+            $('.refresh', this.$element).click(function() {
+                self.refresh(self);
+            });
+
+                       old_callback.call(this);
+        };
+
+        $.wiki.Perspective.call(this, options);
+    };
+
+    AnnotationsPerspective.prototype = new $.wiki.Perspective();
+
+    AnnotationsPerspective.prototype.refresh = function(self) {
+        var xml;
+
+        persp = $.wiki.activePerspective();
+        if (persp == 'CodeMirrorPerspective') {
+            xml = $.wiki.perspectives[persp].codemirror.getCode();
+        }
+        else if (persp == 'VisualPerspective') {
+            html2text({
+                element: $('#html-view div').get(0),
+                success: function(text){
+                    xml = text;
+                },
+                error: function(text){
+                    self.$error.html('<p>Wystąpił błąd:</p><pre>' + text + '</pre>');
+                }
+            });
+        }
+        else {
+            xml = this.doc.text;
+        }
+        
+        var parser = new DOMParser();
+        var serializer = new XMLSerializer();
+        var doc = parser.parseFromString(xml, 'text/xml');
+        var error = $('parsererror', doc);
+
+        if (error.length > 0) {
+            self.$error.html('Błąd parsowania XML.');
+            self.$error.show();
+            self.$annos.hide();
+        }
+        else {
+            self.$error.hide();
+            self.$annos.hide();
+            self.$annos.html('');
+            var anno_list = new Array();
+            var annos = doc.getElementsByTagName('pe');
+            var counter = annos.length;
+
+            for (var i=0; i<annos.length; i++)
+            {
+                text = serializer.serializeToString(annos[i]).replace(/<(\/?)pe[^>]*>/g, "<$1akap>");
+                xml2html({
+                    xml: text,
+                    success: function(elem){
+                        elem.txt = $(elem).text().trim();
+                        anno_list.push(elem);
+                        counter--;
+
+                        if (!counter) {
+                            anno_list.sort(function(a, b){return (a.txt < b.txt) ? -1 : (a.txt > b.txt ? 1 : 0)});
+                            self.$annos.append(anno_list);
+                            self.$annos.show();
+                        }
+                    },
+                    error: function(text) {
+                        $.unblockUI();
+                        self.$error.html(text);
+                        self.$error.show();
+                    }
+                });
+            }
+        }
+    }
+
+
+    AnnotationsPerspective.prototype.onEnter = function(success, failure){
+        var self = this;
+
+        $.wiki.Perspective.prototype.onEnter.call(this);
+
+        $('.vsplitbar').not('.active').trigger('click');
+        $(".vsplitbar-title").html("&darr;&nbsp;PRZYPISY&nbsp;&darr;");        
+
+        this.refresh(this);
+
+    };
+
+       AnnotationsPerspective.prototype.onExit = function(success, failure) {
+
+       };
+
+    $.wiki.AnnotationsPerspective = AnnotationsPerspective;
+
+})(jQuery);

diff --git a/redakcja/static/js/wiki/view_editor_wysiwyg.js b/redakcja/static/js/wiki/view_editor_wysiwyg.js
index dc24aea..2beb4d4 100644 (file)
--- a/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@ -503,7 +503,10 @@
                 _finalize(success);
             },
             error: function(text, source){
-                $('#html-view').html('<p class="error">Wystąpił błąd:</p><p>'+text+'</p><pre>'+source.replace(/&/g, '&amp;').replace(/</g, '&lt;')+'</pre>');
+                err = '<p class="error">Wystąpił błąd:</p><p>'+text+'</p>';
+                if (source)
+                    err += '<pre>'+source.replace(/&/g, '&amp;').replace(/</g, '&lt;')+'</pre>'
+                $('#html-view').html(err);
                 _finalize(failure);
             }
         });

diff --git a/redakcja/static/js/wiki/view_gallery.js b/redakcja/static/js/wiki/view_gallery.js
index 4f6b8a1..9630afb 100644 (file)
--- a/redakcja/static/js/wiki/view_gallery.js
+++ b/redakcja/static/js/wiki/view_gallery.js
@@ -226,7 +226,7 @@
         $.wiki.Perspective.prototype.onEnter.call(this);
 
         $('.vsplitbar').not('.active').trigger('click');
-        $(".vsplitbar-title").html("↓ GALLERY ↓");        
+        $(".vsplitbar-title").html("↓ GALERIA ↓");        
         
         this.doc.refreshGallery({
             success: function(doc, data){

diff --git a/redakcja/static/js/wiki/view_search.js b/redakcja/static/js/wiki/view_search.js
index 789a961..15f8e2e 100644 (file)
--- a/redakcja/static/js/wiki/view_search.js
+++ b/redakcja/static/js/wiki/view_search.js
@@ -99,7 +99,7 @@
         self.$searchCursor = null;
 
         $('.vsplitbar').not('.active').trigger('click');
-        $(".vsplitbar-title").html("↓ SEARCH AND REPLACE ↓");        
+        $(".vsplitbar-title").html("↓ ZNAJDŹ I ZAMIEŃ ↓");        
         
         if ($.wiki.activePerspective() != 'CodeMirrorPerspective')
             $.wiki.switchToTab('#CodeMirrorPerspective');