From 987b8f97cc92737294840efbfb9b3c54ff334b66 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Thu, 27 Jul 2017 11:42:23 +0200 Subject: [PATCH 1/1] increased word spacing in WL XML --- apps/toolbar/fixtures/initial_toolbar.yaml | 13 ++++++++++++- lib/librarian | 2 +- redakcja/static/css/book.css | 6 ++++++ redakcja/static/css/html.css | 5 +++++ redakcja/static/css/html_print.css | 6 ++++++ redakcja/static/js/wiki/view_editor_wysiwyg.js | 2 +- redakcja/static/js/wiki/xslt.js | 2 +- redakcja/static/xsl/wl2html_client.xsl | 2 +- 8 files changed, 33 insertions(+), 5 deletions(-) diff --git a/apps/toolbar/fixtures/initial_toolbar.yaml b/apps/toolbar/fixtures/initial_toolbar.yaml index 5766ec73..bc2ea1c2 100644 --- a/apps/toolbar/fixtures/initial_toolbar.yaml +++ b/apps/toolbar/fixtures/initial_toolbar.yaml @@ -435,6 +435,17 @@ tooltip: '' model: toolbar.button pk: 49 +- fields: + accesskey: '' + group: [15] + label: "wi\u0119ksze odst\u0119py" + link: '' + params: '{"tag": "wieksze_odstepy"}' + scriptlet: insert_tag + slug: wieksze-odstepy + tooltip: "wi\u0119ksze odst\u0119py mi\u0119dzy s\u0142owami" + model: toolbar.button + pk: 50 - fields: accesskey: '' group: [29] @@ -721,7 +732,7 @@ params: '{"tag": "wers_do_prawej"}' scriptlet: insert_tag slug: wers-do-prawej - tooltip: "wers wyrównany do prawej" + tooltip: "wers wyr\xf3wnany do prawej" model: toolbar.button pk: 109 - fields: diff --git a/lib/librarian b/lib/librarian index fee2ad60..a4af74c1 160000 --- a/lib/librarian +++ b/lib/librarian @@ -1 +1 @@ -Subproject commit fee2ad602df51da7201802a325c1d38def5263ce +Subproject commit a4af74c13b9139bb75ce9e6d40d743f58089b2ef diff --git a/redakcja/static/css/book.css b/redakcja/static/css/book.css index c68e46ec..89edfdf2 100644 --- a/redakcja/static/css/book.css +++ b/redakcja/static/css/book.css @@ -394,6 +394,12 @@ em.person { font-variant: small-caps; } +em.wieksze-odstepy +{ + font-style: normal; + word-spacing: 1em; +} + .verse:after { content: "\feff"; } diff --git a/redakcja/static/css/html.css b/redakcja/static/css/html.css index 01c623ad..003d7d23 100644 --- a/redakcja/static/css/html.css +++ b/redakcja/static/css/html.css @@ -302,6 +302,11 @@ font-variant: small-caps; } +em.wieksze_odstepy { + font-style: normal; + word-spacing: 1em; +} + .htmlview .parse-warning { display: block; font-size: 10pt; diff --git a/redakcja/static/css/html_print.css b/redakcja/static/css/html_print.css index 63a2d439..2cb6d412 100644 --- a/redakcja/static/css/html_print.css +++ b/redakcja/static/css/html_print.css @@ -234,3 +234,9 @@ font-style: normal; font-variant: small-caps; } + +.htmlview em.wieksze-odstepy +{ + font-style: normal; + word-spacing: 1em; +} diff --git a/redakcja/static/js/wiki/view_editor_wysiwyg.js b/redakcja/static/js/wiki/view_editor_wysiwyg.js index 4353848e..3ec4f701 100644 --- a/redakcja/static/js/wiki/view_editor_wysiwyg.js +++ b/redakcja/static/js/wiki/view_editor_wysiwyg.js @@ -206,7 +206,7 @@ if($('div.html-editarea textarea')[0]) { var specialCharsContainer = $("
Zamknij
"); - var specialChars = ['Ą','ą','Ć','ć','Ę','ę','Ł','ł','Ń','ń','Ó','ó','Ś','ś','Ż','ż','Ź','ź','Á','á','À','à', + var specialChars = [' ', 'Ą','ą','Ć','ć','Ę','ę','Ł','ł','Ń','ń','Ó','ó','Ś','ś','Ż','ż','Ź','ź','Á','á','À','à', 'Â','â','Ä','ä','Å','å','Ā','ā','Ă','ă','Ã','ã', 'Æ','æ','Ç','ç','Č','č','Ċ','ċ','Ď','ď','É','é','È','è', 'Ê','ê','Ë','ë','Ē','ē','Ě','ě','Ġ','ġ','Ħ','ħ','Í','í','Î','î', diff --git a/redakcja/static/js/wiki/xslt.js b/redakcja/static/js/wiki/xslt.js index b4844a56..1ddd7325 100644 --- a/redakcja/static/js/wiki/xslt.js +++ b/redakcja/static/js/wiki/xslt.js @@ -17,7 +17,7 @@ function withStylesheets(code_block, onError) if (!xml2htmlStylesheet) { $.blockUI({message: 'Ładowanie arkuszy stylów...'}); $.ajax({ - url: STATIC_URL + 'xsl/wl2html_client.xsl?20170726', + url: STATIC_URL + 'xsl/wl2html_client.xsl?20170727', dataType: 'xml', timeout: 10000, success: function(data) { diff --git a/redakcja/static/xsl/wl2html_client.xsl b/redakcja/static/xsl/wl2html_client.xsl index 09b6b793..33413afd 100644 --- a/redakcja/static/xsl/wl2html_client.xsl +++ b/redakcja/static/xsl/wl2html_client.xsl @@ -627,7 +627,7 @@ - + -- 2.20.1