From 3d8f5cf84b8baa4a212f5089633af7c640609b62 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 1 Dec 2016 11:40:24 +0100 Subject: [PATCH] Describe markdown HTML rendering and display a warning Fixes #688 --- inc/shaarli.css | 9 +++++++++ plugins/markdown/README.md | 17 +++++++++++++++++ plugins/markdown/markdown.meta | 5 ++++- tpl/pluginsadmin.html | 4 ++-- 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/inc/shaarli.css b/inc/shaarli.css index 5808320c..a24d4b7c 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css @@ -37,6 +37,10 @@ em { font-style: italic; } +strong { + font-weight: bold; +} + /* Buttons */ .bigbutton { background-color: #c0c0c0; @@ -1168,8 +1172,13 @@ ul.errors { } #pluginsadmin a { + color: #486D08; +} + +#pluginsadmin a.arrow { color: black; } + /* 404 page */ .error-container { diff --git a/plugins/markdown/README.md b/plugins/markdown/README.md index 4f021871..c64a831a 100644 --- a/plugins/markdown/README.md +++ b/plugins/markdown/README.md @@ -41,6 +41,23 @@ If the tag `.nomarkdown` is set for a shaare, it won't be converted to Markdown > Note: it's a private tag (leading dot), so it won't be displayed to visitors. +### HTML rendering + +Markdown support HTML tags. For example: + + > strongstrike + +Will render as: + +> strongstrike + +If you want to shaare HTML code, it is necessary to use inline code or code blocks. + +**If your shaared descriptions containing HTML tags before enabling the markdown plugin, +enabling it might break your page.** + +> Note: HTML tags such as script, iframe, etc. are disabled for security reasons. + ### Known issue #### Redirector diff --git a/plugins/markdown/markdown.meta b/plugins/markdown/markdown.meta index e3904ed8..8df2ed0b 100644 --- a/plugins/markdown/markdown.meta +++ b/plugins/markdown/markdown.meta @@ -1 +1,4 @@ -description="Render shaare description with Markdown syntax." +description="Render shaare description with Markdown syntax.
Warning: +If your shaared descriptions containing HTML tags before enabling the markdown plugin, +enabling it might break your page. +See the README." diff --git a/tpl/pluginsadmin.html b/tpl/pluginsadmin.html index 672f4993..ead1734e 100644 --- a/tpl/pluginsadmin.html +++ b/tpl/pluginsadmin.html @@ -38,11 +38,11 @@ - ▲ - ▼ -- 2.41.0