Adding references.

diff --git a/src/redakcja/static/js/wiki/view_editor_wysiwyg.js b/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
index f056edc..c1c9f6f 100644 (file)
--- a/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@ -110,6 +110,50 @@
     }
 
 
     }
 
 

+    function addReference(){
+        var selection = window.getSelection();
+        var n = selection.rangeCount;
+
+        if (n == 0) {
+            window.alert("Nie zaznaczono żadnego obszaru");
+            return false;
+        }
+
+        // for now allow only 1 range
+        if (n > 1) {
+            window.alert("Zaznacz jeden obszar");
+            return false;
+        }
+
+        // remember the selected range
+        var range = selection.getRangeAt(0);
+
+        if (!verifyTagInsertPoint(range.endContainer)) {
+            window.alert("Nie można wstawić w to miejsce przypisu.");
+            return false;
+        }
+
+        var tag = $('<span></span>');
+        range.collapse(false);
+        range.insertNode(tag[0]);
+
+        xml2html({
+            xml: '<ref href=""/>',
+            success: function(text){
+                var t = $(text);
+                tag.replaceWith(t);
+                openForEdit(t);
+            },
+            error: function(){
+                tag.remove();
+                alert('Błąd przy dodawaniu referncji:' + errors);
+            }
+        })
+    }
+
+
+
+    

     /* Insert theme using current selection */
 
     function addTheme(){
     /* Insert theme using current selection */
 
     function addTheme(){


@@ -377,7 +421,7 @@
         var w = $box.outerWidth();
         var h = $box.innerHeight();
 
         var w = $box.outerWidth();
         var h = $box.innerHeight();
 

-        if ($origin.is(".annotation-inline-box")) {
+        if ($origin.is(".annotation-inline-box") | $origin.is('*[x-edit-no-format]')) {

             w = Math.max(w, 400);
             h = Math.max(h, 60);
             if($('.htmlview div').offset().left + $('.htmlview div').width() > ($('.vsplitbar').offset().left - 480)){
             w = Math.max(w, 400);
             h = Math.max(h, 60);
             if($('.htmlview div').offset().left + $('.htmlview div').width() > ($('.vsplitbar').offset().left - 480)){


@@ -397,8 +441,11 @@
         }).appendTo($box[0].offsetParent || $box.parent()).show();
         
 
         }).appendTo($box[0].offsetParent || $box.parent()).show();
         
 

-        if ($origin.is('.motyw')) {
+        if ($origin.is('*[x-edit-no-format]')) {

            $('.akap-edit-button').remove();
            $('.akap-edit-button').remove();

+        }
+        
+        if ($origin.is('.motyw')) {

             $.themes.autocomplete($('textarea', $overlay));
         }
 
             $.themes.autocomplete($('textarea', $overlay));
         }
 


@@ -412,7 +459,7 @@
                 };
             });
         }
                 };
             });
         }

