From 9e4cc28e2957e1f7df713d52a03e350d728dc58e Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Thu, 23 Jan 2020 20:05:41 +0100
Subject: Fix all existing links and redirection to ?do=login

---
 tpl/vintage/page.header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tpl/vintage/page.header.html')

diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html
index 40c53e5b..a37926d2 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -25,7 +25,7 @@
     <li><a href="?do=tools">Tools</a></li>
     <li><a href="?do=addlink">Add link</a></li>
     {else}
-    <li><a href="?do=login">Login</a></li>
+    <li><a href="/login">Login</a></li>
     {/if}
     <li><a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a></li>
     {if="$showatom"}
-- 
cgit v1.2.3


From bee33239ed444f9724422fe5234cd79997500519 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Thu, 23 Jan 2020 22:26:38 +0100
Subject: Fix all relative link to work with new URL

---
 tpl/vintage/page.header.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'tpl/vintage/page.header.html')

diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html
index a37926d2..f1869a04 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -18,12 +18,12 @@
 {else}
 <li><a href="{$titleLink}" class="nomobile">Home</a></li>
     {if="$is_logged_in"}
-    <li><a href="?do=logout">Logout</a></li>
-    <li><a href="?do=tools">Tools</a></li>
-    <li><a href="?do=addlink">Add link</a></li>
+    <li><a href="./?do=logout">Logout</a></li>
+    <li><a href="./?do=tools">Tools</a></li>
+    <li><a href="./?do=addlink">Add link</a></li>
     {elseif="$openshaarli"}
-    <li><a href="?do=tools">Tools</a></li>
-    <li><a href="?do=addlink">Add link</a></li>
+    <li><a href="./?do=tools">Tools</a></li>
+    <li><a href="./?do=addlink">Add link</a></li>
     {else}
     <li><a href="/login">Login</a></li>
     {/if}
@@ -31,9 +31,9 @@
     {if="$showatom"}
     <li><a href="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a></li>
     {/if}
-    <li><a href="?do=tagcloud">Tag cloud</a></li>
-    <li><a href="?do=picwall{$searchcrits}">Picture wall</a></li>
-    <li><a href="?do=daily">Daily</a></li>
+    <li><a href="./?do=tagcloud">Tag cloud</a></li>
+    <li><a href="./?do=picwall{$searchcrits}">Picture wall</a></li>
+    <li><a href="./?do=daily">Daily</a></li>
     {loop="$plugins_header.buttons_toolbar"}
         <li><a
             {loop="$value.attr"}
-- 
cgit v1.2.3


From 485b168a9677d160b0c0426e4f282b9bd0c632c1 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sun, 26 Jan 2020 11:15:15 +0100
Subject: Process picwall rendering through Slim controller + UT

---
 tpl/vintage/page.header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tpl/vintage/page.header.html')

diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html
index f1869a04..ce938421 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -32,7 +32,7 @@
     <li><a href="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a></li>
     {/if}
     <li><a href="./?do=tagcloud">Tag cloud</a></li>
-    <li><a href="./?do=picwall{$searchcrits}">Picture wall</a></li>
+    <li><a href="./picture-wall{function="ltrim($searchcrits, '&')"}">Picture wall</a></li>
     <li><a href="./?do=daily">Daily</a></li>
     {loop="$plugins_header.buttons_toolbar"}
         <li><a
-- 
cgit v1.2.3


From 8e47af2b3620c920116ec056173277c039163ec1 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Thu, 23 Jan 2020 21:52:03 +0100
Subject: Process logout through Slim controller

---
 tpl/vintage/page.header.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tpl/vintage/page.header.html')

diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html
index ce938421..8b9db353 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -18,9 +18,9 @@
 {else}
 <li><a href="{$titleLink}" class="nomobile">Home</a></li>
     {if="$is_logged_in"}
