From e0e24335f7b72afb388fbb180596675fc1b2182c Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Tue, 10 Sep 2019 18:40:07 +0200
Subject: Fix undefined thumbnail on OpenGraph headers

Fixes #1362
---
 tpl/default/includes.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tpl/default/includes.html')

diff --git a/tpl/default/includes.html b/tpl/default/includes.html
index 6c30d1bf..d3d3c86f 100644
--- a/tpl/default/includes.html
+++ b/tpl/default/includes.html
@@ -22,7 +22,7 @@
   <meta property="og:url" content="{$index_url}?{$link.shorturl}" />
   {$ogDescription=isset($link.description_src) ? $link.description_src : $link.description}
   <meta property="og:description" content="{function="substr(strip_tags($ogDescription), 0, 300)"}" />
-  {if="$link.thumbnail"}
+  {if="!empty($link.thumbnail)"}
     <meta property="og:image" content="{$index_url}{$link.thumbnail}" />
   {/if}
   {if="!$hide_timestamps || $is_logged_in"}
-- 
cgit v1.2.3


From d9bfceaddf05dba5dec33523ea27277d773c5e4f Mon Sep 17 00:00:00 2001
From: Lucas Cimon <lucas.cimon@gmail.com>
Date: Sun, 12 Jan 2020 14:54:48 +0100
Subject: Avoiding warning 'PHP Notice: Undefined index: updated'

---
 tpl/default/includes.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tpl/default/includes.html')

diff --git a/tpl/default/includes.html b/tpl/default/includes.html
index d3d3c86f..428b8ee2 100644
--- a/tpl/default/includes.html
+++ b/tpl/default/includes.html
@@ -27,7 +27,7 @@
   {/if}
   {if="!$hide_timestamps || $is_logged_in"}
     <meta property="article:published_time" content="{$link.created->format(DateTime::ATOM)}" />
-    {if="$link.updated"}
+    {if="!empty($link.updated)"}
       <meta property="article:modified_time" content="{$link.updated->format(DateTime::ATOM)}" />
     {/if}
   {/if}
-- 
cgit v1.2.3


From cf92b4dd1521241eefc58eaf6dcd202cd83969d8 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 25 May 2019 15:52:27 +0200
Subject: Apply the new system (Bookmark + Service) to the whole code base

See https://github.com/shaarli/Shaarli/issues/1307
---
 tpl/default/includes.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tpl/default/includes.html')

diff --git a/tpl/default/includes.html b/tpl/default/includes.html
index 428b8ee2..3820a4f7 100644
--- a/tpl/default/includes.html
+++ b/tpl/default/includes.html
@@ -8,6 +8,9 @@
 <link href="img/favicon.png" rel="shortcut icon" type="image/png" />
 <link href="img/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180" />
 <link type="text/css" rel="stylesheet" href="css/shaarli.min.css?v={$version_hash}" />
+{if="$formatter==='markdown'"}
+  <link type="text/css" rel="stylesheet" href="css/markdown.min.css?v={$version_hash}" />
+{/if}
 {loop="$plugins_includes.css_files"}
   <link type="text/css" rel="stylesheet" href="{$value}?v={$version_hash}#"/>
 {/loop}
-- 
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/default/includes.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tpl/default/includes.html')

diff --git a/tpl/default/includes.html b/tpl/default/includes.html
index 3820a4f7..3e7d6320 100644
--- a/tpl/default/includes.html
+++ b/tpl/default/includes.html
@@ -17,7 +17,7 @@
 {if="is_file('data/user.css')"}
   <link type="text/css" rel="stylesheet" href="data/user.css#" />
 {/if}
-<link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle}"/>
+<link rel="search" type="application/opensearchdescription+xml" href="./?do=opensearch#" title="Shaarli search - {$shaarlititle}"/>
 {if="! empty($links) && count($links) === 1"}
   {$link=reset($links)}
   <meta property="og:title" content="{$link.title}" />
-- 
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/default/includes.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tpl/default/includes.html')

diff --git a/tpl/default/includes.html b/tpl/default/includes.html
index 3e7d6320..cdbfeea1 100644
--- a/tpl/default/includes.html
+++ b/tpl/default/includes.html
@@ -3,8 +3,8 @@
 <meta name="format-detection" content="telephone=no" />
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="referrer" content="same-origin">
-<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
-<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
+<link rel="alternate" type="application/atom+xml" href="{$feedurl}feed-atom?{$searchcrits}#" title="ATOM Feed" />
+<link rel="alternate" type="application/rss+xml" href="{$feedurl}feed-rss?{$searchcrits}#" title="RSS Feed" />
 <link href="img/favicon.png" rel="shortcut icon" type="image/png" />
 <link href="img/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180" />
 <link type="text/css" rel="stylesheet" href="css/shaarli.min.css?v={$version_hash}" />
-- 
cgit v1.2.3


From 5ec4708ced1cdca01eddd7e52377ab5e5f8b3290 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Wed, 20 May 2020 10:47:20 +0200
Subject: Process OpenSearch controller through Slim

Also it was missing on the default template feeds
---
 tpl/default/includes.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tpl/default/includes.html')

diff --git a/tpl/default/includes.html b/tpl/default/includes.html
index cdbfeea1..07a487bb 100644
--- a/tpl/default/includes.html
+++ b/tpl/default/includes.html
@@ -17,7 +17,8 @@
 {if="is_file('data/user.css')"}
   <link type="text/css" rel="stylesheet" href="data/user.css#" />
 {/if}
