Keep up with master changes

diff --git a/tpl/default/configure.html b/tpl/default/configure.html
index 450fe4ca86a19340e189f955b04e0a0f62b2a3a3..15551511bd4d8deaf5f5b2efb43bddaa82c8e505 100644 (file)
--- a/tpl/default/configure.html
+++ b/tpl/default/configure.html
@@ -45,6 +45,28 @@
           </div>
         </div>
       </div>
+      <div class="pure-g">
+        <div class="pure-u-lg-{$ratioLabel} pure-u-1">
+          <div class="form-label">
+            <label for="titleLink">
+              <span class="label-name">{'Theme'|t}</span>
+            </label>
+          </div>
+        </div>
+        <div class="pure-u-lg-{$ratioInput} pure-u-1">
+          <div class="form-input">
+            <select name="theme" id="theme">
+              {loop="$theme_available"}
+              <option value="{$value}"
+                {if="$value===$theme"}
+                  selected="selected"
+                {/if}
+              >
+              {/loop}
+            </select>
+          </div>
+        </div>
+      </div>
       <div class="pure-g">
         <div class="pure-u-lg-{$ratioLabel} pure-u-1 ">
           <div class="form-label">

diff --git a/tpl/default/feed.atom.html b/tpl/default/feed.atom.html
index c8ab17220906b351defb993827f1cd54734ded60..29187505deb8e0ea470d4f8eddf217ae2b2a18ff 100644 (file)
--- a/tpl/default/feed.atom.html
+++ b/tpl/default/feed.atom.html
@@ -6,18 +6,16 @@
     <updated>{$last_update}</updated>
   {/if}
   <link rel="self" href="{$self_link}#" />
-  {if="!empty($pubsubhub_url)"}
-    <!-- PubSubHubbub Discovery -->
-    <link rel="hub" href="{$pubsubhub_url}#" />
-    <!-- End Of PubSubHubbub Discovery -->
-  {/if}
+  {loop="$plugins_feed_header"}
+    {$value}
+  {/loop}
   <author>
     <name>{$index_url}</name>
     <uri>{$index_url}</uri>
   </author>
   <id>{$index_url}</id>
   <generator>Shaarli</generator>
-  {loop="links"}
+  {loop="$links"}
     <entry>
       <title>{$value.title}</title>
       {if="$usepermalinks"}
@@ -27,12 +25,16 @@
       {/if}
       <id>{$value.guid}</id>
       {if="$show_dates"}
-        <updated>{$value.iso_date}</updated>
+        <published>{$value.pub_iso_date}</published>
+        <updated>{$value.up_iso_date}</updated>
       {/if}
       <content type="html" xml:lang="{$language}"><![CDATA[{$value.description}]]></content>
       {loop="$value.taglist"}
         <category scheme="{$index_url}?searchtags=" term="{$value|strtolower}" label="{$value}" />
       {/loop}
+      {loop="$value.feed_plugins"}
+        {$value}
+      {/loop}
     </entry>
   {/loop}
 </feed>

diff --git a/tpl/default/feed.rss.html b/tpl/default/feed.rss.html
index 26de7f19136f4d3f9b4bdc061377319d374bb5d0..66d9a8697b1ca9647305559c2da34f4a64d5ca14 100644 (file)
--- a/tpl/default/feed.rss.html
+++ b/tpl/default/feed.rss.html
@@ -8,11 +8,10 @@
     <copyright>{$index_url}</copyright>
     <generator>Shaarli</generator>
     <atom:link rel="self" href="{$self_link}"  />
-    {if="!empty($pubsubhub_url)"}
-      <!-- PubSubHubbub Discovery -->
-      <atom:link rel="hub" href="{$pubsubhub_url}" />
-    {/if}
-    {loop="links"}
+    {loop="$plugins_feed_header"}
+      {$value}
+    {/loop}
+    {loop="$links"}
       <item>
         <title>{$value.title}</title>
         <guid isPermaLink="{if="$usepermalinks"}true{else}false{/if}">{$value.guid}</guid>
@@ -22,12 +21,16 @@
           <link>{$value.url}</link>
         {/if}
         {if="$show_dates"}
-          <pubDate>{$value.iso_date}</pubDate>
+          <pubDate>{$value.pub_iso_date}</pubDate>
+          <atom:modified>{$value.up_iso_date}</atom:modified>
         {/if}
         <description><![CDATA[{$value.description}]]></description>
         {loop="$value.taglist"}
           <category domain="{$index_url}?searchtags=">{$value}</category>
         {/loop}
+        {loop="$value.feed_plugins"}
+          {$value}
+        {/loop}
       </item>
     {/loop}
   </channel>

diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js
index 2e533af6acbeebbf362e99ff021d6b352634528d..d8464aa4b86420731552763692e7dae908b53428 100644 (file)
--- a/tpl/default/js/shaarli.js
+++ b/tpl/default/js/shaarli.js
@@ -216,11 +216,13 @@ window.onload = function () {
     /**
      * Remove CSS target padding (for fixed bar)
      */
-    var anchor = document.querySelector(location.hash);
-    if (anchor != null) {
-        var padsize = anchor.clientHeight;
-        console.log(document.querySelector(location.hash).clientHeight);
-        this.window.scroll(0, this.window.scrollY - padsize);
-        anchor.style.paddingTop = 0;
+    if (location.hash != '') {
+        var anchor = document.querySelector(location.hash);
+        if (anchor != null) {
+            var padsize = anchor.clientHeight;
+            console.log(document.querySelector(location.hash).clientHeight);
+            this.window.scroll(0, this.window.scrollY - padsize);
+            anchor.style.paddingTop = 0;
+        }
     }
 };