fix edit buttons wrapping

diff --git a/src/redakcja/static/css/html.scss b/src/redakcja/static/css/html.scss
index 61d5a79..fb76fbb 100644 (file)
--- a/src/redakcja/static/css/html.scss
+++ b/src/redakcja/static/css/html.scss
@@ -383,6 +383,7 @@ div[x-node] > .uwaga {
         background-color: #FAFAFA;
         border: 1px solid #DDD;
         border-bottom: none;
         background-color: #FAFAFA;
         border: 1px solid #DDD;
         border-bottom: none;

+        white-space: nowrap;

 
         &:hover {
             background-color: #999;
 
         &:hover {
             background-color: #999;

diff --git a/src/redakcja/static/js/wiki/view_editor_wysiwyg.js b/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
index 219b405..afd8108 100644 (file)
--- a/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@ -441,7 +441,7 @@
         }
 
         // start edition on this node
         }
 
         // start edition on this node

-        var $overlay = $('<div class="html-editarea"><div class="html-editarea-toolbar"><div class="html-editarea-toolbar-left"><button class="accept-button">Zapisz</button><button class="delete-button">Usuń</button></div><div class="html-editarea-toolbar-right"><button class="akap-edit-button">tytuł dzieła</button><button class="akap-edit-button">wyróżnienie</button><button class="akap-edit-button">słowo obce</button><button class="akap-edit-button">br</button><button class="akap-edit-button">znak spec.</button></div></div><textarea></textarea></div>').css({
+        var $overlay = $('<div class="html-editarea"><div class="html-editarea-toolbar"><div class="html-editarea-toolbar-left"><button class="accept-button">Zapisz</button><button class="delete-button">Usuń</button></div><div class="html-editarea-toolbar-right"><button class="akap-edit-button" data-tag="tytul_dziela">tytuł dzieła</button><button class="akap-edit-button" data-tag="wyroznienie">wyróżnienie</button><button class="akap-edit-button" data-tag="slowo_obce">słowo obce</button><button class="akap-edit-button" data-tag-selfclosing="br">br</button><button class="akap-edit-button" data-act="spec">znak spec.</button></div></div><textarea></textarea></div>').css({

             position: 'absolute',
             height: h,
             left: x,
             position: 'absolute',
             height: h,
             left: x,


@@ -572,23 +572,20 @@
                     var textAreaOpened = $('textarea', $overlay)[0];
                     var startTag = "";
                     var endTag = "";
                     var textAreaOpened = $('textarea', $overlay)[0];
                     var startTag = "";
                     var endTag = "";

-                    var buttonName = this.innerHTML;
-
-                    if(buttonName == "słowo obce") {
-                        startTag = "<slowo_obce>";
-                        endTag = "</slowo_obce>";
-                    } else if (buttonName == "wyróżnienie") {
-                        startTag = "<wyroznienie>";
-                        endTag = "</wyroznienie>";
-                    } else if (buttonName == "tytuł dzieła") {
-                        startTag = "<tytul_dziela>";
-                        endTag = "</tytul_dziela>";
-                    } else if (buttonName == "znak spec."){
-                        addSymbol();
+                    var tag = "";
+                    var $this = $(this);
+
+                    if ($this.data('tag')) {
+                        tag = $this.data('tag');
+                        startTag = "<" + $this.data('tag') + ">";
+                        endTag = "</" + $this.data('tag') + ">";
+                    } else if ($this.data('tag-selfclosing')){
+                        startTag = "<" + $this.data('tag-selfclosing') + "/>";
+                    } else if ($this.data('act')) {
+                        if ($this.data('act') == 'spec') {
+                            addSymbol();
+                        }

                         return false;
                         return false;

-                    } else if (buttonName == "br") {
-                        startTag = "<br/>";
-                        endTag = "";

                     }
 
                     var myField = textAreaOpened;
                     }
 
                     var myField = textAreaOpened;