{$link.title}

{if="!isLoggedIn()"} -

diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html index 23796ac9..2f7e03dc 100644 --- a/tpl/default/picwall.html +++ b/tpl/default/picwall.html @@ -18,9 +18,9 @@ {/loop}

{loop="$linksToDisplay"} -

{$value.thumbnail}{$value.title} {loop="$value.picwall_plugin"} {$value} diff --git a/tpl/default/pluginsadmin.html b/tpl/default/pluginsadmin.html index fa26c859..8f2597df 100644 --- a/tpl/default/pluginsadmin.html +++ b/tpl/default/pluginsadmin.html @@ -16,7 +16,7 @@

- +

diff --git a/tpl/default/tag.cloud.html b/tpl/default/tag.cloud.html index 12701465..9e52158d 100644 --- a/tpl/default/tag.cloud.html +++ b/tpl/default/tag.cloud.html @@ -45,7 +45,7 @@ {/loop}

{loop="tags"} {$key}{$value.count} diff --git a/tpl/default/tag.list.html b/tpl/default/tag.list.html index 7140c67a..772d6ad3 100644 --- a/tpl/default/tag.list.html +++ b/tpl/default/tag.list.html @@ -21,7 +21,7 @@

{/if} -

@@ -45,7 +45,7 @@ {/loop}

{loop="tags"}

-- cgit v1.2.3 From 4de024d7c3100f769d12fbfb24ae3599823b47af Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 13 May 2018 12:32:41 +0200 Subject: Adds Stakali Android app to 3rd party lists --- tpl/default/tools.html | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tpl/default') diff --git a/tpl/default/tools.html b/tpl/default/tools.html index 72fd58af..ece66884 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html @@ -146,8 +146,14 @@

- Android + title="Android Shaarlier"> + Android Shaarlier + +

+ + Android Stakali

-- cgit v1.2.3 From 89ccc83ba497fa91eaaf2a2a52d8549aea5e2aee Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Wed, 18 Apr 2018 23:45:05 +0200 Subject: Login: update PageBuilder and default/vintage templates Signed-off-by: VirtualTam --- tpl/default/linklist.html | 8 ++++---- tpl/default/linklist.paging.html | 4 ++-- tpl/default/page.footer.html | 2 +- tpl/default/page.header.html | 10 +++++----- tpl/default/tag.list.html | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'tpl/default') diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index d546be0a..322cddd5 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -136,7 +136,7 @@

{$thumb}

{/if} - {if="isLoggedIn()"} + {if="$is_logged_in"}

{if="$value.private"} {$strPrivate} @@ -179,7 +179,7 @@

- {if="isLoggedIn()"} + {if="$is_logged_in"}

@@ -196,7 +196,7 @@

{/if} - {if="!$hide_timestamps || isLoggedIn()"} + {if="!$hide_timestamps || $is_logged_in"} {$updated=$value.updated_timestamp ? $strEdited. format_date($value.updated) : $strPermalink} @@ -236,7 +236,7 @@ {if="$link_plugin_counter - 1 != $counter"}·{/if} {/loop} {/if} - {if="isLoggedIn()"} + {if="$is_logged_in"} · diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html index 72bdd931..5309e348 100644 --- a/tpl/default/linklist.paging.html +++ b/tpl/default/linklist.paging.html @@ -1,11 +1,11 @@

- {if="isLoggedIn() or !empty($action_plugin)"} + {if="$is_logged_in or !empty($action_plugin)"} {'Filters'|t} - {if="isLoggedIn()"} + {if="$is_logged_in"} diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html index 34193743..5af39be7 100644 --- a/tpl/default/page.footer.html +++ b/tpl/default/page.footer.html @@ -4,7 +4,7 @@

Shaarli - {if="isLoggedIn()===true"} + {if="$is_logged_in===true"} {$version} {/if} · diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index 18aa77c8..82568d63 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html @@ -17,7 +17,7 @@ {$shaarlititle} - {if="isLoggedIn() || $openshaarli"} + {if="$is_logged_in || $openshaarli"}

{'Shaare'|t} @@ -50,7 +50,7 @@

- {if="isLoggedIn()"} + {if="$is_logged_in"} @@ -74,7 +74,7 @@ - {if="!isLoggedIn()"} + {if="!$is_logged_in"}

- {if="!isLoggedIn()"} + {if="!$is_logged_in"} {/if} -{if="!empty($plugin_errors) && isLoggedIn()"} +{if="!empty($plugin_errors) && $is_logged_in"}