-    <li><a href="./?do=logout">Logout</a></li>
-    <li><a href="./?do=tools">Tools</a></li>
-    <li><a href="./?do=addlink">Add link</a></li>
+    <li><a href="/logout">Logout</a></li>
+    <li><a href="?do=tools">Tools</a></li>
+    <li><a href="?do=addlink">Add link</a></li>
     {elseif="$openshaarli"}
     <li><a href="./?do=tools">Tools</a></li>
     <li><a href="./?do=addlink">Add link</a></li>
-- 
cgit v1.2.3


From c266a89d0fbb0d60d2d7df0ec171b7cb022224f6 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sun, 26 Jan 2020 14:35:25 +0100
Subject: Process tag cloud page through Slim controller

---
 tpl/vintage/page.header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tpl/vintage/page.header.html')

diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html
index 8b9db353..971fac9a 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -31,7 +31,7 @@
     {if="$showatom"}
     <li><a href="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a></li>
     {/if}
-    <li><a href="./?do=tagcloud">Tag cloud</a></li>
+    <li><a href="./tag-cloud">Tag cloud</a></li>
     <li><a href="./picture-wall{function="ltrim($searchcrits, '&')"}">Picture wall</a></li>
     <li><a href="./?do=daily">Daily</a></li>
     {loop="$plugins_header.buttons_toolbar"}
-- 
cgit v1.2.3


From 72caf4e84c412ab6a4181b83a96dbef8ebb3c65a Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 16 May 2020 12:55:29 +0200
Subject: Working version before optimization

---
 tpl/vintage/page.header.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tpl/vintage/page.header.html')

diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html
index 971fac9a..d9451555 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -18,14 +18,14 @@
 {else}
 <li><a href="{$titleLink}" class="nomobile">Home</a></li>
     {if="$is_logged_in"}
-    <li><a href="/logout">Logout</a></li>
+    <li><a href="./logout">Logout</a></li>
     <li><a href="?do=tools">Tools</a></li>
     <li><a href="?do=addlink">Add link</a></li>
     {elseif="$openshaarli"}
     <li><a href="./?do=tools">Tools</a></li>
     <li><a href="./?do=addlink">Add link</a></li>
     {else}
-    <li><a href="/login">Login</a></li>
+    <li><a href="./login">Login</a></li>
     {/if}
     <li><a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a></li>
     {if="$showatom"}
-- 
cgit v1.2.3


From 7b2ba6ef820335df682fbe3dcfaceef3a62cf4a5 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Mon, 18 May 2020 17:17:36 +0200
Subject: RSS/ATOM feeds: process through Slim controller

---
 tpl/vintage/page.header.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tpl/vintage/page.header.html')

diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html
index d9451555..0a8392b6 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -27,9 +27,9 @@
     {else}
     <li><a href="./login">Login</a></li>
     {/if}
-    <li><a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a></li>
+    <li><a href="{$feedurl}/feed-rss?{$searchcrits}" class="nomobile">RSS Feed</a></li>
     {if="$showatom"}
-    <li><a href="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a></li>
+    <li><a href="{$feedurl}/feed-atom?{$searchcrits}" class="nomobile">ATOM Feed</a></li>
     {/if}
     <li><a href="./tag-cloud">Tag cloud</a></li>
     <li><a href="./picture-wall{function="ltrim($searchcrits, '&')"}">Picture wall</a></li>
-- 
cgit v1.2.3


From 2899ebb5b5e82890c877151f5c02045266ac9973 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Fri, 22 May 2020 13:20:31 +0200
Subject: Initialize admin Slim controllers

  - Reorganize visitor controllers
  - Fix redirection with Slim's requests base path
  - Fix daily links
---
 tpl/vintage/page.header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tpl/vintage/page.header.html')

diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html
index 0a8392b6..9268ced9 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -33,7 +33,7 @@
     {/if}
     <li><a href="./tag-cloud">Tag cloud</a></li>
     <li><a href="./picture-wall{function="ltrim($searchcrits, '&')"}">Picture wall</a></li>
