aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'tpl')
-rw-r--r--tpl/changepassword.html2
-rw-r--r--tpl/changetag.html4
-rw-r--r--tpl/configure.html16
-rw-r--r--tpl/daily.html80
-rw-r--r--tpl/editlink.html2
-rw-r--r--tpl/export.html6
-rw-r--r--tpl/import.html2
-rw-r--r--tpl/includes.html2
-rw-r--r--tpl/install.html2
-rw-r--r--tpl/linklist.html29
-rw-r--r--tpl/linklist.paging.html10
-rw-r--r--tpl/page.footer.html2
-rw-r--r--tpl/picwall.html16
-rw-r--r--tpl/tagcloud.html12
-rw-r--r--tpl/tools.html2
15 files changed, 98 insertions, 89 deletions
diff --git a/tpl/changepassword.html b/tpl/changepassword.html
index 48cf5fa3..c40daf9d 100644
--- a/tpl/changepassword.html
+++ b/tpl/changepassword.html
@@ -4,7 +4,7 @@
4<body onload="document.changepasswordform.oldpassword.focus();"> 4<body onload="document.changepasswordform.oldpassword.focus();">
5<div id="pageheader"> 5<div id="pageheader">
6 {include="page.header"} 6 {include="page.header"}
7 <form method="POST" action="" name="changepasswordform" id="changepasswordform"> 7 <form method="POST" action="#" name="changepasswordform" id="changepasswordform">
8 Old password: <input type="password" name="oldpassword">&nbsp; &nbsp; 8 Old password: <input type="password" name="oldpassword">&nbsp; &nbsp;
9 New password: <input type="password" name="setpassword"> 9 New password: <input type="password" name="setpassword">
10 <input type="hidden" name="token" value="{$token}"> 10 <input type="hidden" name="token" value="{$token}">
diff --git a/tpl/changetag.html b/tpl/changetag.html
index 79fea9a9..fdfb0b37 100644
--- a/tpl/changetag.html
+++ b/tpl/changetag.html
@@ -12,11 +12,11 @@
12 <input type="text" name="totag" id="totag"> 12 <input type="text" name="totag" id="totag">
13 <input type="submit" name="renametag" value="Rename tag" class="bigbutton"> 13 <input type="submit" name="renametag" value="Rename tag" class="bigbutton">
14 &nbsp;&nbsp;or&nbsp; <input type="submit" name="deletetag" value="Delete tag" class="bigbutton" onClick="return confirmDeleteTag();"><br>(Case sensitive)</form> 14 &nbsp;&nbsp;or&nbsp; <input type="submit" name="deletetag" value="Delete tag" class="bigbutton" onClick="return confirmDeleteTag();"><br>(Case sensitive)</form>
15<script language="JavaScript">function confirmDeleteTag() { var agree=confirm("Are you sure you want to delete this tag from all links ?"); if (agree) return true ; else return false ; }</script> 15<script>function confirmDeleteTag() { var agree=confirm("Are you sure you want to delete this tag from all links ?"); if (agree) return true ; else return false ; }</script>
16</div> 16</div>
17{include="page.footer"} 17{include="page.footer"}
18{if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()) && empty($GLOBALS['disablejquery'])"} 18{if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()) && empty($GLOBALS['disablejquery'])"}
19<script language="JavaScript"> 19<script>
20$(document).ready(function() 20$(document).ready(function()
21{ 21{
22 $('#fromtag').autocomplete({source:'{$source}?ws=singletag',minLength:1}); 22 $('#fromtag').autocomplete({source:'{$source}?ws=singletag',minLength:1});
diff --git a/tpl/configure.html b/tpl/configure.html
index 645107ae..89e48bd1 100644
--- a/tpl/configure.html
+++ b/tpl/configure.html
@@ -5,26 +5,26 @@
5<div id="pageheader"> 5<div id="pageheader">
6 {include="page.header"} 6 {include="page.header"}
7{$timezone_js} 7{$timezone_js}
8 <form method="POST" action="" name="configform" id="configform"> 8 <form method="POST" action="#" name="configform" id="configform">
9 <input type="hidden" name="token" value="{$token}"> 9 <input type="hidden" name="token" value="{$token}">
10 <table border="0" cellpadding="20"> 10 <table id="configuration_table">
11 11
12 <tr><td><b>Page title:</b></td><td><input type="text" name="title" id="title" size="50" value="{$title}"></td></tr> 12 <tr><td><b>Page title:</b></td><td><input type="text" name="title" id="title" size="50" value="{$title}"></td></tr>
13 13
14 <tr><td><b>Title link:</b></td><td><input type="text" name="titleLink" id="titleLink" size="50" value="{$titleLink}"><br/><label for="titleLink">(default value is: ?)</label></td></tr> 14 <tr><td><b>Title link:</b></td><td><input type="text" name="titleLink" id="titleLink" size="50" value="{$titleLink}"><br/><label for="titleLink">(default value is: ?)</label></td></tr>
15 <tr><td valign="top"><b>Timezone:</b></td><td valign="top">{$timezone_form}</td></tr> 15 <tr><td><b>Timezone:</b></td><td>{$timezone_form}</td></tr>
16 16
17 <tr><td valign="top"><b>Redirector</b></td><td><input type="text" name="redirector" id="redirector" size="50" value="{$redirector}"><br>(e.g. <i>http://anonym.to/?</i> will mask the HTTP_REFERER)</td></tr> 17 <tr><td><b>Redirector</b></td><td><input type="text" name="redirector" id="redirector" size="50" value="{$redirector}"><br>(e.g. <i>http://anonym.to/?</i> will mask the HTTP_REFERER)</td></tr>
18 18
19 <tr><td valign="top"><b>Security:</b></td><td><input type="checkbox" name="disablesessionprotection" id="disablesessionprotection" {if="!empty($GLOBALS['disablesessionprotection'])"}checked{/if}><label for="disablesessionprotection">&nbsp;Disable session cookie hijacking protection (Check this if you get disconnected often or if your IP address changes often.)</label></td></tr> 19 <tr><td><b>Security:</b></td><td><input type="checkbox" name="disablesessionprotection" id="disablesessionprotection" {if="!empty($GLOBALS['disablesessionprotection'])"}checked{/if}><label for="disablesessionprotection">&nbsp;Disable session cookie hijacking protection (Check this if you get disconnected often or if your IP address changes often.)</label></td></tr>
20 20
21 <tr><td valign="top"><b>Features:</b></td><td> 21 <tr><td><b>Features:</b></td><td>
22 <input type="checkbox" name="disablejquery" id="disablejquery" {if="!empty($GLOBALS['disablejquery'])"}checked{/if}><label for="disablejquery">&nbsp;Disable jQuery and all heavy JavaScript (for example: Autocomplete in tags. Useful for slow computers.)</label> 22 <input type="checkbox" name="disablejquery" id="disablejquery" {if="!empty($GLOBALS['disablejquery'])"}checked{/if}><label for="disablejquery">&nbsp;Disable jQuery and all heavy JavaScript (for example: Autocomplete in tags. Useful for slow computers.)</label>
23 </td></tr> 23 </td></tr>
24 <tr><td valign="top"><b>New link:</b></td><td> 24 <tr><td><b>New link:</b></td><td>
25 <input type="checkbox" name="privateLinkByDefault" id="privateLinkByDefault" {if="!empty($GLOBALS['privateLinkByDefault'])"}checked{/if}/><label for="privateLinkByDefault">&nbsp;All new link are private by default</label></td> 25 <input type="checkbox" name="privateLinkByDefault" id="privateLinkByDefault" {if="!empty($GLOBALS['privateLinkByDefault'])"}checked{/if}/><label for="privateLinkByDefault">&nbsp;All new link are private by default</label></td>
26 </tr> 26 </tr>
27 <tr><td></td><td align="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr> 27 <tr><td></td><td class="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr>
28 </table> 28 </table>
29 </form> 29 </form>
30</div> 30</div>
diff --git a/tpl/daily.html b/tpl/daily.html
index c15a7062..c53e6f71 100644
--- a/tpl/daily.html
+++ b/tpl/daily.html
@@ -6,52 +6,52 @@
6<div class="daily"> 6<div class="daily">
7 <div class="dailyAbout"> 7 <div class="dailyAbout">
8 All links of one day<br>in a single page.<br> 8 All links of one day<br>in a single page.<br>
9 {if="$previousday"} <a href="?do=daily&day={$previousday}"><b>&lt;</b>Previous day</a>{else}<b>&lt;</b>Previous day{/if} 9 {if="$previousday"} <a href="?do=daily&amp;day={$previousday}"><b>&lt;</b>Previous day</a>{else}<b>&lt;</b>Previous day{/if}
10 - 10 -
11 {if="$nextday"}<a href="?do=daily&day={$nextday}">Next day<b>&gt;</b></a>{else}Next day<b>&gt;</b>{/if} 11 {if="$nextday"}<a href="?do=daily&amp;day={$nextday}">Next day<b>&gt;</b></a>{else}Next day<b>&gt;</b>{/if}
12 <br><br> 12 <br><br>
13 <a href="?do=dailyrss" title="1 RSS entry per day"><img src="images/feed-icon-14x14.png#">Daily RSS Feed</a> 13 <a href="?do=dailyrss" title="1 RSS entry per day"><img src="images/feed-icon-14x14.png#" alt="rss_feed">Daily RSS Feed</a>
14 </div> 14 </div>
15 <div class="dailyTitle"><img src="../images/floral_left.png" width="51" height="50" class="nomobile"> The Daily Shaarli <img src="../images/floral_right.png" width="51" height="50" class="nomobile"></div> 15 <div class="dailyTitle"><img src="../images/floral_left.png" width="51" height="50" class="nomobile" alt="floral_left"> The Daily Shaarli <img src="../images/floral_right.png" width="51" height="50" class="nomobile" alt="floral_right"></div>
16 <div class="dailyDate"><span class="nomobile">&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;</span> {$day} <span class="nomobile">&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;&#x0097;</span></div> 16 <div class="dailyDate"><span class="nomobile">&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;</span> {$day} <span class="nomobile">&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;</span></div>
17 <div class="clear"></div> 17 <div class="clear"></div>
18
19 {if="$linksToDisplay"}
20 <div id="daily_col1">
21 {loop="col1"}
22 <div class="dailyEntry">
23 <div class="dailyEntryPermalink"><a href="?{$value.linkdate|smallHash}"><img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink"></a></div>
24 {if="$value.tags"}<div class="dailyEntryTags">{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}</div>{/if}
25 <div class="dailyEntryTitle"><a href="{$value.url}">{$value.title|htmlspecialchars}</a></div>
26 {if="$value.thumbnail"}<div class="dailyEntryThumbnail">{$value.thumbnail}</div>{/if}
27 <div class="dailyEntryDescription">{$value.formatedDescription}</div>
28 </div>
29 {/loop}
30 </div>
31 18
32 <div id="daily_col2"> 19 {if="$linksToDisplay"}
33 {loop="col2"} 20 {loop="cols"}
34 <div class="dailyEntry"> 21 {if="isset($value[0])"}
35 <div class="dailyEntryPermalink"><a href="?{$value.linkdate|smallHash}"><img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink"></a></div> 22 <div id="daily_col{$counter+1}">
36 {if="$value.tags"}<div class="dailyEntryTags">{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}</div>{/if} 23 {loop="value"}
37 <div class="dailyEntryTitle"><a href="{$value.url}">{$value.title|htmlspecialchars}</a></div> 24 {$link=$value}
38 {if="$value.thumbnail"}<div class="dailyEntryThumbnail">{$value.thumbnail}</div>{/if} 25 <div class="dailyEntry">
39 <div class="dailyEntryDescription">{$value.formatedDescription}</div> 26 <div class="dailyEntryPermalink">
40 </div> 27 <a href="?{$link.linkdate|smallHash}">
41 {/loop} 28 <img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink">
42 </div> 29 </a>
43 30 </div>
44 <div id="daily_col3"> 31 {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
45 {loop="col3"} 32 <div class="dailyEntryLinkdate">
46 <div class="dailyEntry"> 33 <a href="?{$link.linkdate|smallHash}">{$link.localdate}</a>
47 <div class="dailyEntryPermalink"><a href="?{$value.linkdate|smallHash}"><img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink"></a></div> 34 </div>
48 {if="$value.tags"}<div class="dailyEntryTags">{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}</div>{/if} 35 {/if}
49 <div class="dailyEntryTitle"><a href="{$value.url}">{$value.title|htmlspecialchars}</a></div> 36 {if="$link.tags"}
50 {if="$value.thumbnail"}<div class="dailyEntryThumbnail">{$value.thumbnail}</div>{/if} 37 <div class="dailyEntryTags">
51 <div class="dailyEntryDescription">{$value.formatedDescription}</div> 38 {loop="link.taglist"}
52 </div> 39 {$value|htmlspecialchars} -
40 {/loop}
41 </div>
42 {/if}
43 <div class="dailyEntryTitle">
44 <a href="{$link.url}">{$link.title|htmlspecialchars}</a>
45 </div>
46 {if="$link.thumbnail"}
47 <div class="dailyEntryThumbnail">{$link.thumbnail}</div>
48 {/if}
49 <div class="dailyEntryDescription">{$link.formatedDescription}</div>
50 </div>
51 {/loop}
52 </div>
53 {/if}
53 {/loop} 54 {/loop}
54 </div>
55 {else} 55 {else}
56 <div class="dailyNoEntry">No articles on this day.</div> 56 <div class="dailyNoEntry">No articles on this day.</div>
57 {/if} 57 {/if}
diff --git a/tpl/editlink.html b/tpl/editlink.html
index 885feed7..ecab443d 100644
--- a/tpl/editlink.html
+++ b/tpl/editlink.html
@@ -33,7 +33,7 @@
33</div> 33</div>
34{include="page.footer"} 34{include="page.footer"}
35{if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()) && empty($GLOBALS['disablejquery'])"} 35{if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()) && empty($GLOBALS['disablejquery'])"}
36<script language="JavaScript"> 36<script>
37$(document).ready(function() 37$(document).ready(function()
38{ 38{
39 $('#lf_tags').autocomplete({source:'{$source}?ws=tags',minLength:1}); 39 $('#lf_tags').autocomplete({source:'{$source}?ws=tags',minLength:1});
diff --git a/tpl/export.html b/tpl/export.html
index 911b02c1..9d101db4 100644
--- a/tpl/export.html
+++ b/tpl/export.html
@@ -5,9 +5,9 @@
5<div id="pageheader"> 5<div id="pageheader">
6 {include="page.header"} 6 {include="page.header"}
7 <div id="toolsdiv"> 7 <div id="toolsdiv">
8 <a href="?do=export&what=all"><b>Export all</b> <span>: Export all links</span></a><br><br> 8 <a href="?do=export&amp;what=all"><b>Export all</b> <span>: Export all links</span></a><br><br>
9 <a href="?do=export&what=public"><b>Export public</b> <span>: Export public links only</a><br><br> 9 <a href="?do=export&amp;what=public"><b>Export public</b> <span>: Export public links only</span></a><br><br>
10 <a href="?do=export&what=private"><b>Export private</b> <span>: Export private links only</a> 10 <a href="?do=export&amp;what=private"><b>Export private</b> <span>: Export private links only</span></a>
11 <div class="clear"></div> 11 <div class="clear"></div>
12 </div> 12 </div>
13</div> 13</div>
diff --git a/tpl/import.html b/tpl/import.html
index 259e56ee..9ac3c2f9 100644
--- a/tpl/import.html
+++ b/tpl/import.html
@@ -8,7 +8,7 @@
8 Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize|htmlspecialchars} bytes). 8 Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize|htmlspecialchars} bytes).
9 <form method="POST" action="?do=upload" enctype="multipart/form-data" name="uploadform" id="uploadform"> 9 <form method="POST" action="?do=upload" enctype="multipart/form-data" name="uploadform" id="uploadform">
10 <input type="hidden" name="token" value="{$token}"> 10 <input type="hidden" name="token" value="{$token}">
11 <input type="file" name="filetoupload" size="80"> 11 <input type="file" name="filetoupload">
12 <input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize|htmlspecialchars}"> 12 <input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize|htmlspecialchars}">
13 <input type="submit" name="import_file" value="Import" class="bigbutton"><br> 13 <input type="submit" name="import_file" value="Import" class="bigbutton"><br>
14 <input type="checkbox" name="private" id="private"><label for="private">&nbsp;Import all links as private</label><br> 14 <input type="checkbox" name="private" id="private"><label for="private">&nbsp;Import all links as private</label><br>
diff --git a/tpl/includes.html b/tpl/includes.html
index cc573801..efc658eb 100644
--- a/tpl/includes.html
+++ b/tpl/includes.html
@@ -6,4 +6,4 @@
6<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" /> 6<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
7<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" /> 7<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />
8<link type="text/css" rel="stylesheet" href="inc/shaarli.css?version={$version|urlencode}#" /> 8<link type="text/css" rel="stylesheet" href="inc/shaarli.css?version={$version|urlencode}#" />
9{if="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css?version={$version}#" />{/if} 9{if="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css?version={$version|urlencode}#" />{/if}
diff --git a/tpl/install.html b/tpl/install.html
index 32b8811b..df42bf6d 100644
--- a/tpl/install.html
+++ b/tpl/install.html
@@ -5,7 +5,7 @@
5<div id="install"> 5<div id="install">
6<h1>Shaarli</h1> 6<h1>Shaarli</h1>
7It looks like it's the first time you run Shaarli. Please configure it:<br> 7It looks like it's the first time you run Shaarli. Please configure it:<br>
8<form method="POST" action="" name="installform" id="installform"> 8<form method="POST" action="#" name="installform" id="installform">
9<table> 9<table>
10<tr><td><b>Login:</b></td><td><input type="text" name="setlogin" size="30"></td></tr> 10<tr><td><b>Login:</b></td><td><input type="text" name="setlogin" size="30"></td></tr>
11<tr><td><b>Password:</b></td><td><input type="password" name="setpassword" size="30"></td></tr> 11<tr><td><b>Password:</b></td><td><input type="password" name="setpassword" size="30"></td></tr>
diff --git a/tpl/linklist.html b/tpl/linklist.html
index 58d5867e..c8dfd122 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -30,7 +30,7 @@
30 <ul> 30 <ul>
31 {loop="links"} 31 {loop="links"}
32 <li{if="$value.class"} class="{$value.class}"{/if}> 32 <li{if="$value.class"} class="{$value.class}"{/if}>
33 <a name="{$value.linkdate|smallHash}" id="{$value.linkdate|smallHash}"></a> 33 <a id="{$value.linkdate|smallHash}"></a>
34 <div class="thumbnail">{$value.url|thumbnail}</div> 34 <div class="thumbnail">{$value.url|thumbnail}</div>
35 <div class="linkcontainer"> 35 <div class="linkcontainer">
36 {if="isLoggedIn()"} 36 {if="isLoggedIn()"}
@@ -51,9 +51,10 @@
51 {if="$GLOBALS['config']['ARCHIVE_ORG']"} 51 {if="$GLOBALS['config']['ARCHIVE_ORG']"}
52 <span class="linkarchive"><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">archive</a> - </span> 52 <span class="linkarchive"><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">archive</a> - </span>
53 {/if} 53 {/if}
54 <div class="linkqrcode"><a href="http://qrfree.kaywa.com/?l=1&s=8&d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}" 54 <div class="linkqrcode"><a href="http://qrfree.kaywa.com/?l=1&amp;s=8&amp;d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}"
55 onclick="showQrCode(this); return false;" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}"><img src="images/qrcode.png#" title="QR-Code"></a></div> - 55 onclick="return showQrCode(this);" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}">
56 <a href={$value.url|htmlspecialchars}><span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span></a><br> 56 <img src="images/qrcode.png#" alt="QR-Code" title="{$value.localdate|htmlspecialchars}"></a></div> -
57 <a href="{$value.url|htmlspecialchars}"><span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span></a><br>
57 {if="$value.tags"} 58 {if="$value.tags"}
58 <div class="linktaglist"> 59 <div class="linktaglist">
59 {loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value|htmlspecialchars}</a></span> {/loop} 60 {loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value|htmlspecialchars}</a></span> {/loop}
@@ -70,7 +71,7 @@
70 71
71 {include="page.footer"} 72 {include="page.footer"}
72 73
73<script language="JavaScript"> 74<script>
74// Remove any displayed QR-Code 75// Remove any displayed QR-Code
75function remove_qrcode() 76function remove_qrcode()
76{ 77{
@@ -79,12 +80,20 @@ function remove_qrcode()
79 return false; 80 return false;
80} 81}
81 82
83function isCanvasSupported(){
84 var elem = document.createElement('canvas');
85 return !!(elem.getContext && elem.getContext('2d'));
86}
87
82// Show the QR-Code of a permalink (when the QR-Code icon is clicked). 88// Show the QR-Code of a permalink (when the QR-Code icon is clicked).
83function showQrCode(caller,loading=false) 89function showQrCode(caller,loading)
84{ 90{
91 if( !isCanvasSupported() ) return true;
92
85 // Dynamic javascript lib loading: We only load qr.js if the QR code icon is clicked: 93 // Dynamic javascript lib loading: We only load qr.js if the QR code icon is clicked:
86 if (typeof(qr)=='undefined') // Load qr.js only if not present. 94 if (typeof(qr)=='undefined') // Load qr.js only if not present.
87 { 95 {
96 loading = typeof loading !== 'undefined' ? loading : false;
88 if (!loading) // If javascript lib is still loading, do not append script to body. 97 if (!loading) // If javascript lib is still loading, do not append script to body.
89 { 98 {
90 var element = document.createElement("script"); 99 var element = document.createElement("script");
@@ -101,12 +110,12 @@ function showQrCode(caller,loading=false)
101 // Build the div which contains the QR-Code: 110 // Build the div which contains the QR-Code:
102 var element = document.createElement('div'); 111 var element = document.createElement('div');
103 element.id="permalinkQrcode"; 112 element.id="permalinkQrcode";
104 // Make QR-Code div commit sepuku when clicked: 113
105 if ( element.attachEvent ){ element.attachEvent('onclick', 'this.parentNode.removeChild(this);' ); } // Damn IE 114 // Make QR-Code div commit sepuku when clicked:
106 else { element.setAttribute('onclick', 'this.parentNode.removeChild(this);' ); } 115 element.addEventListener('click', remove_qrcode ); // Works on every canvas supported browser
107 116
108 // Build the QR-Code: 117 // Build the QR-Code:
109 var image = qr.image({size: 8,value: caller.dataset.permalink}); 118 var image = qr.image({size: 8,value: caller.getAttribute('data-permalink')});
110 if (image) 119 if (image)
111 { 120 {
112 element.appendChild(image); 121 element.appendChild(image);
diff --git a/tpl/linklist.paging.html b/tpl/linklist.paging.html
index c2b98971..848541cd 100644
--- a/tpl/linklist.paging.html
+++ b/tpl/linklist.paging.html
@@ -1,6 +1,6 @@
1<div class="paging"> 1<div class="paging">
2{if="isLoggedIn()"} 2{if="isLoggedIn()"}
3 <div id="paging_privatelinks"> 3 <div class="paging_privatelinks">
4 <a href="?privateonly"> 4 <a href="?privateonly">
5 {if="$privateonly"} 5 {if="$privateonly"}
6 <img src="images/private_16x16_active.png#" width="16" height="16" title="Click to see all links" alt="Click to see all links"> 6 <img src="images/private_16x16_active.png#" width="16" height="16" title="Click to see all links" alt="Click to see all links">
@@ -10,11 +10,11 @@
10 </a> 10 </a>
11 </div> 11 </div>
12{/if} 12{/if}
13 <div id="paging_linksperpage"> 13 <div class="paging_linksperpage">
14 Links per page: <a href="?linksperpage=20">20</a> <a href="?linksperpage=50">50</a> <a href="?linksperpage=100">100</a> 14 Links per page: <a href="?linksperpage=20">20</a> <a href="?linksperpage=50">50</a> <a href="?linksperpage=100">100</a>
15 <form method="GET" class="linksperpage"><input type="text" name="linksperpage" size="2"></form> 15 <form method="GET" class="linksperpage"><input type="text" name="linksperpage" size="2"></form>
16 </div> 16 </div>
17 {if="$previous_page_url"} <a href="{$previous_page_url}" id="paging_older">&#x25C4;Older</a> {/if} 17 {if="$previous_page_url"} <a href="{$previous_page_url}" class="paging_older">&#x25C4;Older</a> {/if}
18 <div id="paging_current">page {$page_current} / {$page_max} </div> 18 <div class="paging_current">page {$page_current} / {$page_max} </div>
19 {if="$next_page_url"} <a href="{$next_page_url}" id="paging_newer">Newer&#x25BA;</a> {/if} 19 {if="$next_page_url"} <a href="{$next_page_url}" class="paging_newer">Newer&#x25BA;</a> {/if}
20</div> 20</div>
diff --git a/tpl/page.footer.html b/tpl/page.footer.html
index b494bf7d..e55a3cb4 100644
--- a/tpl/page.footer.html
+++ b/tpl/page.footer.html
@@ -5,5 +5,5 @@
5 <div id="newversion"><span id="version_id">&#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 id="version_id">&#x25CF;</span> Shaarli {$newversion|htmlspecialchars} is <a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli#download">available</a>.</div>
6{/if} 6{/if}
7{if="isLoggedIn()"} 7{if="isLoggedIn()"}
8<script language="JavaScript">function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script> 8<script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script>
9{/if} 9{/if}
diff --git a/tpl/picwall.html b/tpl/picwall.html
index bf299fbf..d3cabb2d 100644
--- a/tpl/picwall.html
+++ b/tpl/picwall.html
@@ -9,15 +9,15 @@
9</head> 9</head>
10<body> 10<body>
11<div id="pageheader">{include="page.header"}</div> 11<div id="pageheader">{include="page.header"}</div>
12<center> 12<div class="center">
13<div class="picwall_container"> 13 <div id="picwall_container">
14 {loop="linksToDisplay"} 14 {loop="linksToDisplay"}
15 <div class="picwall_pictureframe"> 15 <div class="picwall_pictureframe">
16 {$value.thumbnail}<a href="{$value.permalink}"><span class="info">{$value.title|htmlspecialchars}</span></a> 16 {$value.thumbnail}<a href="{$value.permalink}"><span class="info">{$value.title|htmlspecialchars}</span></a>
17 </div> 17 </div>
18 {/loop} 18 {/loop}
19 </div>
19</div> 20</div>
20</center>
21{include="page.footer"} 21{include="page.footer"}
22 22
23{if="empty($GLOBALS['disablejquery'])"} 23{if="empty($GLOBALS['disablejquery'])"}
diff --git a/tpl/tagcloud.html b/tpl/tagcloud.html
index 9418e248..97205e2b 100644
--- a/tpl/tagcloud.html
+++ b/tpl/tagcloud.html
@@ -3,13 +3,13 @@
3<head>{include="includes"}</head> 3<head>{include="includes"}</head>
4<body> 4<body>
5 <div id="pageheader">{include="page.header"}</div> 5 <div id="pageheader">{include="page.header"}</div>
6<center> 6<div class="center">
7<div id="cloudtag"> 7 <div id="cloudtag">
8 {loop="tags"} 8 {loop="tags"}
9 <span class="count">{$value.count}</span><a href="?searchtags={$key|urlencode}" style="font-size:{$value.size}pt;">{$key|htmlspecialchars}</a> 9 <span class="count">{$value.count}</span><a href="?searchtags={$key|urlencode}" style="font-size:{$value.size}pt;">{$key|htmlspecialchars}</a>
10 {/loop} 10 {/loop}
11 </div>
11</div> 12</div>
12</center>
13{include="page.footer"} 13{include="page.footer"}
14</body> 14</body>
15</html> 15</html>
diff --git a/tpl/tools.html b/tpl/tools.html
index ae31902b..c2520fda 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -10,7 +10,7 @@
10 <a href="?do=changetag"><b>Rename/delete tags</b> <span>: Rename or delete a tag in all links</span></a><br><br> 10 <a href="?do=changetag"><b>Rename/delete tags</b> <span>: Rename or delete a tag in all links</span></a><br><br>
11 <a href="?do=import"><b>Import</b> <span>: Import Netscape html bookmarks (as exported from Firefox, Chrome, Opera, delicious...)</span></a> <br><br> 11 <a href="?do=import"><b>Import</b> <span>: Import Netscape html bookmarks (as exported from Firefox, Chrome, Opera, delicious...)</span></a> <br><br>
12 <a href="?do=export"><b>Export</b> <span>: Export Netscape html bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)</span></a><br><br> 12 <a href="?do=export"><b>Export</b> <span>: Export Netscape html bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)</span></a><br><br>
13 <a class="smallbutton" onclick="alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');return false;" href="javascript:javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+'&amp;title='%20+%20encodeURIComponent(title)+'&amp;description='%20+%20encodeURIComponent(document.getSelection())+'&amp;source=bookmarklet','_blank','menubar=no,height=390,width=600,toolbar=no,scrollbars=no,status=no,dialog=1');})();"><b>Shaare link</b></a> <a href="#" id="bookmark"><span>&#x21D0; Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).<br>&nbsp;&nbsp;&nbsp;&nbsp;Then click "Shaare link" button in any page you want to share.</span></a><br><br> 13 <a class="smallbutton" onclick="alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');return false;" href="javascript:javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+'&amp;title='%20+%20encodeURIComponent(title)+'&amp;description='%20+%20encodeURIComponent(document.getSelection())+'&amp;source=bookmarklet','_blank','menubar=no,height=390,width=600,toolbar=no,scrollbars=no,status=no,dialog=1');})();"><b>✚Shaare link</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).<br>&nbsp;&nbsp;&nbsp;&nbsp;Then click "✚Shaare link" button in any page you want to share.</span></a><br><br>
14 <div class="clear"></div> 14 <div class="clear"></div>
15 </div> 15 </div>
16</div> 16</div>