{'Shaare'|t}

+ {if="isset($link.id)"} + + {/if}

{'URL'|t}

diff --git a/tpl/default/feed.atom.html b/tpl/default/feed.atom.html index 2ebb162a..c8ab1722 100644 --- a/tpl/default/feed.atom.html +++ b/tpl/default/feed.atom.html @@ -29,9 +29,7 @@ {if="$show_dates"} {$value.iso_date} {/if} - - - + {loop="$value.taglist"} {/loop} diff --git a/tpl/default/img/favicon.png b/tpl/default/img/favicon.png new file mode 100644 index 00000000..4644321b Binary files /dev/null and b/tpl/default/img/favicon.png differ diff --git a/tpl/default/includes.html b/tpl/default/includes.html index 24c4bef0..7e0c4a64 100644 --- a/tpl/default/includes.html +++ b/tpl/default/includes.html @@ -2,9 +2,9 @@ - - + + @@ -17,4 +17,4 @@ {loop="$plugins_includes.css_files"} {/loop} - \ No newline at end of file + \ No newline at end of file diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index bdf7f3eb..051575dc 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -6,10 +6,6 @@ {include="page.header"} - -

@@ -68,8 +64,8 @@

- - + +

diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html index 5e9c8486..4888267b 100644 --- a/tpl/default/linklist.paging.html +++ b/tpl/default/linklist.paging.html @@ -14,13 +14,11 @@ > {/if} {loop="$action_plugin"} - {$value.class=isset($value.class) ? $value.class : ''} - {$value.class=!empty($value.on) ? $value.class .' filter-on' : $value.class .' filter-off'} + {$value.attr.class=isset($value.attr.class) ? $value.attr.class : ''} + {$value.attr.class=!empty($value.on) ? $value.attr.class .' filter-on' : $value.attr.class .' filter-off'} {$value.html} diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html index b33219b6..dcc29676 100644 --- a/tpl/default/loginform.html +++ b/tpl/default/loginform.html @@ -5,7 +5,7 @@ {include="page.header"} -{if="!ban_canLogin()"} +{if="!ban_canLogin($conf)"}

@@ -22,13 +22,15 @@

{'Login'|t}

- +

- + {'Remember me'|t}

@@ -40,15 +42,17 @@

- {/if} - -

- {include="page.footer"} diff --git a/tpl/default/opensearch.html b/tpl/default/opensearch.html new file mode 100644 index 00000000..3fcc30b7 --- /dev/null +++ b/tpl/default/opensearch.html @@ -0,0 +1,45 @@ + + + Shaarli search - {$pagetitle} + Shaarli search - {$pagetitle} + + + + UTF-8 + Shaarli Community - https://github.com/shaarli/Shaarli/ + data:image/x-icon;base64,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 + + diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index d4963c89..4a3710ff 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html @@ -38,11 +38,9 @@ {loop="$plugins_header.buttons_toolbar"}

{loop="$plugins_header.fields_toolbar"}

{loop="$value.inputs"} diff --git a/tpl/default/tools.html b/tpl/default/tools.html index ae794ce9..3f2cf0f1 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html @@ -76,7 +76,7 @@ '{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+ '&title='%20+%20encodeURIComponent(title)+ '&description='%20+%20encodeURIComponent(document.getSelection())+ - '&source=bookmarklet','_blank','menubar=no,height=390,width=600,toolbar=no,scrollbars=no,status=no,dialog=1' + '&source=bookmarklet','_blank','menubar=no,height=800,width=600,toolbar=no,scrollbars=yes,status=no,dialog=1' ); } )();"> @@ -94,20 +94,22 @@

Firefox Social API

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

+{if="$sslenabled"} +

Firefox Social API

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

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

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

+{/if}

@@ -128,31 +130,33 @@

{include="page.footer"} -