-    <li><a href="./?do=daily">Daily</a></li>
+    <li><a href="./daily">Daily</a></li>
     {loop="$plugins_header.buttons_toolbar"}
         <li><a
             {loop="$value.attr"}
-- 
cgit v1.2.3


From ba43064ddb7771fc97df135a32f9b0d5e373dd36 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Fri, 22 May 2020 13:47:02 +0200
Subject: Process tools page through Slim controller

---
 tpl/vintage/page.header.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tpl/vintage/page.header.html')

diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html
index 9268ced9..c265d6d0 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -19,10 +19,10 @@
 <li><a href="{$titleLink}" class="nomobile">Home</a></li>
     {if="$is_logged_in"}
     <li><a href="./logout">Logout</a></li>
-    <li><a href="?do=tools">Tools</a></li>
+    <li><a href="./tools">Tools</a></li>
     <li><a href="?do=addlink">Add link</a></li>
     {elseif="$openshaarli"}
-    <li><a href="./?do=tools">Tools</a></li>
+    <li><a href="./tools">Tools</a></li>
     <li><a href="./?do=addlink">Add link</a></li>
     {else}
     <li><a href="./login">Login</a></li>
-- 
cgit v1.2.3


From c22fa57a5505fe95fd01860e3d3dfbb089f869cd Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 6 Jun 2020 14:01:03 +0200
Subject: Handle shaare creation/edition/deletion through Slim controllers

---
 tpl/vintage/page.header.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tpl/vintage/page.header.html')

diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html
index c265d6d0..8f9b6cc5 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -20,10 +20,10 @@
     {if="$is_logged_in"}
     <li><a href="./logout">Logout</a></li>
     <li><a href="./tools">Tools</a></li>
-    <li><a href="?do=addlink">Add link</a></li>
+    <li><a href="./add-shaare">Add link</a></li>
     {elseif="$openshaarli"}
     <li><a href="./tools">Tools</a></li>
-    <li><a href="./?do=addlink">Add link</a></li>
+    <li><a href="./add-shaare">Add link</a></li>
     {else}
     <li><a href="./login">Login</a></li>
     {/if}
-- 
cgit v1.2.3


From 818b3193ffabec57501e3bdfa997206e3c0671ef Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 13 Jun 2020 11:22:14 +0200
Subject: Explicitly define base and asset path in templates

With the new routes, all pages are not all at the same folder level anymore
(e.g. /shaare and /shaare/123), so we can't just use './' everywhere.
The most consistent way to handle this is to prefix all path with the proper variable,
and handle the actual path in controllers.
---
 tpl/vintage/page.header.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'tpl/vintage/page.header.html')

diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html
index 8f9b6cc5..0f79d321 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -18,22 +18,22 @@
 {else}
 <li><a href="{$titleLink}" class="nomobile">Home</a></li>
     {if="$is_logged_in"}
-    <li><a href="./logout">Logout</a></li>
-    <li><a href="./tools">Tools</a></li>
-    <li><a href="./add-shaare">Add link</a></li>
+    <li><a href="{$base_path}/logout">Logout</a></li>
+    <li><a href="{$base_path}/tools">Tools</a></li>
+    <li><a href="{$base_path}/add-shaare">Add link</a></li>
     {elseif="$openshaarli"}
-    <li><a href="./tools">Tools</a></li>
-    <li><a href="./add-shaare">Add link</a></li>
+    <li><a href="{$base_path}/tools">Tools</a></li>
+    <li><a href="{$base_path}/add-shaare">Add link</a></li>
     {else}
-    <li><a href="./login">Login</a></li>
+    <li><a href="{$base_path}/login">Login</a></li>
     {/if}
     <li><a href="{$feedurl}/feed-rss?{$searchcrits}" class="nomobile">RSS Feed</a></li>
     {if="$showatom"}
     <li><a href="{$feedurl}/feed-atom?{$searchcrits}" class="nomobile">ATOM Feed</a></li>
     {/if}
