Merge branch 'master' of https://github.com/shaarli/Shaarli into links_per_page

diff --combined tpl/default/linklist.paging.html
index 009692b939187329b0da3757add2f2b82a1bdfbb,20853330749343622c8042a0c8294d2470062cda..aa637868eb94e2a91cb9e8a5af22011cb6bbc77f
--- 1/tpl/default/linklist.paging.html
--- 2/tpl/default/linklist.paging.html
+++ b/tpl/default/linklist.paging.html
@@@ -1,27 -1,29 +1,29 @@@
  <div class="linklist-paging">
    <div class="paging pure-g">
      <div class="linklist-filters pure-u-1-3">
-       {if="$is_logged_in or !empty($action_plugin)"}
-         <span class="linklist-filters-text pure-u-0 pure-u-lg-visible">
-           {'Filters'|t}
-         </span>
-         {if="$is_logged_in"}
-         <a href="{$base_path}/admin/visibility/private" aria-label="{'Only display private links'|t}" title="{'Only display private links'|t}"
-            class="{if="$visibility==='private'"}filter-on{else}filter-off{/if}"
-         ><i class="fa fa-user-secret" aria-hidden="true"></i></a>
-         <a href="{$base_path}/admin/visibility/public" aria-label="{'Only display public links'|t}" title="{'Only display public links'|t}"
-            class="{if="$visibility==='public'"}filter-on{else}filter-off{/if}"
-         ><i class="fa fa-globe" aria-hidden="true"></i></a>
-         {/if}
-         <a href="{$base_path}/untagged-only" aria-label="{'Filter untagged links'|t}" title="{'Filter untagged links'|t}"
-            class={if="$untaggedonly"}"filter-on"{else}"filter-off"{/if}
-         ><i class="fa fa-tag" aria-hidden="true"></i></a>
-         <a href="#" aria-label="{'Select all'|t}" title="{'Select all'|t}"
-            class="filter-off select-all-button pure-u-0 pure-u-lg-visible"
-         ><i class="fa fa-check-square-o" aria-hidden="true"></i></a>
-         <a href="#" class="filter-off fold-all pure-u-lg-0" aria-label="{'Fold all'|t}" title="{'Fold all'|t}">
-           <i class="fa fa-chevron-up" aria-hidden="true"></i>
-         </a>
+       <span class="linklist-filters-text pure-u-0 pure-u-lg-visible">
+         {'Filters'|t}
+       </span>
+       {if="$is_logged_in"}
+       <a href="{$base_path}/admin/visibility/private" aria-label="{'Only display private links'|t}" title="{'Only display private links'|t}"
+          class="{if="$visibility==='private'"}filter-on{else}filter-off{/if}"
+       ><i class="fa fa-user-secret" aria-hidden="true"></i></a>
+       <a href="{$base_path}/admin/visibility/public" aria-label="{'Only display public links'|t}" title="{'Only display public links'|t}"
+          class="{if="$visibility==='public'"}filter-on{else}filter-off{/if}"
+       ><i class="fa fa-globe" aria-hidden="true"></i></a>
+       {/if}
+       <a href="{$base_path}/untagged-only" aria-label="{'Filter untagged links'|t}" title="{'Filter untagged links'|t}"
+          class={if="$untaggedonly"}"filter-on"{else}"filter-off"{/if}
+       ><i class="fa fa-tag" aria-hidden="true"></i></a>
+       {if="$is_logged_in"}
+       <a href="#" aria-label="{'Select all'|t}" title="{'Select all'|t}"
+          class="filter-off select-all-button pure-u-0 pure-u-lg-visible"
+       ><i class="fa fa-check-square-o" aria-hidden="true"></i></a>
+       {/if}
+       <a href="#" class="filter-off fold-all pure-u-lg-0" aria-label="{'Fold all'|t}" title="{'Fold all'|t}">
+         <i class="fa fa-chevron-up" aria-hidden="true"></i>
+       </a>
+       {if="!empty($action_plugin)"}
          {loop="$action_plugin"}
            {$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'}
@@@ -53,16 -55,11 +55,16 @@@
  
      <div class="linksperpage pure-u-1-3">
        <div class="pure-u-0 pure-u-lg-visible">{'Links per page'|t}</div>
 -      <a href="{$base_path}/links-per-page?nb=20">20</a>
 -      <a href="{$base_path}/links-per-page?nb=50">50</a>
 -      <a href="{$base_path}/links-per-page?nb=100">100</a>
 +      <a href="{$base_path}/links-per-page?nb=20"
 +                      {if="$links_per_page == 20"}class="selected"{/if}>20</a>
 +      <a href="{$base_path}/links-per-page?nb=50"
 +                      {if="$links_per_page == 50"}class="selected"{/if}>50</a>
 +      <a href="{$base_path}/links-per-page?nb=100"
 +                      {if="$links_per_page == 100"}class="selected"{/if}>100</a>
        <form method="GET" class="pure-u-0 pure-u-lg-visible" action="{$base_path}/links-per-page">
 -        <input type="text" name="nb" placeholder="133">
 +        <input type="text" name="nb" placeholder="133"
 +                      {if="$links_per_page != 20 && $links_per_page != 50 && $links_per_page != 100"}
 +                              value="{$links_per_page}"{/if}>
        </form>
        <a href="#" class="filter-off fold-all pure-u-0 pure-u-lg-visible" aria-label="{'Fold all'|t}" title="{'Fold all'|t}">
          <i class="fa fa-chevron-up" aria-hidden="true"></i>