aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'tpl')
-rw-r--r--tpl/changetag.html4
-rw-r--r--tpl/daily.html5
-rw-r--r--tpl/editlink.html4
-rw-r--r--tpl/includes.html2
-rw-r--r--tpl/install.html2
-rw-r--r--tpl/linklist.html23
-rw-r--r--tpl/picwall.html6
7 files changed, 30 insertions, 16 deletions
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/daily.html b/tpl/daily.html
index e39ae7ab..c53e6f71 100644
--- a/tpl/daily.html
+++ b/tpl/daily.html
@@ -28,6 +28,11 @@
28 <img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink"> 28 <img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink">
29 </a> 29 </a>
30 </div> 30 </div>
31 {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
32 <div class="dailyEntryLinkdate">
33 <a href="?{$link.linkdate|smallHash}">{$link.localdate}</a>
34 </div>
35 {/if}
31 {if="$link.tags"} 36 {if="$link.tags"}
32 <div class="dailyEntryTags"> 37 <div class="dailyEntryTags">
33 {loop="link.taglist"} 38 {loop="link.taglist"}
diff --git a/tpl/editlink.html b/tpl/editlink.html
index 454dfff4..ecab443d 100644
--- a/tpl/editlink.html
+++ b/tpl/editlink.html
@@ -1,7 +1,7 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<html> 2<html>
3<head>{include="includes"} 3<head>{include="includes"}
4{if="empty($GLOBALS['disablejquery'])"}<script src="inc/jquery.min.js#"></script><script src="inc/jquery-ui.min.js#"></script>{/if} 4{if="empty($GLOBALS['disablejquery'])"}<script src="inc/jquery-1.11.2.min.js#"></script><script src="inc/jquery-ui-1.11.2.min.js#"></script>{/if}
5</head> 5</head>
6<body 6<body
7{if="$link.title==''"}onload="document.linkform.lf_title.focus();" 7{if="$link.title==''"}onload="document.linkform.lf_title.focus();"
@@ -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/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 42a75a1a..c8dfd122 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -52,7 +52,8 @@
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&amp;s=8&amp;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" alt="QR-Code"></a></div> - 55 onclick="return showQrCode(this);" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}">
56 <img src="images/qrcode.png#" alt="QR-Code" title="{$value.localdate|htmlspecialchars}"></a></div> -
56 <a href="{$value.url|htmlspecialchars}"><span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span></a><br> 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">
@@ -79,16 +80,24 @@ 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");
91 element.src = "inc/qr.min.js"; 100 element.src = "inc/qr-1.1.3.min.js";
92 document.body.appendChild(element); 101 document.body.appendChild(element);
93 } 102 }
94 setTimeout(function() { showQrCode(caller,true);}, 200); // Retry in 200 milliseconds. 103 setTimeout(function() { showQrCode(caller,true);}, 200); // Retry in 200 milliseconds.
@@ -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/picwall.html b/tpl/picwall.html
index bfaabf7e..d3cabb2d 100644
--- a/tpl/picwall.html
+++ b/tpl/picwall.html
@@ -2,9 +2,9 @@
2<html> 2<html>
3<head>{include="includes"} 3<head>{include="includes"}
4{if="empty($GLOBALS['disablejquery'])"} 4{if="empty($GLOBALS['disablejquery'])"}
5<script src="inc/jquery.min.js#"></script> 5<script src="inc/jquery-1.11.2.min.js#"></script>
6<script src="inc/jquery-ui.min.js#"></script> 6<script src="inc/jquery-ui-1.11.2.min.js#"></script>
7<script src="inc/jquery.lazyload.min.js#"></script> 7<script src="inc/jquery.lazyload-1.9.3.min.js#"></script>
8{/if} 8{/if}
9</head> 9</head>
10<body> 10<body>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 03:36:48 +0000