diff --git a/tpl/default/tag.list.html b/tpl/default/tag.list.html index 772d6ad3..bcddcd56 100644 --- a/tpl/default/tag.list.html +++ b/tpl/default/tag.list.html @@ -49,7 +49,7 @@ {loop="tags"}

- {if="isLoggedIn()===true"} + {if="$is_logged_in===true"} @@ -63,7 +63,7 @@ {$value} {/loop}

- {if="isLoggedIn()===true"} + {if="$is_logged_in===true"}

@@ -81,7 +81,7 @@

-{if="isLoggedIn()===true"} +{if="$is_logged_in===true"} Date: Thu, 7 Jun 2018 14:23:41 +0100 Subject: also for new default tpl add meta tag to block sending the referrer vintage -> #692 --- tpl/default/includes.html | 1 + 1 file changed, 1 insertion(+) (limited to 'tpl/default') diff --git a/tpl/default/includes.html b/tpl/default/includes.html index 34e0ff01..5ccacaaf 100644 --- a/tpl/default/includes.html +++ b/tpl/default/includes.html @@ -2,6 +2,7 @@ + -- cgit v1.2.3 From e85b7a05a177f803ae36ba5c12835313f31177bc Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 11 Nov 2017 14:01:21 +0100 Subject: Update thumbnail integration after rebasing the branch --- tpl/default/configure.html | 20 +++++++++++++ tpl/default/linklist.html | 15 ++++++++-- tpl/default/page.header.html | 8 ++++-- tpl/default/picwall.html | 68 ++++++++++++++++++++++++++------------------ 4 files changed, 77 insertions(+), 34 deletions(-) (limited to 'tpl/default') diff --git a/tpl/default/configure.html b/tpl/default/configure.html index a63c7ad3..b91fc07e 100644 --- a/tpl/default/configure.html +++ b/tpl/default/configure.html @@ -242,6 +242,26 @@

+ + {'Enable thumbnails'|t}
+ + {'Warning: '|t} + {'It\'s recommended to visit the picture wall after enabling this feature.'|t} + {'If you have a large database, the first retrieval may take a few minutes.'|t} + + +

+ +

diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 322cddd5..bf88e161 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -131,9 +131,17 @@

- {$thumb=thumbnail($value.url)} - {if="$thumb!=false"} -

{$thumb}

+ {if="$thumbnails_enabled && !empty($value.thumbnail)"} +

+ + {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} +

+ +

{/if} {if="$is_logged_in"} @@ -268,5 +276,6 @@

{include="page.footer"} + diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index 82568d63..840e4352 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html @@ -30,9 +30,11 @@ - + {if="$thumbnails_enabled"} + + {/if} diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html index 2f7e03dc..1ea9c20a 100644 --- a/tpl/default/picwall.html +++ b/tpl/default/picwall.html @@ -5,41 +5,53 @@ {include="page.header"} +{if="!$thumbnails_enabled"} +

+ {'Picture wall unavailable (thumbnails are disabled).'|t} +

+{else} +

+ {$countPics=count($linksToDisplay)} +

{'Picture Wall'|t} - {$countPics} {'pics'|t}

- {$countPics=count($linksToDisplay)} -

{'Picture Wall'|t} - {$countPics} {'pics'|t}

- -

- {loop="$plugin_start_zone"} - {$value} - {/loop} -

+ {loop="$plugin_start_zone"} + {$value} + {/loop} +

- {loop="$linksToDisplay"} -

- {$value.thumbnail}{$value.title} - {loop="$value.picwall_plugin"} - {$value} - {/loop} -

- {/loop} -

+ {loop="$linksToDisplay"} +

+ {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} + thumbnail

+ {$value.title} + {loop="$value.picwall_plugin"} + {$value} + {/loop} +

+ {/loop} +

- {loop="$plugin_end_zone"} - {$value} - {/loop} +

+ {loop="$plugin_end_zone"} + {$value} + {/loop} +

+{/if} {include="page.footer"} - + -- cgit v1.2.3 From 787faa42f3a2bcbf83a7853f23f3667a6febf9da Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 6 Apr 2018 18:21:47 +0200 Subject: Take code review into account Upgrade web-thumbnailer and display thumbs right after download --- tpl/default/configure.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'tpl/default') diff --git a/tpl/default/configure.html b/tpl/default/configure.html index b91fc07e..5695ae8e 100644 --- a/tpl/default/configure.html +++ b/tpl/default/configure.html @@ -249,8 +249,12 @@ {'Enable thumbnails'|t}
{'Warning: '|t} - {'It\'s recommended to visit the picture wall after enabling this feature.'|t} - {'If you have a large database, the first retrieval may take a few minutes.'|t} + {if="$gd_enabled"} + {'It\'s recommended to visit the picture wall after enabling this feature.'|t} + {'If you have a large database, the first retrieval may take a few minutes.'|t} + {else} + {'You need to enable the extension php-gd to use thumbnails.'|t} + {/if}

