Upgraded to version v12

kcaran · Aug 30, 2020 · 055cd52 · 055cd52
2 parents 4e56670 + a10ac7a
commit 055cd52
Show file tree

Hide file tree

Showing 31 changed files with 314 additions and 203 deletions.
diff --git a/404.html b/404.html
@@ -6,9 +6,9 @@
 <body>
 <div id="pageheader">
   {include="page.header"}
-<div class="center" id="page404" class="page404-container">
+<div id="pageError" class="page-error-container center">
   <h2>{'Sorry, nothing to see here.'|t}</h2>
-  <img src="img/sad_star.png" alt="">
+  <img src="{$asset_path}/img/sad_star.png#" alt="">
   <p>{$error_message}</p>
 </div>
 {include="page.footer"}

diff --git a/addlink.html b/addlink.html
@@ -9,7 +9,7 @@
   <div class="pure-u-1-24"></div>
   <div id="addlink-form" class="page-form  page-form-light pure-u-22-24">
     <h2 class="window-title">{"Shaare a new link"|t}</h2>
-    <form method="GET" action="#" name="addform" class="addform">
+    <form method="GET" action="{$base_path}/admin/shaare" name="addform" class="addform">
       <div>
         <label for="shaare">{'URL or leave empty to post a note'|t}</label>
         <input type="text" name="post" id="shaare" class="autofocus">

diff --git a/changepassword.html b/changepassword.html
@@ -9,7 +9,7 @@
   <div class="pure-u-lg-1-3 pure-u-1-24"></div>
   <div id="addlink-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-22-24">
     <h2 class="window-title">{"Change password"|t}</h2>
-    <form method="POST" action="#" name="changepasswordform" id="changepasswordform">
+    <form method="POST" action="{$base_path}/admin/password" name="changepasswordform" id="changepasswordform">
       <div>
         <input type="password" name="oldpassword" aria-label="{'Current password'|t}" placeholder="{'Current password'|t}" class="autofocus">
       </div>

diff --git a/changetag.html b/changetag.html
@@ -9,7 +9,7 @@
   <div class="pure-u-lg-1-3 pure-u-1-24"></div>
   <div id="addlink-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-22-24">
     <h2 class="window-title">{"Manage tags"|t}</h2>
-    <form method="POST" action="#" name="changetag" id="changetag">
+    <form method="POST" action="{$base_path}/admin/tags" name="changetag" id="changetag">
       <div>
         <input type="text" name="fromtag" aria-label="{'Tag'|t}" placeholder="{'Tag'|t}" value="{$fromtag}"
                list="tagsList" autocomplete="off" class="awesomplete autofocus" data-minChars="1">
@@ -32,7 +32,7 @@ <h2 class="window-title">{"Manage tags"|t}</h2>
       </div>
     </form>
 
-    <p>{'You can also edit tags in the'|t} <a href="?do=taglist&sort=usage">{'tag list'|t}</a>.</p>
+    <p>{'You can also edit tags in the'|t} <a href="{$base_path}/tags/list?sort=usage">{'tag list'|t}</a>.</p>
   </div>
 </div>
 {include="page.footer"}

diff --git a/configure.html b/configure.html
@@ -11,7 +11,7 @@
 {$ratioInput='7-12'}
 {$ratioInputMobile='1-8'}
 
-<form method="POST" action="#" name="configform" id="configform">
+<form method="POST" action="{$base_path}/admin/configure" name="configform" id="configform">
   <div class="pure-g">
     <div class="pure-u-1-24"></div>
     <div class="pure-u-22-24 page-form page-form-complete">
@@ -28,7 +28,7 @@ <h2 class="window-title">{'Configure'|t}</h2>
 <label for="titleLink">
 <span class="label-name">{'Home link'|t}</span><br>
 <input type="text" name="titleLink" id="titleLink" size="50" value="{$titleLink}">
-<span class="label-desc">{'Default value'|t}: ?</span>
+<span class="label-desc">{'Default value'|t}: {$base_path}/</span>
 </label>
 <p>
 
@@ -49,6 +49,23 @@ <h2 class="window-title">{'Configure'|t}</h2>
 </label>
 </p>
 
