From e652ba3670a8481eaabb1f8bf721024107abd1e1 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 14 Jan 2017 15:46:39 +0100 Subject: Keep up with master changes --- tpl/default/configure.html | 22 ++++++++++++++++++++++ tpl/default/feed.atom.html | 16 +++++++++------- tpl/default/feed.rss.html | 15 +++++++++------ tpl/default/js/shaarli.js | 14 ++++++++------ 4 files changed, 48 insertions(+), 19 deletions(-) diff --git a/tpl/default/configure.html b/tpl/default/configure.html index 450fe4ca..15551511 100644 --- a/tpl/default/configure.html +++ b/tpl/default/configure.html @@ -45,6 +45,28 @@ +
+
+
+ +
+
+
+
+ +
+
+
diff --git a/tpl/default/feed.atom.html b/tpl/default/feed.atom.html index c8ab1722..29187505 100644 --- a/tpl/default/feed.atom.html +++ b/tpl/default/feed.atom.html @@ -6,18 +6,16 @@ {$last_update} {/if} - {if="!empty($pubsubhub_url)"} - - - - {/if} + {loop="$plugins_feed_header"} + {$value} + {/loop} {$index_url} {$index_url} {$index_url} Shaarli - {loop="links"} + {loop="$links"} {$value.title} {if="$usepermalinks"} @@ -27,12 +25,16 @@ {/if} {$value.guid} {if="$show_dates"} - {$value.iso_date} + {$value.pub_iso_date} + {$value.up_iso_date} {/if} {loop="$value.taglist"} {/loop} + {loop="$value.feed_plugins"} + {$value} + {/loop} {/loop} diff --git a/tpl/default/feed.rss.html b/tpl/default/feed.rss.html index 26de7f19..66d9a869 100644 --- a/tpl/default/feed.rss.html +++ b/tpl/default/feed.rss.html @@ -8,11 +8,10 @@ {$index_url} Shaarli - {if="!empty($pubsubhub_url)"} - - - {/if} - {loop="links"} + {loop="$plugins_feed_header"} + {$value} + {/loop} + {loop="$links"} {$value.title} {$value.guid} @@ -22,12 +21,16 @@ {$value.url} {/if} {if="$show_dates"} - {$value.iso_date} + {$value.pub_iso_date} + {$value.up_iso_date} {/if} {loop="$value.taglist"} {$value} {/loop} + {loop="$value.feed_plugins"} + {$value} + {/loop} {/loop} diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index 2e533af6..d8464aa4 100644 --- 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; + } } }; -- cgit v1.2.3