@@ -258,7 +262,7 @@

+ {if="$thumbnails_enabled"}checked{/if} {if="!$gd_enabled"}disabled{/if} />

-- cgit v1.2.3 From 28f26524609338316cc6e51c743058e6e8c7b12b Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 8 Jun 2018 12:50:49 +0200 Subject: Add a page to update all thumbnails through AJAX requests in both templates --- tpl/default/configure.html | 8 +++----- tpl/default/page.header.html | 14 +++++++++++++ tpl/default/thumbnails.html | 48 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 tpl/default/thumbnails.html (limited to 'tpl/default') diff --git a/tpl/default/configure.html b/tpl/default/configure.html index 5695ae8e..dca9503b 100644 --- a/tpl/default/configure.html +++ b/tpl/default/configure.html @@ -248,12 +248,10 @@ {'Enable thumbnails'|t}
- {'Warning: '|t} - {if="$gd_enabled"} - {'It\'s recommended to visit the picture wall after enabling this feature.'|t} - {'If you have a large database, the first retrieval may take a few minutes.'|t} - {else} + {if="! $gd_enabled"} {'You need to enable the extension php-gd to use thumbnails.'|t} + {elseif="$thumbnails_enabled"} + {'Synchonize thumbnails'|t} {/if} diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index 840e4352..fc03404e 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html @@ -171,4 +171,18 @@

{/if} +{if="!empty($global_warnings) && $is_logged_in"} +

+ {loop="global_warnings"} +

{$value}

+ {/loop} +

+ +

+{/if} +

diff --git a/tpl/default/thumbnails.html b/tpl/default/thumbnails.html new file mode 100644 index 00000000..a8cf904e --- /dev/null +++ b/tpl/default/thumbnails.html @@ -0,0 +1,48 @@ + + + + {include="includes"} + + +{include="page.header"} + +

{'Thumbnails update'|t}

+ +

+ 0 / {$ids|count} +

+ + +

+ +{include="page.footer"} + + + -- cgit v1.2.3 From fcba541e2f12c85ac56c6915ba1319fbdd3e6962 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 1 Jul 2018 11:44:35 +0200 Subject: Bump WT version --- tpl/default/picwall.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tpl/default') diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html index 1ea9c20a..1b8bf3b9 100644 --- a/tpl/default/picwall.html +++ b/tpl/default/picwall.html @@ -24,9 +24,9 @@ {/loop}

{loop="$linksToDisplay"} -

{ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}

Date: Thu, 5 Jul 2018 20:29:55 +0200 Subject: Thumbnails: add a common mode to only retrieve thumbs from popular media websites --- tpl/default/configure.html | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'tpl/default') diff --git a/tpl/default/configure.html b/tpl/default/configure.html index dca9503b..9711d151 100644 --- a/tpl/default/configure.html +++ b/tpl/default/configure.html @@ -259,8 +259,17 @@

- +

-- cgit v1.2.3 From 738b1873c35e85f137c3a72504c69468669cc01b Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sat, 7 Jul 2018 19:03:12 +0200 Subject: tpl: default/vintage: pluginsadmin: fix link to documentation Ref #930 --- tpl/default/pluginsadmin.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tpl/default') diff --git a/tpl/default/pluginsadmin.html b/tpl/default/pluginsadmin.html index 8f2597df..82041972 100644 --- a/tpl/default/pluginsadmin.html +++ b/tpl/default/pluginsadmin.html @@ -117,7 +117,7 @@

{"More plugins available"|t} - {"in the documentation"|t}. + {"in the documentation"|t}.