-    <li><a href="./tag-cloud">Tag cloud</a></li>
-    <li><a href="./picture-wall{function="ltrim($searchcrits, '&')"}">Picture wall</a></li>
-    <li><a href="./daily">Daily</a></li>
+    <li><a href="{$base_path}/tag-cloud">Tag cloud</a></li>
+    <li><a href="{$base_path}/picture-wall{function="ltrim($searchcrits, '&')"}">Picture wall</a></li>
+    <li><a href="{$base_path}/daily">Daily</a></li>
     {loop="$plugins_header.buttons_toolbar"}
         <li><a
             {loop="$value.attr"}
-- 
cgit v1.2.3


From 9c75f877935fa6adec951a4d8d32b328aaab314f Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 13 Jun 2020 13:08:01 +0200
Subject: Use multi-level routes for existing controllers instead of 1 level
 everywhere

Also prefix most admin routes with /admin/
---
 tpl/vintage/page.header.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'tpl/vintage/page.header.html')

diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html
index 0f79d321..1c00d19b 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -19,19 +19,19 @@
 <li><a href="{$titleLink}" class="nomobile">Home</a></li>
     {if="$is_logged_in"}
     <li><a href="{$base_path}/logout">Logout</a></li>
-    <li><a href="{$base_path}/tools">Tools</a></li>
-    <li><a href="{$base_path}/add-shaare">Add link</a></li>
+    <li><a href="{$base_path}/admin/tools">Tools</a></li>
+    <li><a href="{$base_path}/admin/add-shaare">Add link</a></li>
     {elseif="$openshaarli"}
-    <li><a href="{$base_path}/tools">Tools</a></li>
-    <li><a href="{$base_path}/add-shaare">Add link</a></li>
+    <li><a href="{$base_path}/admin/tools">Tools</a></li>
+    <li><a href="{$base_path}/admin/add-shaare">Add link</a></li>
     {else}
     <li><a href="{$base_path}/login">Login</a></li>
     {/if}
-    <li><a href="{$feedurl}/feed-rss?{$searchcrits}" class="nomobile">RSS Feed</a></li>
+    <li><a href="{$feedurl}/feed/rss?{$searchcrits}" class="nomobile">RSS Feed</a></li>
     {if="$showatom"}
-    <li><a href="{$feedurl}/feed-atom?{$searchcrits}" class="nomobile">ATOM Feed</a></li>
+    <li><a href="{$feedurl}/feed/atom?{$searchcrits}" class="nomobile">ATOM Feed</a></li>
     {/if}
-    <li><a href="{$base_path}/tag-cloud">Tag cloud</a></li>
+    <li><a href="{$base_path}/tags/cloud">Tag cloud</a></li>
     <li><a href="{$base_path}/picture-wall{function="ltrim($searchcrits, '&')"}">Picture wall</a></li>
     <li><a href="{$base_path}/daily">Daily</a></li>
     {loop="$plugins_header.buttons_toolbar"}
-- 
cgit v1.2.3


From bedbb845eec20363b928b424143787dbe988eefe Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Thu, 13 Aug 2020 11:08:13 +0200
Subject: Move all admin controller into a dedicated group

Also handle authentication check in a new middleware for the admin group.
---
 tpl/vintage/page.header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tpl/vintage/page.header.html')

diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html
index 1c00d19b..0a33523b 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -18,7 +18,7 @@
 {else}
 <li><a href="{$titleLink}" class="nomobile">Home</a></li>
     {if="$is_logged_in"}
-    <li><a href="{$base_path}/logout">Logout</a></li>
+    <li><a href="{$base_path}/admin/logout">Logout</a></li>
     <li><a href="{$base_path}/admin/tools">Tools</a></li>
     <li><a href="{$base_path}/admin/add-shaare">Add link</a></li>
     {elseif="$openshaarli"}
-- 
cgit v1.2.3