From: Jan Szejko Date: Mon, 6 Nov 2017 15:09:26 +0000 (+0100) Subject: add tag ramka X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/713b8720aa2648a430b2d97cffe43e98e59937c4 add tag ramka (cherry picked from commit 8a3484b) --- diff --git a/apps/toolbar/fixtures/initial_toolbar.yaml b/apps/toolbar/fixtures/initial_toolbar.yaml index 539236f6..a997780a 100644 --- a/apps/toolbar/fixtures/initial_toolbar.yaml +++ b/apps/toolbar/fixtures/initial_toolbar.yaml @@ -369,6 +369,17 @@ tooltip: "d\u0142ugi cytat wyr\xF3\u017Cniony sk\u0142adem" model: toolbar.button pk: 42 +- fields: + accesskey: '' + group: [21] + label: "ramka" + link: '' + params: '{"tag": "ramka"}' + scriptlet: insert_tag + slug: ramka + tooltip: "tekst otoczony ramką" + model: toolbar.button + pk: 43 - fields: accesskey: f group: [12, 15] diff --git a/redakcja/static/css/book.css b/redakcja/static/css/book.css index a29d1d63..7f9adda3 100644 --- a/redakcja/static/css/book.css +++ b/redakcja/static/css/book.css @@ -353,6 +353,11 @@ div.note p, div.dedication p, div.note p.paragraph, div.dedication p.paragraph { font-style: italic; } +div.frame { + border: 1px darkgray solid; + padding-bottom: 1.5em; +} + hr.spacer { height: 3em; visibility: hidden; diff --git a/redakcja/static/css/html.css b/redakcja/static/css/html.css index a3986825..754a7f02 100644 --- a/redakcja/static/css/html.css +++ b/redakcja/static/css/html.css @@ -247,6 +247,10 @@ font-style: italic; } +.htmlview div.ramka { + border: 1px darkgray solid; +} + .htmlview .nota_red { background-color: #eee; border: 1px solid #888; diff --git a/redakcja/static/css/html_print.css b/redakcja/static/css/html_print.css index 63a2d439..2a493368 100644 --- a/redakcja/static/css/html_print.css +++ b/redakcja/static/css/html_print.css @@ -195,6 +195,10 @@ font-style: italic; } +.htmlview div.frame { + border: 1px darkgray solid; +} + .htmlview hr.spacer { height: 3em; visibility: hidden; diff --git a/redakcja/static/js/wiki/xslt.js b/redakcja/static/js/wiki/xslt.js index cc71b289..f71d167a 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?20110520', + url: STATIC_URL + 'xsl/wl2html_client.xsl?20171106', dataType: 'xml', timeout: 10000, success: function(data) { diff --git a/redakcja/static/xsl/wl2html_client.xsl b/redakcja/static/xsl/wl2html_client.xsl index 117d24b6..f115a4b7 100644 --- a/redakcja/static/xsl/wl2html_client.xsl +++ b/redakcja/static/xsl/wl2html_client.xsl @@ -213,6 +213,20 @@ + + + +
+ + + + +
+
+