-- cgit v1.2.3 From 7b4fea0e39be9e74e9aef13e73af9bbd2b1a6397 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 17 Jul 2018 13:13:26 +0200 Subject: Bunch of improvement for thumbnails integration: - add a default thumb size value (125x90px) - improve private vertical bar visual, especially with thumbnails - translations - add a sync thumbs button in tool and empty picwall page - fixes WT download mode in JSON config --- tpl/default/configure.html | 2 +- tpl/default/linklist.html | 2 +- tpl/default/picwall.html | 8 ++++++++ tpl/default/tools.html | 8 ++++++++ 4 files changed, 18 insertions(+), 2 deletions(-) (limited to 'tpl/default') diff --git a/tpl/default/configure.html b/tpl/default/configure.html index 9711d151..42e32230 100644 --- a/tpl/default/configure.html +++ b/tpl/default/configure.html @@ -251,7 +251,7 @@ {if="! $gd_enabled"} {'You need to enable the extension php-gd to use thumbnails.'|t} {elseif="$thumbnails_enabled"} - {'Synchonize thumbnails'|t} + {'Synchronize thumbnails'|t} {/if} diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index bf88e161..8ea2ce66 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -132,7 +132,7 @@

{if="$thumbnails_enabled && !empty($value.thumbnail)"} -

{ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html index 1b8bf3b9..9a0b10dc 100644 --- a/tpl/default/picwall.html +++ b/tpl/default/picwall.html @@ -12,6 +12,14 @@

{else} + {if="count($linksToDisplay)===0 && $is_logged_in"} +

+ {'There is no cached thumbnail. Try to synchronize them.'|t} +

+ {/if} +

diff --git a/tpl/default/tools.html b/tpl/default/tools.html index ece66884..20060994 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html @@ -45,6 +45,14 @@

+ {if="$thumbnails_enabled"} +

+ + {'Synchronize thumbnails'|t} + +

+ {/if} + {loop="$tools_plugin"}

{$value} -- cgit v1.2.3 From e87f57c75890fe619e454fed3d7077a2eb63ac0d Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 17 Nov 2017 19:09:49 +0100 Subject: Remove Firefox Social API shaare Firefox Social support has been dropped in Firefox 57. Related to #1023 --- tpl/default/tools.html | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'tpl/default') diff --git a/tpl/default/tools.html b/tpl/default/tools.html index 20060994..6b4d7bec 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html @@ -120,23 +120,6 @@

-{if="$sslenabled"} -

Firefox Social API

{'You need to browse your Shaarli over HTTPS to use this functionality.'|t}

- -

- - ✚ {'Add to'|t} Firefox Social - -

-{/if} -

-- cgit v1.2.3 From bf3c9934d2dc02cead5995570239c5c6230ed5e5 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 29 Jul 2018 17:40:05 +0200 Subject: Fix fatal error on daily page: use new thumbnail system Also fix: * include the login manager in the daily RSS feed function * remove redirector setting in the vintage theme Fixes #1190 --- tpl/default/daily.html | 12 ++++++++---- tpl/default/dailyrss.html | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'tpl/default') diff --git a/tpl/default/daily.html b/tpl/default/daily.html index 29d845d5..816e5d0a 100644 --- a/tpl/default/daily.html +++ b/tpl/default/daily.html @@ -69,9 +69,12 @@ {$link.title}

- {$thumb=thumbnail($value.url)} - {if="$thumb!=false"} -

{$thumb}

+ {if="$thumbnails_enabled && !empty($link.thumbnail)"} +

{/if}

{$link.formatedDescription}

{if="$link.tags"} @@ -83,7 +86,7 @@ {/loop}

{/if} -

{loop="$link.link_plugin"} {$value} {/loop} @@ -108,6 +111,7 @@

{include="page.footer"} + diff --git a/tpl/default/dailyrss.html b/tpl/default/dailyrss.html index b14a3859..f589b06e 100644 --- a/tpl/default/dailyrss.html +++ b/tpl/default/dailyrss.html @@ -8,7 +8,7 @@

{$value.title}

{if="!$hide_timestamps"}{function="strftime('%c', $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags}{/if}
{$value.url}
- {if="$value.thumbnail"}{$value.thumbnail}{/if}
+ {if="$value.thumbnail"}

{/if}
{if="$value.description"}{$value.formatedDescription}{/if}

{/loop} -- cgit v1.2.3 From a71e1aa73e575f3799100396db8f28808fde797d Mon Sep 17 00:00:00 2001 From: llune Date: Thu, 2 Aug 2018 21:21:00 +0200 Subject: empty alt on logo image The alt does not provide any useful information for screenreader users. It just adds noise. --- tpl/default/page.header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tpl/default') diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index fc03404e..c010aa8b 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html @@ -2,7 +2,7 @@

{$shaarlititle} -- cgit v1.2.3 From 667963435f45e678e800e7503c8651d884a58cc1 Mon Sep 17 00:00:00 2001 From: llune Date: Thu, 2 Aug 2018 21:23:34 +0200 Subject: alt should be empty --- tpl/default/page.header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tpl/default') diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index c010aa8b..3b43a611 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html @@ -13,7 +13,7 @@

- + {$shaarlititle}

Date: Thu, 2 Aug 2018 22:48:00 +0200 Subject: Delete redundant titles Redundant titles are an accessibility issue and should be avoided. See : https://accessibilitytips.com/2008/04/14/avoiding-redundant-title-attributes/ --- tpl/default/tools.html | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'tpl/default') diff --git a/tpl/default/tools.html b/tpl/default/tools.html index 6b4d7bec..c9ce1eaf 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html @@ -125,25 +125,22 @@

{'3rd party'|t}

- + Firefox {'plugin'|t}

- + Chrome {'plugin'|t}

- + Android Shaarlier

- + Android Stakali

-- cgit v1.2.3 From a120fb2977331e0f7d7ffe05861ba179fdae8764 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Mon, 13 Aug 2018 10:42:27 +0200 Subject: Add OpenGraph meta tags on permalink page Includes: - og:title - og:type -> article - og:image -> if there is a thumbnail - og:url -> permalink - og:description -> first 300 chars of raw description - article:published_time - article:modified_time - article:tag -> one OG meta tag for each shaare tag Fixes #258 --- tpl/default/includes.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'tpl/default') diff --git a/tpl/default/includes.html b/tpl/default/includes.html index 5ccacaaf..0427e224 100644 --- a/tpl/default/includes.html +++ b/tpl/default/includes.html @@ -15,3 +15,23 @@ {/if} +{if="! empty($links) && count($links) === 1"} + {$link=reset($links)} + + + + {$ogDescription=isset($link.description_src) ? $link.description_src : $link.description} + + {if="$link.thumbnail"} + + {/if} + {if="!$hide_timestamps || $is_logged_in"} + + {if="$link.updated"} + + {/if} + {/if} + {loop="link.taglist"} + + {/loop} +{/if} -- cgit v1.2.3 From fc574e64544db2f7b56443a827e17d58c7561804 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Mon, 13 Aug 2018 13:13:26 +0200 Subject: Add a button to toggle all checkboxes of displayed links Related to #1160 --- tpl/default/linklist.html | 2 +- tpl/default/linklist.paging.html | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'tpl/default') diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 8ea2ce66..97730c29 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -190,7 +190,7 @@ {if="$is_logged_in"}

- + diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html index 5309e348..fe665a84 100644 --- a/tpl/default/linklist.paging.html +++ b/tpl/default/linklist.paging.html @@ -16,6 +16,9 @@ + -- cgit v1.2.3 From 8c75c43e7ee0370eefceea84c6a74383e5c65d4b Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 14 Aug 2018 11:43:54 +0200 Subject: Fix a bug making thumbnail to request the current page --- tpl/default/daily.html | 2 +- tpl/default/linklist.html | 2 +- tpl/default/picwall.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tpl/default') diff --git a/tpl/default/daily.html b/tpl/default/daily.html index 816e5d0a..2c409478 100644 --- a/tpl/default/daily.html +++ b/tpl/default/daily.html @@ -72,7 +72,7 @@ {if="$thumbnails_enabled && !empty($link.thumbnail)"}

{/if} diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 8ea2ce66..2e67775b 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -137,7 +137,7 @@ {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} thumbnail

diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html index 9a0b10dc..4c325487 100644 --- a/tpl/default/picwall.html +++ b/tpl/default/picwall.html @@ -37,7 +37,7 @@

{ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} thumbnail

{$value.title} {loop="$value.picwall_plugin"} -- cgit v1.2.3 From 4154c25b5f2f8044a37d7f84e04173bb54f2375b Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 22 May 2018 22:44:38 +0200 Subject: Add a button to set links as sticky Meaning that they always appear on top of all links Fixes #186 --- tpl/default/linklist.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tpl/default') diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 8ea2ce66..aaa9bc74 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -201,6 +201,12 @@ + + + + +

{/if} -- cgit v1.2.3 From d9bf5b31ff9e2d007ddfb7f7756184f0ca9676c8 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 6 Oct 2018 13:09:11 +0200 Subject: Sticky feature - Add translation and display for logged out users --- tpl/default/linklist.html | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'tpl/default') diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index aaa9bc74..c04f4786 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -125,6 +125,8 @@ {$strPermalink=t('Permalink')} {$strPermalinkLc=t('permalink')} {$strAddTag=t('Add tag')} + {$strToggleSticky=t('Toggle sticky')} + {$strSticky=t('Sticky')} {ignore}End of translations{/ignore} {loop="links"}

@@ -203,11 +205,21 @@ + title="{$strToggleSticky}" class="pin-link {if="$value.sticky"}pinned-link{/if} pure-u-0 pure-u-lg-visible">

+ {else} + {if="$value.sticky"} +

+ + + + + +

+ {/if} {/if} {if="!$hide_timestamps || $is_logged_in"} -- cgit v1.2.3 From db06c261f65199e03245ae704a56e1057f2f7c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luce=20Carevi=C4=87?= Date: Fri, 30 Nov 2018 20:36:10 +0100 Subject: fix translation string --- tpl/default/page.header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tpl/default') diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index 3b43a611..4f6dd4d8 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html @@ -118,7 +118,7 @@

- Delete + {'Delete'|t}

-- cgit v1.2.3 From 0c42c5e3597215949a8c374802f8f25be485f267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luce=20Carevi=C4=87?= Date: Fri, 30 Nov 2018 20:39:13 +0100 Subject: add label to form - accessibility issue Don't use placeholder instead of label for form input. --- tpl/default/addlink.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tpl/default') diff --git a/tpl/default/addlink.html b/tpl/default/addlink.html index 2f956e06..55864a02 100644 --- a/tpl/default/addlink.html +++ b/tpl/default/addlink.html @@ -11,7 +11,8 @@

