aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--tpl/default/configure.html22
-rw-r--r--tpl/default/feed.atom.html16
-rw-r--r--tpl/default/feed.rss.html15
-rw-r--r--tpl/default/js/shaarli.js14
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
@@ -46,6 +46,28 @@
46 </div> 46 </div>
47 </div> 47 </div>
48 <div class="pure-g"> 48 <div class="pure-g">
49 <div class="pure-u-lg-{$ratioLabel} pure-u-1">
50 <div class="form-label">
51 <label for="titleLink">
52 <span class="label-name">{'Theme'|t}</span>
53 </label>
54 </div>
55 </div>
56 <div class="pure-u-lg-{$ratioInput} pure-u-1">
57 <div class="form-input">
58 <select name="theme" id="theme">
59 {loop="$theme_available"}
60 <option value="{$value}"
61 {if="$value===$theme"}
62 selected="selected"
63 {/if}
64 >
65 {/loop}
66 </select>
67 </div>
68 </div>
69 </div>
70 <div class="pure-g">
49 <div class="pure-u-lg-{$ratioLabel} pure-u-1 "> 71 <div class="pure-u-lg-{$ratioLabel} pure-u-1 ">
50 <div class="form-label"> 72 <div class="form-label">
51 <label> 73 <label>
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 @@
6 <updated>{$last_update}</updated> 6 <updated>{$last_update}</updated>
7 {/if} 7 {/if}
8 <link rel="self" href="{$self_link}#" /> 8 <link rel="self" href="{$self_link}#" />
9 {if="!empty($pubsubhub_url)"} 9 {loop="$plugins_feed_header"}
10 <!-- PubSubHubbub Discovery --> 10 {$value}
11 <link rel="hub" href="{$pubsubhub_url}#" /> 11 {/loop}
12 <!-- End Of PubSubHubbub Discovery -->
13 {/if}
14 <author> 12 <author>
15 <name>{$index_url}</name> 13 <name>{$index_url}</name>
16 <uri>{$index_url}</uri> 14 <uri>{$index_url}</uri>
17 </author> 15 </author>
18 <id>{$index_url}</id> 16 <id>{$index_url}</id>
19 <generator>Shaarli</generator> 17 <generator>Shaarli</generator>
20 {loop="links"} 18 {loop="$links"}
21 <entry> 19 <entry>
22 <title>{$value.title}</title> 20 <title>{$value.title}</title>
23 {if="$usepermalinks"} 21 {if="$usepermalinks"}
@@ -27,12 +25,16 @@
27 {/if} 25 {/if}
28 <id>{$value.guid}</id> 26 <id>{$value.guid}</id>
29 {if="$show_dates"} 27 {if="$show_dates"}
30 <updated>{$value.iso_date}</updated> 28 <published>{$value.pub_iso_date}</published>
29 <updated>{$value.up_iso_date}</updated>
31 {/if} 30 {/if}
32 <content type="html" xml:lang="{$language}"><![CDATA[{$value.description}]]></content> 31 <content type="html" xml:lang="{$language}"><![CDATA[{$value.description}]]></content>
33 {loop="$value.taglist"} 32 {loop="$value.taglist"}
34 <category scheme="{$index_url}?searchtags=" term="{$value|strtolower}" label="{$value}" /> 33 <category scheme="{$index_url}?searchtags=" term="{$value|strtolower}" label="{$value}" />
35 {/loop} 34 {/loop}
35 {loop="$value.feed_plugins"}
36 {$value}
37 {/loop}
36 </entry> 38 </entry>
37 {/loop} 39 {/loop}
38</feed> 40</feed>
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 @@
8 <copyright>{$index_url}</copyright> 8 <copyright>{$index_url}</copyright>
9 <generator>Shaarli</generator> 9 <generator>Shaarli</generator>
10 <atom:link rel="self" href="{$self_link}" /> 10 <atom:link rel="self" href="{$self_link}" />
11 {if="!empty($pubsubhub_url)"} 11 {loop="$plugins_feed_header"}
12 <!-- PubSubHubbub Discovery --> 12 {$value}
13 <atom:link rel="hub" href="{$pubsubhub_url}" /> 13 {/loop}
14 {/if} 14 {loop="$links"}
15 {loop="links"}
16 <item> 15 <item>
17 <title>{$value.title}</title> 16 <title>{$value.title}</title>
18 <guid isPermaLink="{if="$usepermalinks"}true{else}false{/if}">{$value.guid}</guid> 17 <guid isPermaLink="{if="$usepermalinks"}true{else}false{/if}">{$value.guid}</guid>
@@ -22,12 +21,16 @@
22 <link>{$value.url}</link> 21 <link>{$value.url}</link>
23 {/if} 22 {/if}
24 {if="$show_dates"} 23 {if="$show_dates"}
25 <pubDate>{$value.iso_date}</pubDate> 24 <pubDate>{$value.pub_iso_date}</pubDate>
25 <atom:modified>{$value.up_iso_date}</atom:modified>
26 {/if} 26 {/if}
27 <description><![CDATA[{$value.description}]]></description> 27 <description><![CDATA[{$value.description}]]></description>
28 {loop="$value.taglist"} 28 {loop="$value.taglist"}
29 <category domain="{$index_url}?searchtags=">{$value}</category> 29 <category domain="{$index_url}?searchtags=">{$value}</category>
30 {/loop} 30 {/loop}
31 {loop="$value.feed_plugins"}
32 {$value}
33 {/loop}
31 </item> 34 </item>
32 {/loop} 35 {/loop}
33 </channel> 36 </channel>
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 () {
216 /** 216 /**
217 * Remove CSS target padding (for fixed bar) 217 * Remove CSS target padding (for fixed bar)
218 */ 218 */
219 var anchor = document.querySelector(location.hash); 219 if (location.hash != '') {
220 if (anchor != null) { 220 var anchor = document.querySelector(location.hash);
221 var padsize = anchor.clientHeight; 221 if (anchor != null) {
222 console.log(document.querySelector(location.hash).clientHeight); 222 var padsize = anchor.clientHeight;
223 this.window.scroll(0, this.window.scrollY - padsize); 223 console.log(document.querySelector(location.hash).clientHeight);
224 anchor.style.paddingTop = 0; 224 this.window.scroll(0, this.window.scrollY - padsize);
225 anchor.style.paddingTop = 0;
226 }
225 } 227 }
226}; 228};