-        else if($box.is('*[x-annotation-box]')) {
+        else if($box.is('*[x-annotation-box]') || $origin.is('*[x-edit-attribute]')) {

             $('.delete-button', $overlay).click(function(){
                 if (window.confirm("Czy jesteś pewien, że chcesz usunąć ten przypis?")) {
                     $origin.remove();
             $('.delete-button', $overlay).click(function(){
                 if (window.confirm("Czy jesteś pewien, że chcesz usunąć ten przypis?")) {
                     $origin.remove();


@@ -436,8 +483,16 @@
 
         var serializer = new XMLSerializer();
 
 
         var serializer = new XMLSerializer();
 

+        if($box.attr("x-edit-attribute")) {
+            source = $('<span x-pass-thru="true"/>');
+            source.text($box.attr("data-wlf-" + $box.attr("x-edit-attribute")));
+            source = source[0];
+        } else {
+            source = $box[0];
+        }
+        

         html2text({
         html2text({

-            element: $box[0],
+            element: source,

             stripOuter: true,
             success: function(text){
                 $('textarea', $overlay).val($.trim(text));
             stripOuter: true,
             success: function(text){
                 $('textarea', $overlay).val($.trim(text));


@@ -454,13 +509,24 @@
                         insertedText = insertedText.replace(/,\s*$/, '');
                     }
 
                         insertedText = insertedText.replace(/,\s*$/, '');
                     }
 

+                    if($box.attr("x-edit-attribute")) {
+                        xml = '<' + nodeName + ' ' + $box.attr("x-edit-attribute") + '="' + insertedText + '"/>';
+                    } else {
+                        xml = '<' + nodeName + '>' + insertedText + '</' + nodeName + '>';
+                    }
+
+                    

                     xml2html({
                     xml2html({

-                        xml: '<' + nodeName + '>' + insertedText + '</' + nodeName + '>',
+                        xml: xml,

                         success: function(element){
                             if (nodeName == 'out-of-flow-text') {
                                 $(element).children().insertAfter($origin);
                                 $origin.remove()
                             }
                         success: function(element){
                             if (nodeName == 'out-of-flow-text') {
                                 $(element).children().insertAfter($origin);
                                 $origin.remove()
                             }

+                            else if ($box.attr('x-edit-attribute')) {
+                                $(element).insertAfter($origin);
+                                $origin.remove();
+                            }

                             else {
                                 $origin.html($(element).html());
                             }
                             else {
                                 $origin.html($(element).html());
                             }


@@ -535,6 +601,7 @@
         });
     }
 
         });
     }
 

+

     function VisualPerspective(options){
 
         var old_callback = options.callback;
     function VisualPerspective(options){
 
         var old_callback = options.callback;


@@ -563,6 +630,11 @@
                     }
                 });
 
                     }
                 });
 

+                $('#insert-reference-button').click(function(){
+                    addReference();
+                    return false;
+                });
+

                 $('#insert-annotation-button').click(function(){
                     addAnnotation();
                     return false;
                 $('#insert-annotation-button').click(function(){
                     addAnnotation();
                     return false;

diff --git a/src/redakcja/static/js/wiki/xslt.js b/src/redakcja/static/js/wiki/xslt.js
index 1c69352..06228cd 100644 (file)
--- a/src/redakcja/static/js/wiki/xslt.js
+++ b/src/redakcja/static/js/wiki/xslt.js
@@ -17,7 +17,7 @@ function withStylesheets(code_block, onError)
     if (!xml2htmlStylesheet) {
        $.blockUI({message: 'Ładowanie arkuszy stylów...'});
        $.ajax({
     if (!xml2htmlStylesheet) {
        $.blockUI({message: 'Ładowanie arkuszy stylów...'});
        $.ajax({

-               url: STATIC_URL + 'xsl/wl2html_client.xsl?2019121801',
+               url: STATIC_URL + 'xsl/wl2html_client.xsl?20201106',

                dataType: 'xml',
                timeout: 10000,
                success: function(data) {
                dataType: 'xml',
                timeout: 10000,
                success: function(data) {

diff --git a/src/redakcja/static/xsl/wl2html_client.xsl b/src/redakcja/static/xsl/wl2html_client.xsl
index f5a442b..51ea70f 100644 (file)
--- a/src/redakcja/static/xsl/wl2html_client.xsl
+++ b/src/redakcja/static/xsl/wl2html_client.xsl
@@ -718,6 +718,13 @@
         </span>
     </xsl:template>
 
         </span>
     </xsl:template>
 

+    <xsl:template match="ref">
+        <span x-editable="true" x-common="common" x-edit-no-format="true" x-edit-attribute="href">
+            <xsl:call-template name="standard-attributes"/>
+            <a class="reference">📌</a>
+        </span>
+    </xsl:template>
+    

     <xsl:template match="begin">        
         <span>
             <xsl:call-template name="standard-attributes" />
     <xsl:template match="begin">        
         <span>
             <xsl:call-template name="standard-attributes" />


@@ -737,7 +744,7 @@
     </xsl:template>
 
     <xsl:template match="motyw">
     </xsl:template>
 
     <xsl:template match="motyw">

-        <span x-editable="true" x-common="common">
+        <span x-editable="true" x-edit-no-format="true" x-common="common">

             <xsl:call-template name="standard-attributes" />
             <xsl:attribute name="theme-class">
                 <xsl:value-of select="substring-after(@id, 'm')" />
             <xsl:call-template name="standard-attributes" />
             <xsl:attribute name="theme-class">
                 <xsl:value-of select="substring-after(@id, 'm')" />

diff --git a/src/wiki/locale/pl/LC_MESSAGES/django.mo b/src/wiki/locale/pl/LC_MESSAGES/django.mo
index cc5b3a5..ce96f6e 100644 (file)
Binary files a/src/wiki/locale/pl/LC_MESSAGES/django.mo and b/src/wiki/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/src/wiki/locale/pl/LC_MESSAGES/django.po b/src/wiki/locale/pl/LC_MESSAGES/django.po
index 22fbe4f..1eb74fd 100644 (file)
--- a/src/wiki/locale/pl/LC_MESSAGES/django.po
+++ b/src/wiki/locale/pl/LC_MESSAGES/django.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Platforma Redakcyjna\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: Platforma Redakcyjna\n"
 "Report-Msgid-Bugs-To: \n"

-"PO-Revision-Date: 2013-07-10 16:58+0100\n"
+"PO-Revision-Date: 2020-11-06 17:26+0100\n"

 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org."
 "pl>\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org."
 "pl>\n"

-"Language: \n"
+"Language: pl\n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 2.3\n"

 
 #: wiki/forms.py:17 wiki/forms.py:61 wiki/views.py:284
 msgid "Publishable"
 
 #: wiki/forms.py:17 wiki/forms.py:61 wiki/views.py:284
 msgid "Publishable"


@@ -43,7 +43,7 @@ msgstr "Twój komentarz"
 
 #: wiki/forms.py:50
 msgid "Describe changes you made."
 
 #: wiki/forms.py:50
 msgid "Describe changes you made."

-msgstr "Opisz swoje zmiany"
+msgstr "Opisz swoje zmiany."

 
 #: wiki/forms.py:56
 msgid "Completed"
 
 #: wiki/forms.py:56
 msgid "Completed"


@@ -99,7 +99,7 @@ msgstr "Wersja"
 
 #: wiki/templates/wiki/document_details_base.html:52
 msgid "Unknown"
 
 #: wiki/templates/wiki/document_details_base.html:52
 msgid "Unknown"

-msgstr "nieznana"
+msgstr "Nieznana"

 
 #: wiki/templates/wiki/document_details_base.html:54
 #: wiki/templates/wiki/pubmark_dialog.html:16
 
 #: wiki/templates/wiki/document_details_base.html:54
 #: wiki/templates/wiki/pubmark_dialog.html:16


@@ -244,11 +244,11 @@ msgstr "stron maszynopisu"
 
 #: wiki/templates/wiki/tabs/summary_view.html:41
 msgid "without footnotes and themes"
 
 #: wiki/templates/wiki/tabs/summary_view.html:41
 msgid "without footnotes and themes"

-msgstr ""
+msgstr "bez przypisów i motywów"

 
 #: wiki/templates/wiki/tabs/summary_view.html:42
 msgid "with footnotes and themes"
 
 #: wiki/templates/wiki/tabs/summary_view.html:42
 msgid "with footnotes and themes"

-msgstr ""
+msgstr "z przypisami i motywami"

 
 #: wiki/templates/wiki/tabs/summary_view.html:45
 msgid "untagged"
 
 #: wiki/templates/wiki/tabs/summary_view.html:45
 msgid "untagged"


@@ -266,6 +266,10 @@ msgstr "Wstaw motyw"
 msgid "Insert annotation"
 msgstr "Wstaw przypis"
 
 msgid "Insert annotation"
 msgstr "Wstaw przypis"
 

+#: wiki/templates/wiki/tabs/wysiwyg_editor.html:13
+msgid "Insert reference"
+msgstr "Wstaw referencję"
+

 #: wiki/templates/wiki/tabs/wysiwyg_editor_item.html:3
 msgid "Visual editor"
 msgstr "Edytor wizualny"
 #: wiki/templates/wiki/tabs/wysiwyg_editor_item.html:3
 msgid "Visual editor"
 msgstr "Edytor wizualny"

diff --git a/src/wiki/templates/wiki/tabs/wysiwyg_editor.html b/src/wiki/templates/wiki/tabs/wysiwyg_editor.html
index 296f60a..8b65bb5 100644 (file)
--- a/src/wiki/templates/wiki/tabs/wysiwyg_editor.html
+++ b/src/wiki/templates/wiki/tabs/wysiwyg_editor.html
@@ -6,10 +6,13 @@
         <button class="btn btn-info mr-2" id="insert-theme-button">
           {% trans "Insert theme" %}
         </button>
         <button class="btn btn-info mr-2" id="insert-theme-button">
           {% trans "Insert theme" %}
         </button>

-        <button class="btn btn-info" id="insert-annotation-button">
+        <button class="btn btn-info mr-2" id="insert-annotation-button">

           {% trans "Insert annotation" %}
         </button>
           {% trans "Insert annotation" %}
         </button>

-       {% endif %}
+        <button class="btn btn-info" id="insert-reference-button">
+          {% trans "Insert reference" %}
+        </button>
+      {% endif %}

     </div>
   </div>
   <div id="html-view" class="htmlview">
     </div>
   </div>
   <div id="html-view" class="htmlview">