From 816ffba74b8bebffc620af50994833d783207a50 Mon Sep 17 00:00:00 2001
From: Keith Carangelo <mail@kcaran.com>
Date: Sat, 29 Aug 2020 11:02:59 -0400
Subject: Added $links_per_page variable to template and display on default

---
 application/render/PageBuilder.php |  2 ++
 assets/default/scss/shaarli.scss   |  5 +++++
 tpl/default/linklist.paging.html   | 13 +++++++++----
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/application/render/PageBuilder.php b/application/render/PageBuilder.php
index 7a716673..21703639 100644
--- a/application/render/PageBuilder.php
+++ b/application/render/PageBuilder.php
@@ -149,6 +149,8 @@ class PageBuilder
 
         $this->tpl->assign('formatter', $this->conf->get('formatter', 'default'));
 
+        $this->tpl->assign('links_per_page', $_SESSION['LINKS_PER_PAGE']);
+
         // To be removed with a proper theme configuration.
         $this->tpl->assign('conf', $this->conf);
     }
diff --git a/assets/default/scss/shaarli.scss b/assets/default/scss/shaarli.scss
index 759dff29..3d25d231 100644
--- a/assets/default/scss/shaarli.scss
+++ b/assets/default/scss/shaarli.scss
@@ -618,6 +618,11 @@ body,
     color: $dark-grey;
   }
 
+  a.selected {
+    background: var(--main-color);
+    color: $white;
+  }
+
   input {
     &[type='text'] {
       @extend %linksperpage-button;
diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html
index 7b320eaf..009692b9 100644
--- a/tpl/default/linklist.paging.html
+++ b/tpl/default/linklist.paging.html
@@ -53,11 +53,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>
-- 
cgit v1.2.3


From e813934ae18cd57632e0714aacb6d754ad78eabd Mon Sep 17 00:00:00 2001
From: Keith Carangelo <mail@kcaran.com>
Date: Sun, 30 Aug 2020 07:26:21 -0400
Subject: Moved definition of a.selected to pass sasslint test

---
 assets/default/scss/shaarli.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/default/scss/shaarli.scss b/assets/default/scss/shaarli.scss
index 3d25d231..7ab09d3f 100644
--- a/assets/default/scss/shaarli.scss
+++ b/assets/default/scss/shaarli.scss
@@ -616,11 +616,11 @@ body,
     padding: 5px;
     text-decoration: none;
     color: $dark-grey;
-  }
 
-  a.selected {
-    background: var(--main-color);
-    color: $white;
+    &.selected {
+      background: var(--main-color);
+      color: $white;
+     }
   }
 
   input {
-- 
cgit v1.2.3


From 4479aff18f4ff80e274b52548c08e9ed9379bd51 Mon Sep 17 00:00:00 2001
From: Keith Carangelo <mail@kcaran.com>
Date: Mon, 31 Aug 2020 09:20:03 -0400
Subject: Avoid using global variables

Co-authored-by: ArthurHoaro <arthur@hoa.ro>
---
 application/render/PageBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/render/PageBuilder.php b/application/render/PageBuilder.php
index 21703639..c52e3b76 100644
--- a/application/render/PageBuilder.php
+++ b/application/render/PageBuilder.php
@@ -149,7 +149,7 @@ class PageBuilder
 
         $this->tpl->assign('formatter', $this->conf->get('formatter', 'default'));
 
-        $this->tpl->assign('links_per_page', $_SESSION['LINKS_PER_PAGE']);
+        $this->tpl->assign('links_per_page', $this->session['LINKS_PER_PAGE']);
 
         // To be removed with a proper theme configuration.
         $this->tpl->assign('conf', $this->conf);
-- 
cgit v1.2.3