-<link rel="search" type="application/opensearchdescription+xml" href="./?do=opensearch#" title="Shaarli search - {$shaarlititle}"/>
+<link rel="search" type="application/opensearchdescription+xml" href="./open-search#"
+      title="Shaarli search - {$shaarlititle}" />
 {if="! empty($links) && count($links) === 1"}
   {$link=reset($links)}
   <meta property="og:title" content="{$link.title}" />
-- 
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/default/includes.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'tpl/default/includes.html')

diff --git a/tpl/default/includes.html b/tpl/default/includes.html
index 07a487bb..0f6a6628 100644
--- a/tpl/default/includes.html
+++ b/tpl/default/includes.html
@@ -5,11 +5,11 @@
 <meta name="referrer" content="same-origin">
 <link rel="alternate" type="application/atom+xml" href="{$feedurl}feed-atom?{$searchcrits}#" title="ATOM Feed" />
 <link rel="alternate" type="application/rss+xml" href="{$feedurl}feed-rss?{$searchcrits}#" title="RSS Feed" />
-<link href="img/favicon.png" rel="shortcut icon" type="image/png" />
-<link href="img/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180" />
-<link type="text/css" rel="stylesheet" href="css/shaarli.min.css?v={$version_hash}" />
+<link href="{$asset_path}/img/favicon.png#" rel="shortcut icon" type="image/png" />
+<link href="{$asset_path}/img/apple-touch-icon.png#" rel="apple-touch-icon" sizes="180x180" />
+<link type="text/css" rel="stylesheet" href="{$asset_path}/css/shaarli.min.css?v={$version_hash}#" />
 {if="$formatter==='markdown'"}
-  <link type="text/css" rel="stylesheet" href="css/markdown.min.css?v={$version_hash}" />
+  <link type="text/css" rel="stylesheet" href="{$asset_path}/css/markdown.min.css?v={$version_hash}#" />
 {/if}
 {loop="$plugins_includes.css_files"}
   <link type="text/css" rel="stylesheet" href="{$value}?v={$version_hash}#"/>
@@ -17,7 +17,7 @@
 {if="is_file('data/user.css')"}
   <link type="text/css" rel="stylesheet" href="data/user.css#" />
 {/if}
-<link rel="search" type="application/opensearchdescription+xml" href="./open-search#"
+<link rel="search" type="application/opensearchdescription+xml" href="{$base_path}/open-search#"
       title="Shaarli search - {$shaarlititle}" />
 {if="! empty($links) && count($links) === 1"}
   {$link=reset($links)}
-- 
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/default/includes.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tpl/default/includes.html')

diff --git a/tpl/default/includes.html b/tpl/default/includes.html
index 0f6a6628..102314d5 100644
--- a/tpl/default/includes.html
+++ b/tpl/default/includes.html
@@ -3,8 +3,8 @@
 <meta name="format-detection" content="telephone=no" />
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="referrer" content="same-origin">
-<link rel="alternate" type="application/atom+xml" href="{$feedurl}feed-atom?{$searchcrits}#" title="ATOM Feed" />
-<link rel="alternate" type="application/rss+xml" href="{$feedurl}feed-rss?{$searchcrits}#" title="RSS Feed" />
+<link rel="alternate" type="application/atom+xml" href="{$feedurl}feed/atom?{$searchcrits}#" title="ATOM Feed" />
+<link rel="alternate" type="application/rss+xml" href="{$feedurl}feed/rss?{$searchcrits}#" title="RSS Feed" />
 <link href="{$asset_path}/img/favicon.png#" rel="shortcut icon" type="image/png" />
 <link href="{$asset_path}/img/apple-touch-icon.png#" rel="apple-touch-icon" sizes="180x180" />
 <link type="text/css" rel="stylesheet" href="{$asset_path}/css/shaarli.min.css?v={$version_hash}#" />
-- 
cgit v1.2.3


From 1b8620b1ad4e2c647ff2d032c8e7c6687b6647a1 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 20 Jun 2020 15:14:24 +0200
Subject: Process plugins administration page through Slim controllers

---
 tpl/default/includes.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tpl/default/includes.html')

diff --git a/tpl/default/includes.html b/tpl/default/includes.html
index 102314d5..227f9b52 100644
--- a/tpl/default/includes.html
+++ b/tpl/default/includes.html
@@ -12,10 +12,10 @@
   <link type="text/css" rel="stylesheet" href="{$asset_path}/css/markdown.min.css?v={$version_hash}#" />
 {/if}
 {loop="$plugins_includes.css_files"}
-  <link type="text/css" rel="stylesheet" href="{$value}?v={$version_hash}#"/>
+  <link type="text/css" rel="stylesheet" href="{$base_path}/{$value}?v={$version_hash}#"/>
 {/loop}
 {if="is_file('data/user.css')"}
-  <link type="text/css" rel="stylesheet" href="data/user.css#" />
+  <link type="text/css" rel="stylesheet" href="{$base_path}/data/user.css#" />
 {/if}
 <link rel="search" type="application/opensearchdescription+xml" href="{$base_path}/open-search#"
       title="Shaarli search - {$shaarlititle}" />
-- 
cgit v1.2.3