diff --git a/tpl/default/includes.html b/tpl/default/includes.html index b2bfec30..2c56d3c9 100644 --- a/tpl/default/includes.html +++ b/tpl/default/includes.html @@ -6,12 +6,7 @@ - - - - - - + {if="is_file('data/user.css')"} {/if} diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index c666e30a..933c1ef2 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -16,7 +16,6 @@ - - - - + diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html index 248e56df..23796ac9 100644 --- a/tpl/default/picwall.html +++ b/tpl/default/picwall.html @@ -39,7 +39,7 @@

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

{include="page.footer"} - + diff --git a/tpl/default/pluginsadmin.html b/tpl/default/pluginsadmin.html index b2d7cdc5..fa26c859 100644 --- a/tpl/default/pluginsadmin.html +++ b/tpl/default/pluginsadmin.html @@ -176,7 +176,7 @@

{function="str_replace('_', ' ', $key)"}

{include="page.footer"} - + diff --git a/tpl/vintage/changetag.html b/tpl/vintage/changetag.html index a0df3328..670a8dd7 100644 --- a/tpl/vintage/changetag.html +++ b/tpl/vintage/changetag.html @@ -1,8 +1,6 @@ {include="includes"} - -
- floral_left + floral_left The Daily Shaarli - floral_right + floral_right
@@ -50,7 +50,7 @@
- permalink + permalink
{if="!$hide_timestamps || isLoggedIn()"} @@ -94,7 +94,7 @@ {$value} {/loop}
-
-
+
-
{include="page.footer"} diff --git a/tpl/vintage/editlink.html b/tpl/vintage/editlink.html index f855dfb1..5fa7d194 100644 --- a/tpl/vintage/editlink.html +++ b/tpl/vintage/editlink.html @@ -54,10 +54,5 @@ {if="$source !== 'firefoxsocialapi'"} {include="page.footer"} {/if} - - - diff --git a/tpl/vintage/includes.html b/tpl/vintage/includes.html index 17b78b17..4ddfc840 100644 --- a/tpl/vintage/includes.html +++ b/tpl/vintage/includes.html @@ -5,9 +5,8 @@ - - - + + {if="is_file('data/user.css')"}{/if} {loop="$plugins_includes.css_files"} diff --git a/tpl/vintage/linklist.html b/tpl/vintage/linklist.html index 8458caa1..e7137246 100644 --- a/tpl/vintage/linklist.html +++ b/tpl/vintage/linklist.html @@ -22,7 +22,7 @@ {if="!empty($search_tags)"} value="{$search_tags}" {/if} - autocomplete="off" class="awesomplete" data-multiple data-minChars="1" + autocomplete="off" data-multiple data-minChars="1" data-list="{loop="$tags"}{$key}, {/loop}" > @@ -86,13 +86,13 @@
- +

-
@@ -146,10 +146,5 @@ {include="page.footer"} - - - diff --git a/tpl/vintage/linklist.paging.html b/tpl/vintage/linklist.paging.html index 12828a97..e3b88ee6 100644 --- a/tpl/vintage/linklist.paging.html +++ b/tpl/vintage/linklist.paging.html @@ -1,11 +1,11 @@
{if="isLoggedIn()"}
- + {if="$visibility=='private'"} - Filter links by visibility - {else} - Filter links by visibility + Click to see all links + {else} + Click to see only private links {/if} diff --git a/tpl/vintage/page.footer.html b/tpl/vintage/page.footer.html index 4ce0803a..1485e1ce 100644 --- a/tpl/vintage/page.footer.html +++ b/tpl/vintage/page.footer.html @@ -22,11 +22,13 @@ Error: {$versionError}
{/if} + + + {if="isLoggedIn()"} {/if} - {loop="$plugins_footer.js_files"} {/loop} diff --git a/tpl/vintage/picwall.html b/tpl/vintage/picwall.html index 4e227e37..29688914 100644 --- a/tpl/vintage/picwall.html +++ b/tpl/vintage/picwall.html @@ -1,7 +1,6 @@ {include="includes"} - @@ -35,10 +34,6 @@ {include="page.footer"} - + diff --git a/tpl/vintage/pluginsadmin.html b/tpl/vintage/pluginsadmin.html index ead1734e..63b45cac 100644 --- a/tpl/vintage/pluginsadmin.html +++ b/tpl/vintage/pluginsadmin.html @@ -129,6 +129,77 @@

{function="str_replace('_', ' ', $key)"}

{include="page.footer"} - + diff --git a/tpl/vintage/tools.html b/tpl/vintage/tools.html index 69689807..3194844a 100644 --- a/tpl/vintage/tools.html +++ b/tpl/vintage/tools.html @@ -81,9 +81,9 @@ author: "Shaarli", version: "1.0.0", - iconURL: baseURL + "/images/favicon.ico", - icon32URL: baseURL + "/images/favicon.ico", - icon64URL: baseURL + "/images/favicon.ico", + iconURL: baseURL + "/img/favicon.ico", + icon32URL: baseURL + "/img/favicon.ico", + icon64URL: baseURL + "/img/favicon.ico", shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{text}&source=firefoxsocialapi{/noparse}", homepageURL: baseURL