+<p>
+<label for="formatter">
+<span class="label-name">{'Description formatter'|t}</span>
+<select name="formatter" id="formatter" class="align">
+	{loop="$formatter_available"}
+	<option value="{$value}"
+	{if="$value===$formatter"}
+		selected="selected"
+	{/if}
+	>
+	{$value|ucfirst}
+	</option>
+	{/loop}
+</select>
+</label>
+</p>
+
 <p>
 <label for="language">
 <span class="label-name">{'Language'|t}</span>
@@ -172,7 +189,7 @@ <h2 class="window-title">{'Configure'|t}</h2>
                 {if="! $gd_enabled"}
                   {'You need to enable the extension <code>php-gd</code> to use thumbnails.'|t}
                 {elseif="$thumbnails_enabled"}
-                  <a href="?do=thumbs_update">{'Synchronize thumbnails'|t}</a>
+                  <a href="{$base_path}/admin/thumbnails">{'Synchronize thumbnails'|t}</a>
                 {/if}
               </span>
             <select name="enableThumbnails" id="enableThumbnails" class="align">

diff --git a/css/markdown.min.css b/css/markdown.min.css
diff --git a/css/shaarli.css b/css/shaarli.css
@@ -4069,6 +4069,8 @@ pre {
   line-height: 45px;
   text-align: right;
   font-style: italic; }
