{loop="tags"} - {$value.count} - {$key} + {$value.count}{$key} {loop="$value.tag_plugin"} {$value} {/loop} -- cgit v1.2.3 From cd5327bee83f3e9467d786752bbd447963b941f7 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sun, 10 Apr 2016 17:34:07 +0200 Subject: Refactor Netscape bookmark exporting Relates to https://github.com/shaarli/netscape-bookmark-parser/issues/5 Fixes: - respect the Netscape bookmark format "specification" Modifications: - [application] introduce the NetscapeBookmarkUtils class - [template] export - improve formatting, rename export selection parameter - [template] export.bookmarks - template for Netscape exports - [tests] bookmark filtering, additional field generation Signed-off-by: VirtualTam --- tpl/export.bookmarks.html | 10 ++++++++++ tpl/export.html | 26 ++++++++++++++++---------- 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 tpl/export.bookmarks.html (limited to 'tpl') diff --git a/tpl/export.bookmarks.html b/tpl/export.bookmarks.html new file mode 100644 index 00000000..da733257 --- /dev/null +++ b/tpl/export.bookmarks.html @@ -0,0 +1,10 @@ + + +{ignore}The RainTPL loop is formatted to avoid generating extra newlines{/ignore} +{$pagetitle} +

Shaarli export of {$selection} bookmarks on {$date}

{$value.title}{if="$value.description"}{$eol}: {$value.description}{/if}{/loop} +

diff --git a/tpl/export.html b/tpl/export.html index 9d101db4..9582627a 100644 --- a/tpl/export.html +++ b/tpl/export.html @@ -2,15 +2,21 @@ {include="includes"} -

- {include="page.header"} -

- Export all : Export all links

- Export public : Export public links only

- Export private : Export private links only -

-{include="page.footer"} +

+ {include="page.header"} +

+ + Export all: Export all links +
+ + Export public: Only export public links +
+ + Export private: Only export private links + +

+ {include="page.footer"} -- cgit v1.2.3 From bb4a23aa863b63e6148a085c15dedd7c960b4206 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Thu, 5 May 2016 19:22:06 +0200 Subject: Export: allow prepending notes with the Shaarli instance's URL Relates to #102 Additions: - application: - export: allow prepending note permalinks with the instance's URL - test coverage Modifications: - export template: switch to an HTML form - link selection (all/private/public) - prepend note permalinks with the instance's URL Signed-off-by: VirtualTam --- tpl/export.html | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'tpl') diff --git a/tpl/export.html b/tpl/export.html index 9582627a..67c3d05f 100644 --- a/tpl/export.html +++ b/tpl/export.html @@ -5,15 +5,21 @@

{include="page.header"}

- - Export all: Export all links -
- - Export public: Only export public links -
- - Export private: Only export private links - +

-- cgit v1.2.3 From dbcd06e988d8434f125b8a5ee8f5bbcb7cd87874 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 6 May 2016 19:58:19 +0200 Subject: Reindent the login template --- tpl/loginform.html | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'tpl') diff --git a/tpl/loginform.html b/tpl/loginform.html index 678375fd..f0b45df2 100644 --- a/tpl/loginform.html +++ b/tpl/loginform.html @@ -1,26 +1,27 @@ {include="includes"} - +

- {include="page.header"} + {include="page.header"} -

-{if="!ban_canLogin()"} - You have been banned from login after too many failed attempts. Try later. -{else} - -{/if} -

+ {if="!ban_canLogin()"} + You have been banned from login after too many failed attempts. Try later. + {else} + + {/if} +

{include="page.footer"} -- cgit v1.2.3 From 85c4bdc23581b91971315c42508c2d8f7a5fa738 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 6 May 2016 20:03:10 +0200 Subject: Prefill the login field when the authentication has failed --- tpl/loginform.html | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'tpl') diff --git a/tpl/loginform.html b/tpl/loginform.html index f0b45df2..a49b42d3 100644 --- a/tpl/loginform.html +++ b/tpl/loginform.html @@ -2,7 +2,13 @@ {include="includes"} +{if="ban_canLogin()"} + {if="empty($username)"} + onload="document.loginform.login.focus();" + {else} + onload="document.loginform.password.focus();" + {/if} +{/if}>

{include="page.header"} @@ -11,8 +17,11 @@ You have been banned from login after too many failed attempts. Try later. {else}

- Login: - Password: + Login: + + Password: + -- cgit v1.2.3 From 70860f30d5023837def0b146ac0c44a45a41899a Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 8 May 2016 18:58:59 +0200 Subject: Remove delicious from Shaarli description --- tpl/page.footer.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tpl') diff --git a/tpl/page.footer.html b/tpl/page.footer.html index 195dada0..006d1d68 100644 --- a/tpl/page.footer.html +++ b/tpl/page.footer.html @@ -1,5 +1,7 @@

- Shaarli - The personal, minimalist, super-fast, no-database delicious clone by the Shaarli community - Help/documentation + Shaarli + - The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community + - Help/documentation {loop="$plugins_footer.text"} {$value} {/loop} -- cgit v1.2.3 From 141a86c503af8e314381b3ee39ba4287fdfac63e Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 11 May 2016 00:05:22 +0200 Subject: Add private link counter --- tpl/page.header.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tpl') diff --git a/tpl/page.header.html b/tpl/page.header.html index 52429f23..3a09ecd9 100644 --- a/tpl/page.header.html +++ b/tpl/page.header.html @@ -2,7 +2,8 @@

- {if="!empty($linkcount)"}{$linkcount} links{/if} + {if="!empty($linkcount)"}{$linkcount} links{/if}
+ {if="!empty($privateLinkcount)"}{$privateLinkcount} private links{/if}