aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl
diff options
context:
space:
mode:
authorSeb Sauvage <sebsauvage@sebsauvage.net>2012-01-25 10:24:44 +0100
committerEmilien Klein <emilien@klein.st>2012-01-25 10:24:44 +0100
commit51788ab8bacfe5fe951531ef545913ff6983f1b8 (patch)
tree225b21a815893ed28588e6e3199f5a0020eccbe2 /tpl
parentc2f6c2680330ad40f80a4cfe68388ece8dd313ec (diff)
downloadShaarli-51788ab8bacfe5fe951531ef545913ff6983f1b8.tar.gz
Shaarli-51788ab8bacfe5fe951531ef545913ff6983f1b8.tar.zst
Shaarli-51788ab8bacfe5fe951531ef545913ff6983f1b8.zip
Version 0.0.34 beta:
- Corrected: In link edition, you can now click the word “Private” to check the box. - Corrected: Clicking a tag would not work properly if the tag contained special characters (like +). - Corrected: Added proper jQuery licence (shame on me). - Changed: Upgraded bundled versions of jQuery (1.7.1) and jQuery UI (1.8.17). - Changed: Upgraded bundled version of RainTPL (2.7). - Changed: Changed HTTPS detection code. - Added: There is now a QR-Code of each permalink to easily open a link on your smartphone. - Added: Protocols file: and apt: are now also converted to clickable links (patch by Francis Chavanon) - Added: Thumbnail support for http://xkcd.com/ (patch by Emilien Klein). [r31] - Added: Thumbnail support for http://pix.toile-libre.org/ - Added: Well I had some mercy for users with antique browsers (IE) which do not have support for gradients: I added a few background-color. - Added: First version of the “Shaarli Daily”, a page showing all links of a specific day. By default, you see the links of the previous day. There is still work to do on this page (error checking, better navigation (calendar?), RSS feed, CSS for mobile and printing…)
Diffstat (limited to 'tpl')
-rw-r--r--tpl/addlink.html1
-rw-r--r--tpl/changepassword.html1
-rw-r--r--tpl/changetag.html1
-rw-r--r--tpl/configure.html1
-rw-r--r--tpl/daily.html60
-rw-r--r--tpl/editlink.html3
-rw-r--r--tpl/export.html1
-rw-r--r--tpl/import.html1
-rw-r--r--tpl/includes.html5
-rw-r--r--tpl/install.html1
-rw-r--r--tpl/linklist.html20
-rw-r--r--tpl/loginform.html1
-rw-r--r--tpl/page.footer.html2
-rw-r--r--tpl/page.header.html1
-rw-r--r--tpl/page.html1
-rw-r--r--tpl/picwall.html1
-rw-r--r--tpl/picwall2.html1
-rw-r--r--tpl/tagcloud.html1
-rw-r--r--tpl/tools.html1
19 files changed, 97 insertions, 7 deletions
diff --git a/tpl/addlink.html b/tpl/addlink.html
index 7dd767cc..853715dc 100644
--- a/tpl/addlink.html
+++ b/tpl/addlink.html
@@ -1,3 +1,4 @@
1<!DOCTYPE html>
1<html> 2<html>
2<head>{include="includes"}</head> 3<head>{include="includes"}</head>
3<body onload="document.addform.post.focus();"> 4<body onload="document.addform.post.focus();">
diff --git a/tpl/changepassword.html b/tpl/changepassword.html
index acd61f55..48cf5fa3 100644
--- a/tpl/changepassword.html
+++ b/tpl/changepassword.html
@@ -1,3 +1,4 @@
1<!DOCTYPE html>
1<html> 2<html>
2<head>{include="includes"}</head> 3<head>{include="includes"}</head>
3<body onload="document.changepasswordform.oldpassword.focus();"> 4<body onload="document.changepasswordform.oldpassword.focus();">
diff --git a/tpl/changetag.html b/tpl/changetag.html
index a8ecfb4f..b0bd0d06 100644
--- a/tpl/changetag.html
+++ b/tpl/changetag.html
@@ -1,3 +1,4 @@
1<!DOCTYPE html>
1<html> 2<html>
2<head>{include="includes"}</head> 3<head>{include="includes"}</head>
3<body onload="document.changetag.fromtag.focus();"> 4<body onload="document.changetag.fromtag.focus();">
diff --git a/tpl/configure.html b/tpl/configure.html
index f13ecb9a..a6ddb8fd 100644
--- a/tpl/configure.html
+++ b/tpl/configure.html
@@ -1,3 +1,4 @@
1<!DOCTYPE html>
1<html> 2<html>
2<head>{include="includes"}</head> 3<head>{include="includes"}</head>
3<body onload="document.configform.title.focus();"> 4<body onload="document.configform.title.focus();">
diff --git a/tpl/daily.html b/tpl/daily.html
new file mode 100644
index 00000000..e05acc86
--- /dev/null
+++ b/tpl/daily.html
@@ -0,0 +1,60 @@
1<!DOCTYPE html>
2<html>
3<head>{include="includes"}</head>
4<body>
5<div id="pageheader">{include="page.header"}</div>
6<div class="daily">
7 <div class="dailyAbout">
8 All links of one day<br>in a single page.<br>
9 <a href="?do=daily&day={$previousday}"><b>&lt;</b>Previous day</a> -
10 <a href="?do=daily&day={$nextday}">Next day<b>&gt;</b></a>
11 </div>
12 <div class="dailyTitle"><img src="../images/floral_left.png" width="51" height="50"> The Shaarli Daily <img src="../images/floral_right.png" width="51" height="50"></div>
13 <div class="dailyDate">&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097; {$day} &#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;</div>
14 <div style="clear:both;"></div>
15
16 {if="$linksToDisplay"}
17 <div style="float:left;position:relative; width:32%;">
18 {loop="col1"}
19 <div class="dailyEntry">
20 {if="$value.tags"}<div class="dailyEntryTags">{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}</div>{/if}
21 <div class="dailyEntryTitle"><a href="{$value.url}">{$value.title|htmlspecialchars}</a></div>
22 {if="$value.thumbnail"}<div class="dailyEntryThumbnail">{$value.thumbnail}</div>{/if}
23 <div class="dailyEntryDescription">{$value.formatedDescription}</div>
24 <div style="width:100%;text-align:right"><a href="?{$value.linkdate|smallHash}"><img src="../images/squiggle.png" width="25" height="26" title="permalink" alt="permalink"></a></div>
25 </div>
26 {/loop}
27 </div>
28
29 <div style="float:left;position:relative; width:32%;">
30 {loop="col2"}
31 <div class="dailyEntry">
32 {if="$value.tags"}<div class="dailyEntryTags">{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}</div>{/if}
33 <div class="dailyEntryTitle"><a href="{$value.url}">{$value.title|htmlspecialchars}</a></div>
34 {if="$value.thumbnail"}<div class="dailyEntryThumbnail">{$value.thumbnail}</div>{/if}
35 <div class="dailyEntryDescription">{$value.formatedDescription}</div>
36 <div style="width:100%;text-align:right"><a href="?{$value.linkdate|smallHash}"><img src="../images/squiggle.png" width="25" height="26" title="permalink" alt="permalink"></a></div>
37 </div>
38 {/loop}
39 </div>
40
41 <div style="float:left;position:relative; width:32%;">
42 {loop="col3"}
43 <div class="dailyEntry">
44 {if="$value.tags"}<div class="dailyEntryTags">{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}</div>{/if}
45 <div class="dailyEntryTitle"><a href="{$value.url}">{$value.title|htmlspecialchars}</a></div>
46 {if="$value.thumbnail"}<div class="dailyEntryThumbnail">{$value.thumbnail}</div>{/if}
47 <div class="dailyEntryDescription">{$value.formatedDescription}</div>
48 <div style="width:100%;text-align:right"><a href="?{$value.linkdate|smallHash}"><img src="../images/squiggle.png" width="25" height="26" title="permalink" alt="permalink"></a></div>
49 </div>
50 {/loop}
51 </div>
52 {else}
53 <div style="text-align:center; padding:40px 0px 90px 0px;">No articles on this day.</div>
54 {/if}
55 <div style="clear:both;"></div>
56 <div style="text-align:center; padding-bottom:20px;"><img src="../images/squiggle_closing.png" width="66" height="61" alt="-"></div>
57</div>
58{include="page.footer"}
59</body>
60</html> \ No newline at end of file
diff --git a/tpl/editlink.html b/tpl/editlink.html
index 2225fbab..4ad43b35 100644
--- a/tpl/editlink.html
+++ b/tpl/editlink.html
@@ -1,3 +1,4 @@
1<!DOCTYPE html>
1<html> 2<html>
2<head>{include="includes"}</head> 3<head>{include="includes"}</head>
3<body 4<body
@@ -13,7 +14,7 @@
13 <i>Title</i><br><input type="text" name="lf_title" value="{$link.title|htmlspecialchars}" style="width:100%"><br> 14 <i>Title</i><br><input type="text" name="lf_title" value="{$link.title|htmlspecialchars}" style="width:100%"><br>
14 <i>Description</i><br><textarea name="lf_description" rows="4" cols="25" style="width:100%">{$link.description|htmlspecialchars}</textarea><br> 15 <i>Description</i><br><textarea name="lf_description" rows="4" cols="25" style="width:100%">{$link.description|htmlspecialchars}</textarea><br>
15 <i>Tags</i><br><input type="text" id="lf_tags" name="lf_tags" value="{$link.tags|htmlspecialchars}" style="width:100%"><br> 16 <i>Tags</i><br><input type="text" id="lf_tags" name="lf_tags" value="{$link.tags|htmlspecialchars}" style="width:100%"><br>
16 <input type="checkbox" {if condition="$link.private!=0"}checked="yes"{/if} style="margin:7 0 10 0;" name="lf_private">&nbsp;<i>Private</i><br> 17 <input type="checkbox" {if condition="$link.private!=0"}checked="yes"{/if} style="margin:7 0 10 0;" name="lf_private" id="lf_private">&nbsp;<label for="lf_private"><i>Private</i></label><br>
17 <input type="submit" value="Save" name="save_edit" class="bigbutton" style="margin-left:40px;"> 18 <input type="submit" value="Save" name="save_edit" class="bigbutton" style="margin-left:40px;">
18 <input type="submit" value="Cancel" name="cancel_edit" class="bigbutton" style="margin-left:40px;"> 19 <input type="submit" value="Cancel" name="cancel_edit" class="bigbutton" style="margin-left:40px;">
19 {if condition="!$link_is_new"}<input type="submit" value="Delete" name="delete_link" class="bigbutton" style="margin-left:180px;" onClick="return confirmDeleteLink();">{/if} 20 {if condition="!$link_is_new"}<input type="submit" value="Delete" name="delete_link" class="bigbutton" style="margin-left:180px;" onClick="return confirmDeleteLink();">{/if}
diff --git a/tpl/export.html b/tpl/export.html
index ccfcfcf1..938cbe64 100644
--- a/tpl/export.html
+++ b/tpl/export.html
@@ -1,3 +1,4 @@
1<!DOCTYPE html>
1<html> 2<html>
2<head>{include="includes"}</head> 3<head>{include="includes"}</head>
3<body> 4<body>
diff --git a/tpl/import.html b/tpl/import.html
index 95df723e..9e581fc9 100644
--- a/tpl/import.html
+++ b/tpl/import.html
@@ -1,3 +1,4 @@
1<!DOCTYPE html>
1<html> 2<html>
2<head>{include="includes"}</head> 3<head>{include="includes"}</head>
3<body onload="document.uploadform.filetoupload.focus();"> 4<body onload="document.uploadform.filetoupload.focus();">
diff --git a/tpl/includes.html b/tpl/includes.html
index c70b44e3..7cfb07f2 100644
--- a/tpl/includes.html
+++ b/tpl/includes.html
@@ -1,7 +1,8 @@
1<title>{$pagetitle}</title> 1<title>{$pagetitle}</title>
2<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
2<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" /> 3<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
3<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" /> 4<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
4<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" /> 5<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />
5<link type="text/css" rel="stylesheet" href="inc/shaarli.css?version={$version}#" /> 6<link type="text/css" rel="stylesheet" href="inc/shaarli.css?version={$version|urlencode}#" />
6{if condition="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css?version={$version}#" />{/if} 7{if condition="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css?version={$version}#" />{/if}
7<script language="JavaScript" src="inc/jquery.min.js#"></script><script language="JavaScript" src="inc/jquery-ui.custom.min.js#"></script> 8<script src="inc/jquery.min.js#"></script><script src="inc/jquery-ui.min.js#"></script>
diff --git a/tpl/install.html b/tpl/install.html
index 1e48a185..4034ef1b 100644
--- a/tpl/install.html
+++ b/tpl/install.html
@@ -1,3 +1,4 @@
1<!DOCTYPE html>
1<html> 2<html>
2<head>{include="includes"}{$timezone_js}</head> 3<head>{include="includes"}{$timezone_js}</head>
3<body onload="document.installform.setlogin.focus();"> 4<body onload="document.installform.setlogin.focus();">
diff --git a/tpl/linklist.html b/tpl/linklist.html
index c7de5b87..70b9ff3a 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -1,9 +1,10 @@
1<!DOCTYPE html>
1<html> 2<html>
2<head>{include="includes"}</head> 3<head>{include="includes"}</head>
3<body> 4<body>
4<div id="pageheader"> 5<div id="pageheader">
5 {include="page.header"} 6 {include="page.header"}
6 <div id="headerform" style="width:100%; white-space:nowrap;";> 7 <div id="headerform" style="width:100%; white-space:nowrap;">
7 <form method="GET" class="searchform" name="searchform" style="display:inline;"><input type="text" name="searchterm" style="width:30%" value=""> <input type="submit" value="Search" class="bigbutton"></form> 8 <form method="GET" class="searchform" name="searchform" style="display:inline;"><input type="text" name="searchterm" style="width:30%" value=""> <input type="submit" value="Search" class="bigbutton"></form>
8 <form method="GET" class="tagfilter" name="tagfilter" style="display:inline;margin-left:24px;"><input type="text" name="searchtags" id="searchtags" style="width:10%" value=""> <input type="submit" value="Filter by tag" class="bigbutton"></form> 9 <form method="GET" class="tagfilter" name="tagfilter" style="display:inline;margin-left:24px;"><input type="text" name="searchtags" id="searchtags" style="width:10%" value=""> <input type="submit" value="Filter by tag" class="bigbutton"></form>
9 </div> 10 </div>
@@ -28,7 +29,7 @@
28 <li{if="$value.class"} class="{$value.class}"{/if}> 29 <li{if="$value.class"} class="{$value.class}"{/if}>
29 <div class="thumbnail">{$value.url|thumbnail}</div> 30 <div class="thumbnail">{$value.url|thumbnail}</div>
30 <div class="linkcontainer"> 31 <div class="linkcontainer">
31 <span class="linktitle"><a href="{$redirector}{$value.url|htmlspecialchars}">{$value.title|htmlspecialchars}</a></span> 32 <span class="linktitle"><a href="{$redirector}{$value.url|urlencode}">{$value.title|htmlspecialchars}</a></span>
32 {if="isLoggedIn()"} 33 {if="isLoggedIn()"}
33 <form method="GET" class="buttoneditform"><input type="hidden" name="edit_link" value="{$value.linkdate}"><input type="image" alt="Edit" src="images/edit_icon.png#" title="Edit" class="button_edit"></form> 34 <form method="GET" class="buttoneditform"><input type="hidden" name="edit_link" value="{$value.linkdate}"><input type="image" alt="Edit" src="images/edit_icon.png#" title="Edit" class="button_edit"></form>
34 <form method="POST" class="buttoneditform"><input type="hidden" name="lf_linkdate" value="{$value.linkdate}"> 35 <form method="POST" class="buttoneditform"><input type="hidden" name="lf_linkdate" value="{$value.linkdate}">
@@ -41,10 +42,11 @@
41 {else} 42 {else}
42 <span class="linkdate" title="Short link here"><a href="?{$value.linkdate|smallHash}">permalink</a> - </span> 43 <span class="linkdate" title="Short link here"><a href="?{$value.linkdate|smallHash}">permalink</a> - </span>
43 {/if} 44 {/if}
45 <div style="position:relative;display:inline;"><a href="http://invx.com/code/qrcode/?code={$scripturl|urlencode}%2F{$value.linkdate|smallHash}&width=200&height=200" onclick="return false;" class="qrcode"><img src="images/qrcode.png#" width="13" height="13" title="QR-Code"></a></div> -
44 <span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span><br> 46 <span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span><br>
45 {if="$value.tags"} 47 {if="$value.tags"}
46 <div class="linktaglist"> 48 <div class="linktaglist">
47 {loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|htmlspecialchars}">{$value|htmlspecialchars}</a></span> {/loop} 49 {loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value|htmlspecialchars}</a></span> {/loop}
48 </div> 50 </div>
49 {/if} 51 {/if}
50 </div> 52 </div>
@@ -57,5 +59,17 @@
57</div> 59</div>
58 60
59 {include="page.footer"} 61 {include="page.footer"}
62<script>
63$('a.qrcode').click(function(){
64 hide_qrcode();
65 var link = $(this).attr('href');
66 $(this).after('<div class="qrcode" onclick="hide_qrcode();return false;"><img src="'+link+'#" width="200" height="200"><br>click to close</div>');
67});
68
69function hide_qrcode()
70{
71 $('div.qrcode').remove();
72}
73</script>
60</body> 74</body>
61</html> \ No newline at end of file 75</html> \ No newline at end of file
diff --git a/tpl/loginform.html b/tpl/loginform.html
index 5a81fde1..805a0148 100644
--- a/tpl/loginform.html
+++ b/tpl/loginform.html
@@ -1,3 +1,4 @@
1<!DOCTYPE html>
1<html> 2<html>
2<head>{include="includes"}</head> 3<head>{include="includes"}</head>
3<body{if="ban_canLogin()"} onload="document.loginform.login.focus();"{/if}> 4<body{if="ban_canLogin()"} onload="document.loginform.login.focus();"{/if}>
diff --git a/tpl/page.footer.html b/tpl/page.footer.html
index 80a000bb..7fe15017 100644
--- a/tpl/page.footer.html
+++ b/tpl/page.footer.html
@@ -1,5 +1,5 @@
1<div id="footer"> 1<div id="footer">
2 <b><a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli">Shaarli {$version}</a></b> - The personal, minimalist, super-fast, no-database delicious clone. By <a href="http://sebsauvage.net" target="_blank">sebsauvage.net</a>. Theme by <a href="http://blog.idleman.fr" target="_blank">idleman.fr</a>. 2 <b><a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli">Shaarli {$version|htmlspecialchars}</a></b> - The personal, minimalist, super-fast, no-database delicious clone. By <a href="http://sebsauvage.net" target="_blank">sebsauvage.net</a>. Theme by <a href="http://blog.idleman.fr" target="_blank">idleman.fr</a>.
3</div> 3</div>
4{if="$newversion"} 4{if="$newversion"}
5 <div id="newversion"><span style="text-decoration:blink;">&#x25CF;</span> Shaarli {$newversion|htmlspecialchars} is <a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli#download">available</a>.</div> 5 <div id="newversion"><span style="text-decoration:blink;">&#x25CF;</span> Shaarli {$newversion|htmlspecialchars} is <a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli#download">available</a>.</div>
diff --git a/tpl/page.header.html b/tpl/page.header.html
index 72965a87..0c304367 100644
--- a/tpl/page.header.html
+++ b/tpl/page.header.html
@@ -18,6 +18,7 @@
18 <a href="{$feedurl}?do=atom{$searchcrits}" style="padding-left:10px;">ATOM Feed</a> 18 <a href="{$feedurl}?do=atom{$searchcrits}" style="padding-left:10px;">ATOM Feed</a>
19 <a href="?do=tagcloud">Tag cloud</a> 19 <a href="?do=tagcloud">Tag cloud</a>
20 <a href="?do=picwall{$searchcrits}">Picture wall</a> 20 <a href="?do=picwall{$searchcrits}">Picture wall</a>
21 <a href="?do=daily">Daily</a>
21{/if} 22{/if}
22 <div class="clear"></div> 23 <div class="clear"></div>
23 24
diff --git a/tpl/page.html b/tpl/page.html
index 2601169e..834915ec 100644
--- a/tpl/page.html
+++ b/tpl/page.html
@@ -1,3 +1,4 @@
1<!DOCTYPE html>
1<html> 2<html>
2<head>{include="includes"}</head> 3<head>{include="includes"}</head>
3<body> 4<body>
diff --git a/tpl/picwall.html b/tpl/picwall.html
index 48a1acf1..da6df762 100644
--- a/tpl/picwall.html
+++ b/tpl/picwall.html
@@ -1,3 +1,4 @@
1<!DOCTYPE html>
1<html> 2<html>
2<head>{include="includes"}</head> 3<head>{include="includes"}</head>
3<body> 4<body>
diff --git a/tpl/picwall2.html b/tpl/picwall2.html
index 765cf439..44d08b0c 100644
--- a/tpl/picwall2.html
+++ b/tpl/picwall2.html
@@ -1,3 +1,4 @@
1<!DOCTYPE html>
1<html> 2<html>
2<head>{include="includes"}</head> 3<head>{include="includes"}</head>
3<body> 4<body>
diff --git a/tpl/tagcloud.html b/tpl/tagcloud.html
index 4bd78115..6918c7be 100644
--- a/tpl/tagcloud.html
+++ b/tpl/tagcloud.html
@@ -1,3 +1,4 @@
1<!DOCTYPE html>
1<html> 2<html>
2<head>{include="includes"}</head> 3<head>{include="includes"}</head>
3<body> 4<body>
diff --git a/tpl/tools.html b/tpl/tools.html
index bf70021c..069a978f 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -1,3 +1,4 @@
1<!DOCTYPE html>
1<html> 2<html>
2<head>{include="includes"}</head> 3<head>{include="includes"}</head>
3<body> 4<body>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 01:12:04 +0000