aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--application/render/PageBuilder.php2
-rw-r--r--assets/default/scss/shaarli.scss5
-rw-r--r--tpl/default/linklist.paging.html13
3 files changed, 16 insertions, 4 deletions
diff --git a/application/render/PageBuilder.php b/application/render/PageBuilder.php
index 7a716673..c52e3b76 100644
--- a/application/render/PageBuilder.php
+++ b/application/render/PageBuilder.php
@@ -149,6 +149,8 @@ class PageBuilder
149 149
150 $this->tpl->assign('formatter', $this->conf->get('formatter', 'default')); 150 $this->tpl->assign('formatter', $this->conf->get('formatter', 'default'));
151 151
152 $this->tpl->assign('links_per_page', $this->session['LINKS_PER_PAGE']);
153
152 // To be removed with a proper theme configuration. 154 // To be removed with a proper theme configuration.
153 $this->tpl->assign('conf', $this->conf); 155 $this->tpl->assign('conf', $this->conf);
154 } 156 }
diff --git a/assets/default/scss/shaarli.scss b/assets/default/scss/shaarli.scss
index 759dff29..7ab09d3f 100644
--- a/assets/default/scss/shaarli.scss
+++ b/assets/default/scss/shaarli.scss
@@ -616,6 +616,11 @@ body,
616 padding: 5px; 616 padding: 5px;
617 text-decoration: none; 617 text-decoration: none;
618 color: $dark-grey; 618 color: $dark-grey;
619
620 &.selected {
621 background: var(--main-color);
622 color: $white;
623 }
619 } 624 }
620 625
621 input { 626 input {
diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html
index 20853330..aa637868 100644
--- a/tpl/default/linklist.paging.html
+++ b/tpl/default/linklist.paging.html
@@ -55,11 +55,16 @@
55 55
56 <div class="linksperpage pure-u-1-3"> 56 <div class="linksperpage pure-u-1-3">
57 <div class="pure-u-0 pure-u-lg-visible">{'Links per page'|t}</div> 57 <div class="pure-u-0 pure-u-lg-visible">{'Links per page'|t}</div>
58 <a href="{$base_path}/links-per-page?nb=20">20</a> 58 <a href="{$base_path}/links-per-page?nb=20"
59 <a href="{$base_path}/links-per-page?nb=50">50</a> 59 {if="$links_per_page == 20"}class="selected"{/if}>20</a>
60 <a href="{$base_path}/links-per-page?nb=100">100</a> 60 <a href="{$base_path}/links-per-page?nb=50"
61 {if="$links_per_page == 50"}class="selected"{/if}>50</a>
62 <a href="{$base_path}/links-per-page?nb=100"
63 {if="$links_per_page == 100"}class="selected"{/if}>100</a>
61 <form method="GET" class="pure-u-0 pure-u-lg-visible" action="{$base_path}/links-per-page"> 64 <form method="GET" class="pure-u-0 pure-u-lg-visible" action="{$base_path}/links-per-page">
62 <input type="text" name="nb" placeholder="133"> 65 <input type="text" name="nb" placeholder="133"
66 {if="$links_per_page != 20 && $links_per_page != 50 && $links_per_page != 100"}
67 value="{$links_per_page}"{/if}>
63 </form> 68 </form>
64 <a href="#" class="filter-off fold-all pure-u-0 pure-u-lg-visible" aria-label="{'Fold all'|t}" title="{'Fold all'|t}"> 69 <a href="#" class="filter-off fold-all pure-u-0 pure-u-lg-visible" aria-label="{'Fold all'|t}" title="{'Fold all'|t}">
65 <i class="fa fa-chevron-up" aria-hidden="true"></i> 70 <i class="fa fa-chevron-up" aria-hidden="true"></i>