{"Shaare a new link"|t}

- + {'URL or leave empty to post a note'|t} +

-- cgit v1.2.3 From 2c16e8e9a80dae221a9d7a1907f37129ee3bc2a1 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Fri, 18 Jan 2019 22:58:09 +0100 Subject: fix: ensure HTML tags are stripped from OpenGraph description Fixes https://github.com/shaarli/Shaarli/issues/1250 Relates to https://github.com/shaarli/Shaarli/issues/1242 Signed-off-by: VirtualTam --- tpl/default/includes.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tpl/default') diff --git a/tpl/default/includes.html b/tpl/default/includes.html index 0427e224..6c30d1bf 100644 --- a/tpl/default/includes.html +++ b/tpl/default/includes.html @@ -21,7 +21,7 @@ {$ogDescription=isset($link.description_src) ? $link.description_src : $link.description} - + {if="$link.thumbnail"} {/if} -- cgit v1.2.3

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

Date: Thu, 10 May 2018 13:26:11 +0200 Subject: Add classes to default template to avoid using IDs in SCSS --- tpl/default/404.html | 2 +- tpl/default/editlink.html | 2 +- tpl/default/import.html | 2 +- tpl/default/linklist.html | 2 +- tpl/default/loginform.html | 2 +- tpl/default/page.footer.html | 2 +- tpl/default/page.header.html | 6 +++--- tpl/default/picwall.html | 4 ++-- tpl/default/pluginsadmin.html | 2 +- tpl/default/tag.cloud.html | 2 +- tpl/default/tag.list.html | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) (limited to 'tpl/default') diff --git a/tpl/default/404.html b/tpl/default/404.html index 2de6b6da..fd337cad 100644 --- a/tpl/default/404.html +++ b/tpl/default/404.html @@ -6,7 +6,7 @@

diff --git a/tpl/default/import.html b/tpl/default/import.html index 000a50ac..bdc9086e 100644 --- a/tpl/default/import.html +++ b/tpl/default/import.html @@ -15,7 +15,7 @@

{'Picture Wall'|t} - {$countPics} {'pics'|t}

{'Picture Wall'|t} - {$countPics} {'pics'|t}

{'Thumbnails update'|t}

Firefox Social API

{$value.title}

{'3rd party'|t}

{"Shaare a new link"|t}

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

{'Sorry, nothing to see here.'|t}

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

{'Sorry, nothing to see here.'|t}

diff --git a/tpl/default/import.html b/tpl/default/import.html index 000a50ac..bdc9086e 100644 --- a/tpl/default/import.html +++ b/tpl/default/import.html @@ -15,7 +15,7 @@

{'Login'|t}

{'Picture Wall'|t} - {$countPics} {'pics'|t}

{'Picture Wall'|t} - {$countPics} {'pics'|t}

{'Thumbnails update'|t}

Firefox Social API

{$value.title}

{'3rd party'|t}

{"Shaare a new link"|t}