+  .linkcount .strong {
+    font-style: normal; }
 
 .searchform-block input[type="text"] {
   border: medium none currentColor;
@@ -4547,7 +4549,8 @@ pre {
   color: #252525; }
   .page-form label {
     margin-top: 16px;
-    display: inline-block; }
+    display: inline-block;
+    font-weight: 500; }
   .page-form .window-title {
     margin: 16px 0px;
     background: #f5f5f5;
@@ -4946,6 +4949,10 @@ form[name='linkform'].page-form {
   .mark-private input {
     margin-right: 4px; }
 
+.md_help {
+  float: right;
+  margin-top: -24px; }
+
 #editlink-plugins {
   float: right;
   font-size: 14px;

diff --git a/daily.html b/daily.html
@@ -11,7 +11,7 @@
   <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor" id="daily">
     <h2 class="window-title">
       {'The Daily Shaarli'|t}
-      <a href="?do=dailyrss" title="{'1 RSS entry per day'|t}"><i class="fa fa-rss"></i></a>
+      <a href="{$base_path}/daily-rss" title="{'1 RSS entry per day'|t}"><i class="fa fa-rss"></i></a>
     </h2>
 
     <div id="plugin_zone_start_daily" class="plugin_zone">
@@ -25,7 +25,7 @@ <h2 class="window-title">
       <div class="pure-g">
         <div class="pure-u-lg-1-3 pure-u-1 center">
           {if="$previousday"}
-            <a href="?do=daily&amp;day={$previousday}">
+            <a href="{$base_path}/daily?day={$previousday}">
               <i class="fa fa-arrow-left"></i>
               {'Previous day'|t}
             </a>
@@ -36,7 +36,7 @@ <h2 class="window-title">
         </div>
         <div class="pure-u-lg-1-3 pure-u-1 center">
           {if="$nextday"}
-            <a href="?do=daily&amp;day={$nextday}">
+            <a href="{$base_path}/daily?day={$nextday}">
               {'Next day'|t}
               <i class="fa fa-arrow-right"></i>
             </a>
@@ -69,7 +69,7 @@ <h3 class="window-subtitle">
                 {$link=$value}
                 <div class="daily-entry">
                   <div class="daily-entry-title center">
-                    <a href="?{$link.shorturl}" title="{'Permalink'|t}">
+                    <a href="{$base_path}/?{$link.shorturl}" title="{'Permalink'|t}">
                       <i class="fa fa-link"></i>
                     </a>
                     <a href="{$link.real_url}">{$link.title}</a>
@@ -85,7 +85,7 @@ <h3 class="window-subtitle">
                   {if="$link.tags"}
                     <div class="daily-entry-tags center">
                       {loop="link.taglist"}
-                        <span class="label label-tag" title="Add tag">
+                        <span class="label label-tag">
                           {$value}
                         </span>
                       {/loop}
@@ -116,7 +116,7 @@ <h3 class="window-subtitle">
   </div>
 </div>
 {include="page.footer"}
-<script src="js/thumbnails.min.js?v={$version_hash}"></script>
+<script src="{$asset_path}/js/thumbnails.min.js?v={$version_hash}#"></script>
 </body>
 </html>
 
diff --git a/dailyrss.html b/dailyrss.html
@@ -1,16 +1,32 @@
-<item>
-    <title>{$title} - {function="strftime('%A %e %B %Y', $daydate)"}</title>
-    <guid>{$absurl}</guid>
-    <link>{$absurl}</link>
-    <pubDate>{$rssdate}</pubDate>
-    <description><![CDATA[
-        {loop="links"}
-        	<h3><a href="{$value.url}">{$value.title}</a></h3>
-        	<small>{if="!$hide_timestamps"}{function="strftime('%c', $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags}{/if}<br>
-        	{$value.url}</small><br>
-        	{if="$value.thumbnail"}<img src="{$index_url}{$value.thumbnail}#" alt="thumbnail" />{/if}<br>
-        	{if="$value.description"}{$value.formatedDescription}{/if}
-        	<br><br><hr>
-        {/loop}
-    ]]></description>
-</item>
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0">
+  <channel>
+    <title>Daily - {$title}</title>
+    <link>{$index_url}</link>
+    <description>Daily shaared bookmarks</description>
+    <language>{$language}</language>
+    <copyright>{$index_url}</copyright>
+    <generator>Shaarli</generator>
+
+    {loop="$days"}
+      <item>
+        <title>{$value.date_human} - {$title}</title>
+        <guid>{$value.absolute_url}</guid>
+        <link>{$value.absolute_url}</link>
+        <pubDate>{$value.date_rss}</pubDate>
+        <description><![CDATA[
+          {loop="$value.links"}
+            <h3><a href="{$value.url}">{$value.title}</a></h3>
+            <small>
+              {if="!$hide_timestamps"}{$value.created|format_date} - {/if}{if="$value.tags"}{$value.tags}{/if}<br>
+              {$value.url}
+            </small><br>
+            {if="$value.thumbnail"}<img src="{$index_url}{$value.thumbnail}#" alt="thumbnail" />{/if}<br>
+            {if="$value.description"}{$value.description}{/if}
+            <br><br><hr>
+          {/loop}
+        ]]></description>
+      </item>
+    {/loop}
+  </channel>
+</rss><!-- Cached version of {$page_url} -->
diff --git a/editlink.html b/editlink.html
@@ -6,12 +6,15 @@
 <body>
   {include="page.header"}
   <div id="editlinkform" class="edit-link-container" class="pure-g">
-    <div class="pure-u-1-24"></div>
-    <form method="post" name="linkform" class="page-form pure-u-22-24 page-form page-form-light">
+    <div class="pure-u-lg-1-5 pure-u-1-24"></div>
+    <form method="post"
+          name="linkform"
+          action="{$base_path}/admin/shaare"
+          class="page-form pure-u-22-24 page-form page-form-light"
+    >
       <h2 class="window-title">
         {if="!$link_is_new"}{'Edit Shaare'|t}{else}{'New Shaare'|t}{/if}
       </h2>
-      <input type="hidden" name="lf_linkdate" value="{$link.linkdate}">
       {if="isset($link.id)"}
         <input type="hidden" name="lf_id" value="{$link.id}">
       {/if}
@@ -31,7 +34,7 @@ <h2 class="window-title">
       </div>
 
       <div>
-        <input type="text" name="lf_url" id="lf_url" value="{$link.url}" class="lf_input autofocus">
+        <input type="text" name="lf_url" id="lf_url" value="{$link.url}" class="lf_input">
       </div>
       <div>
       <label for="lf_title">{'Title'|t}</label>
@@ -41,12 +44,14 @@ <h2 class="window-title">
       </div>
       <div>
         <label for="lf_description">{'Description'|t}</label>
-      <div id="editlink-plugins">
-        {loop="$edit_link_plugin"}
-          {$value}
-        {/loop}
-      </div>
       </div>
+      {if="$formatter==='markdown'"}
+        <div class="md_help">
+          <a href="http://daringfireball.net/projects/markdown/syntax" title="{'Markdown syntax documentation'|t}">
+            {'Markdown syntax'|t}
+          </a>
+        </div>
+      {/if}
 
       <div>
         <textarea name="lf_description" id="lf_description" class="autofocus">{$link.description}</textarea>
@@ -59,19 +64,25 @@ <h2 class="window-title">
           data-list="{loop="$tags"}{$key}, {/loop}" data-multiple data-autofirst autocomplete="off" >
       </div>
 
+      <div id="editlink-plugins">
+        {loop="$edit_link_plugin"}
+          {$value}
+        {/loop}
+      </div>
 
       <div class="submit-buttons center">
         <input type="submit" name="save_edit" class="" id="button-save-edit"
                value="{if="$link_is_new"}{'Save'|t}{else}{'Update'|t}{/if}">
         {if="!$link_is_new"}
-        <a href="?delete_link&amp;lf_linkdate={$link.id}&amp;token={$token}"
+        <a href="{$base_path}/admin/shaare/delete?id={$link.id}&amp;token={$token}"
            title="" name="delete_link" class="button button-red confirm-delete">
           {'Delete'|t}
         </a>
         {/if}
       </div>
 
       <input type="hidden" name="token" value="{$token}">
+      <input type="hidden" name="source" value="{$source}">
       {if="$http_referer"}
         <input type="hidden" name="returnurl" value="{$http_referer}">
       {/if}

diff --git a/error.html b/error.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
+<head>
+  {include="includes"}
+</head>
+<body>
+<div id="pageheader">
+  {include="page.header"}
+<div id="pageError" class="page-error-container center">
+  <h2>{$message}</h2>
+
+  {if="!empty($stacktrace)"}
+      <pre>
+        {$stacktrace}
+      </pre>
+  {/if}
+
+  <img src="{$asset_path}/img/sad_star.png#" alt="">
+</div>
+{include="page.footer"}
+</body>
+</html>
diff --git a/export.html b/export.html
@@ -6,14 +6,13 @@
 <body>
 {include="page.header"}
 
-<form method="GET" action="#" name="exportform" id="exportform">
+<form method="POST" action="{$base_path}/admin/export" name="exportform" id="exportform">
   <div class="pure-g">
     <div class="pure-u-lg-1-4 pure-u-1-24"></div>
     <div class="pure-u-lg-1-2 pure-u-22-24 page-form page-form-complete">
       <div>
         <h2 class="window-title">{"Export Database"|t}</h2>
       </div>
-      <input type="hidden" name="do" value="export">
       <input type="hidden" name="token" value="{$token}">
 
       <div class="pure-g">

diff --git a/feed.atom.html b/feed.atom.html
@@ -6,11 +6,13 @@
     <updated>{$last_update}</updated>
   {/if}
   <link rel="self" href="{$self_link}#" />
+  <link rel="search" type="application/opensearchdescription+xml" href="{$index_url}open-search#"
+        title="Shaarli search - {$shaarlititle}" />
   {loop="$plugins_feed_header"}
     {$value}
   {/loop}
   <author>
-    <name>{$index_url}</name>
+    <name>{$pagetitle}</name>
     <uri>{$index_url}</uri>
   </author>
   <id>{$index_url}</id>

diff --git a/feed.rss.html b/feed.rss.html
@@ -7,7 +7,9 @@
     <language>{$language}</language>
     <copyright>{$index_url}</copyright>
     <generator>Shaarli</generator>
-    <atom:link rel="self" href="{$self_link}"  />
+    <atom:link rel="self" href="{$self_link}" />
+    <atom:link rel="search" type="application/opensearchdescription+xml" href="{$index_url}open-search#"
+               title="Shaarli search - {$shaarlititle}" />
     {loop="$plugins_feed_header"}
       {$value}
     {/loop}

diff --git a/import.html b/import.html
@@ -6,7 +6,7 @@
 <body>
 {include="page.header"}
 
-<form method="POST" action="?do=import" enctype="multipart/form-data" name="uploadform" id="uploadform">
+<form method="POST" action="{$base_path}/admin/import" enctype="multipart/form-data" name="uploadform" id="uploadform">
   <div class="pure-g">
     <div class="pure-u-lg-1-4 pure-u-1-24"></div>
     <div class="pure-u-lg-1-2 pure-u-22-24 page-form page-form-complete">