From 8fabcd0224b1122a48b495326854bb3562cd2e9d Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 27 Aug 2020 15:25:18 +0200 Subject: Add Markdown Extra formatter Library: [Parsedown Extra](https://github.com/erusev/parsedown-extra) Also sort dependencies alphabetically. Fixes #1169 --- tpl/default/includes.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tpl') diff --git a/tpl/default/includes.html b/tpl/default/includes.html index 227f9b52..09768ac4 100644 --- a/tpl/default/includes.html +++ b/tpl/default/includes.html @@ -8,7 +8,7 @@ -{if="$formatter==='markdown'"} +{if="strpos($formatter, 'markdown') !== false"} {/if} {loop="$plugins_includes.css_files"} -- cgit v1.2.3 From 4cf3564d28dc8e4d08a3e64f09ad045ffbde97ae Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 25 Sep 2020 13:29:36 +0200 Subject: Add a setting to retrieve bookmark metadata asynchrounously - There is a new standalone script (metadata.js) which requests a new controller to get bookmark metadata and fill the form async - This feature is enabled with the new setting: general.enable_async_metadata (enabled by default) - general.retrieve_description is now enabled by default - A small rotating loader animation has a been added to bookmark inputs when metadata is being retrieved (default template) - Custom JS htmlentities has been removed and mathiasbynens/he library is used instead Fixes #1563 --- tpl/default/editlink.html | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'tpl') diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html index 568545bd..7ab7e1fe 100644 --- a/tpl/default/editlink.html +++ b/tpl/default/editlink.html @@ -12,6 +12,8 @@ action="{$base_path}/admin/shaare" class="page-form pure-u-lg-3-5 pure-u-22-24 page-form page-form-light" > + {$asyncLoadClass=$link_is_new && $async_metadata && empty($link.title) ? 'loading-input' : ''} +

{if="!$link_is_new"}{'Edit Shaare'|t}{else}{'New Shaare'|t}{/if}

@@ -28,21 +30,32 @@
-
- +
+ +
+ +
-
+
+
+ +
-
+
+
+ +
@@ -88,5 +101,6 @@
{include="page.footer"} + {if="$link_is_new && $async_metadata"}{/if} -- cgit v1.2.3 From 7f5250421be4832b9679d8140bc4a71c8005dfa3 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 16 Oct 2020 12:47:11 +0200 Subject: Support using Shaarli without URL rewriting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Shaarli can be fully used by prefixing any URL with /index.php/ - {$base_path} used in templates already works with this configuration - Assets path (outside of theme's assets) must be prefixed with {$root_url}/ - Documentation section in « Server configuration » Fixes #1590 --- tpl/default/daily.html | 2 +- tpl/default/includes.html | 4 ++-- tpl/default/linklist.html | 2 +- tpl/default/page.footer.html | 4 ++-- tpl/default/picwall.html | 2 +- tpl/default/pluginsadmin.html | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tpl') diff --git a/tpl/default/daily.html b/tpl/default/daily.html index 3ab8053f..3749bffb 100644 --- a/tpl/default/daily.html +++ b/tpl/default/daily.html @@ -76,7 +76,7 @@
{if="$thumbnails_enabled && !empty($link.thumbnail)"}
- thumbnail
diff --git a/tpl/default/includes.html b/tpl/default/includes.html index 09768ac4..3e3fb664 100644 --- a/tpl/default/includes.html +++ b/tpl/default/includes.html @@ -12,10 +12,10 @@ {/if} {loop="$plugins_includes.css_files"} - + {/loop} {if="is_file('data/user.css')"} - + {/if} diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index b08773d8..e1fb54dd 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -140,7 +140,7 @@
{ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html index 51bdb2f0..ea84aab9 100644 --- a/tpl/default/page.footer.html +++ b/tpl/default/page.footer.html @@ -10,7 +10,7 @@ {/if} · {'The personal, minimalist, super-fast, database free, bookmarking service'|t} {'by the Shaarli community'|t} · - {'Documentation'|t} + {'Documentation'|t} {loop="$plugins_footer.text"} {$value} {/loop} @@ -25,7 +25,7 @@ {/loop} {loop="$plugins_footer.js_files"} - + {/loop}