aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--inc/shaarli.css1256
-rw-r--r--index.php13
-rw-r--r--tpl/addlink.html4
-rw-r--r--tpl/changetag.html5
-rw-r--r--tpl/daily.html78
-rw-r--r--tpl/editlink.html14
-rw-r--r--tpl/export.html5
-rw-r--r--tpl/install.html11
-rw-r--r--tpl/linklist.html14
-rw-r--r--tpl/linklist.paging.html4
-rw-r--r--tpl/loginform.html4
-rw-r--r--tpl/page.footer.html2
-rw-r--r--tpl/page.header.html4
-rw-r--r--tpl/tagcloud.html4
-rw-r--r--tpl/tools.html4
15 files changed, 986 insertions, 436 deletions
diff --git a/inc/shaarli.css b/inc/shaarli.css
index bc428f74..e7396ccb 100644
--- a/inc/shaarli.css
+++ b/inc/shaarli.css
@@ -2,346 +2,726 @@
2 2
3/* CSS Reset from Yahoo to cope with browsers CSS inconsistencies. */ 3/* CSS Reset from Yahoo to cope with browsers CSS inconsistencies. */
4/* 4/*
5Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.com/yui/license.html 5 Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.com/yui/license.html
6version: 2.8.2r1 6 version: 2.8.2r1
7*/ 7 */
8html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;} 8html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;}
9 9
10body { font-family: "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif; font-size:10pt; background-color: #ffffff; word-wrap: break-word; } 10body {
11input, textarea { 11 font-family: "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif;
12 background-color: #dedede; 12 font-size: 10pt;
13 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dedede), to(#ffffff)); 13 background-color: #ffffff;
14 background: -webkit-linear-gradient(#dedede, #ffffff); 14 word-wrap: break-word;
15 background: -moz-linear-gradient(#dedede, #ffffff); 15}
16 background: -ms-linear-gradient(#dedede, #ffffff);
17 background: -o-linear-gradient(#dedede, #ffffff);
18 background: linear-gradient(#dedede, #ffffff);
19 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
20 padding:5px;
21 border-radius: 5px 5px 5px 5px;
22 border: none;
23 color:#000;
24 16
25 } 17input, textarea {
18 background-color: #dedede;
19 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dedede), to(#ffffff));
20 background: -webkit-linear-gradient(#dedede, #ffffff);
21 background: -moz-linear-gradient(#dedede, #ffffff);
22 background: -ms-linear-gradient(#dedede, #ffffff);
23 background: -o-linear-gradient(#dedede, #ffffff);
24 background: linear-gradient(#dedede, #ffffff);
25 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
26 padding: 5px;
27 border-radius: 5px 5px 5px 5px;
28 border: none;
29 color: #000;
30}
26 31
27a { 32a {
28 text-decoration: none; 33 text-decoration: none;
29} 34}
30 35
31h1 { font-size:20pt; font-weight:bold; font-style:italic; margin-bottom:20px; } 36h1 {
32/* I don't give a shit about IE. He can't understand selectors such as input[type='submit']. */ 37 font-size: 20pt;
38 font-weight: bold;
39 font-style: italic;
40 margin-bottom: 20px;
41}
33 42
34/* Buttons */ 43/* Buttons */
35.bigbutton { 44.bigbutton {
36 background-color: #c0c0c0; 45 background-color: #c0c0c0;
37 background: -moz-linear-gradient(#c0c0c0, #ffffff) repeat scroll 0 0 transparent; 46 background: -moz-linear-gradient(#c0c0c0, #ffffff) repeat scroll 0 0 transparent;
38 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#c0c0c0), to(#ffffff)); 47 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#c0c0c0), to(#ffffff));
39 background: -webkit-linear-gradient(#c0c0c0, #ffffff); 48 background: -webkit-linear-gradient(#c0c0c0, #ffffff);
40 background: -ms-linear-gradient(#c0c0c0, #ffffff); 49 background: -ms-linear-gradient(#c0c0c0, #ffffff);
41 background: -o-linear-gradient(#c0c0c0, #ffffff); 50 background: -o-linear-gradient(#c0c0c0, #ffffff);
42 background: linear-gradient(#c0c0c0, #ffffff); 51 background: linear-gradient(#c0c0c0, #ffffff);
43 border-radius: 3px 3px 3px 3px; 52 border-radius: 3px 3px 3px 3px;
44 box-shadow: 0 1px 1px rgba(0, 0, 0, 0.5); 53 box-shadow: 0 1px 1px rgba(0, 0, 0, 0.5);
45 cursor: pointer; 54 cursor: pointer;
46 height: 24px; 55 height: 24px;
47 margin-left: 5px; 56 margin-left: 5px;
48 padding: 0 5px; 57 padding: 0 5px;
49 color: #606060; 58 color: #606060;
50 border-style:outset; 59 border-style: outset;
51 border-width:1px; 60 border-width: 1px;
61}
52 62
53 }
54.smallbutton { 63.smallbutton {
55 background-color: #c0c0c0; 64 background-color: #c0c0c0;
56 background: -moz-linear-gradient(#c0c0c0, #ffffff) repeat scroll 0 0 transparent; 65 background: -moz-linear-gradient(#c0c0c0, #ffffff) repeat scroll 0 0 transparent;
57 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#c0c0c0), to(#ffffff)); 66 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#c0c0c0), to(#ffffff));
58 background: -webkit-linear-gradient(#c0c0c0, #ffffff); 67 background: -webkit-linear-gradient(#c0c0c0, #ffffff);
59 background: -ms-linear-gradient(#c0c0c0, #ffffff); 68 background: -ms-linear-gradient(#c0c0c0, #ffffff);
60 background: -o-linear-gradient(#c0c0c0, #ffffff); 69 background: -o-linear-gradient(#c0c0c0, #ffffff);
61 background: linear-gradient(#c0c0c0, #ffffff); 70 background: linear-gradient(#c0c0c0, #ffffff);
62 border-radius: 3px 3px 3px 3px; 71 border-radius: 3px 3px 3px 3px;
63 box-shadow: 0 1px 1px rgba(0, 0, 0, 0.5); 72 box-shadow: 0 1px 1px rgba(0, 0, 0, 0.5);
64 cursor: pointer; 73 cursor: pointer;
65 height: 20px; 74 height: 20px;
66 margin-left: 5px; 75 margin-left: 5px;
67 padding: 0 5px; 76 padding: 0 5px;
68 color: #606060; 77 color: #606060;
69 border-style:outset; 78 border-style: outset;
70 border-width:1px; 79 border-width: 1px;
71 80}
72 }
73 81
74/* Small tab on the left of each link with edit/delete buttons. */ 82/* Small tab on the left of each link with edit/delete buttons. */
75.button_edit, .button_delete { border-radius:0; box-shadow:none; border-style:none; border-width:0; padding:0; background:none; } 83.button_edit, .button_delete {
84 border-radius: 0;
85 box-shadow: none;
86 border-style: none;
87 border-width: 0;
88 padding: 0;
89 background: none;
90}
91
76.linkeditbuttons { 92.linkeditbuttons {
77 position:absolute; 93 position: absolute;
78 left:-1px; 94 left: -1px;
79 padding:4px 2px 2px 2px; 95 padding: 4px 2px 2px 2px;
80 background-color:#f0f0f0; 96 background-color: #f0f0f0;
81 97
82 -webkit-border-radius:0px 6px 6px 0px; 98 -webkit-border-radius: 0px 6px 6px 0px;
83 -moz-border-radius:0px 6px 6px 0px; 99 -moz-border-radius: 0px 6px 6px 0px;
84 -o-border-radius:0px 6px 6px 0px; 100 -o-border-radius: 0px 6px 6px 0px;
85 -ms-border-radius:0px 6px 6px 0px; 101 -ms-border-radius: 0px 6px 6px 0px;
86 border-radius:0px 6px 6px 0px; 102 border-radius: 0px 6px 6px 0px;
87 103
88 -webkit-box-shadow:0px 0px 3px 0px #333333; 104 -webkit-box-shadow: 0px 0px 3px 0px #333333;
89 -moz-box-shadow:0px 0px 3px 0px #333333; 105 -moz-box-shadow: 0px 0px 3px 0px #333333;
90 -o-box-shadow:0px 0px 3px 0px #333333; 106 -o-box-shadow: 0px 0px 3px 0px #333333;
91 -ms-box-shadow:0px 0px 3px 0px #333333; 107 -ms-box-shadow: 0px 0px 3px 0px #333333;
92 box-shadow:0px 0px 3px 0px #333333; 108 box-shadow: 0px 0px 3px 0px #333333;
93} 109}
94 110
95#pageheader #logo{ 111#pageheader #logo {
96background-image: url('../images/logo.png'); 112 background-image: url('../images/logo.png');
97background-repeat: no-repeat; 113 background-repeat: no-repeat;
98float:left; 114 float: left;
99margin:0 10px 0 10px; 115 margin: 0 10px 0 10px;
100width:105px; 116 width: 105px;
101height:55px; 117 height: 55px;
102cursor:pointer; 118 cursor: pointer;
119}
103 120
121#pageheader #linkcount {
122 float: right;
123 font-style: italic;
124 color: #bbb;
125 text-align: right;
126 padding-right: 5px;
104} 127}
105 128
106#pageheader 129#pageheader {
107{
108 background-color: #333333; 130 background-color: #333333;
109 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#333333), to(#111111)); 131 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#333333), to(#111111));
110 background: -webkit-linear-gradient(#333333, #111111); 132 background: -webkit-linear-gradient(#333333, #111111);
111 background: -moz-linear-gradient(#333333, #111111); 133 background: -moz-linear-gradient(#333333, #111111);
112 background: -ms-linear-gradient(#333333, #111111); 134 background: -ms-linear-gradient(#333333, #111111);
113 background: -o-linear-gradient(#333333, #111111); 135 background: -o-linear-gradient(#333333, #111111);
114 background: linear-gradient(#333333, #111111); 136 background: linear-gradient(#333333, #111111);
115 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); 137 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
116 width:auto; 138 width: auto;
117 padding:0 10px 5px 10px; 139 padding: 0 10px 5px 10px;
118 margin: auto; 140 margin: auto;
119} 141}
120 142
121#pageheader a 143#pageheader a {
122{
123 background-color: #333333; 144 background-color: #333333;
124 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#333333), to(#000000)); 145 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#333333), to(#000000));
125 background: -webkit-linear-gradient(#333333, #000000); 146 background: -webkit-linear-gradient(#333333, #000000);
126 background: -moz-linear-gradient(#333333, #000000); 147 background: -moz-linear-gradient(#333333, #000000);
127 background: -ms-linear-gradient(#333333, #000000); 148 background: -ms-linear-gradient(#333333, #000000);
128 background: -o-linear-gradient(#333333, #000000); 149 background: -o-linear-gradient(#333333, #000000);
129 background: linear-gradient(#333333, #000000); 150 background: linear-gradient(#333333, #000000);
130 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); 151 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
131 padding:5px; 152 padding: 5px;
132 border-radius: 5px 5px 5px 5px; 153 border-radius: 5px 5px 5px 5px;
133 margin:10px 3px 3px 3px; 154 margin: 10px 3px 3px 3px;
134 color:#A2DD42; 155 color: #A2DD42;
135 float:left; 156 float: left;
136 text-decoration:none; 157 text-decoration: none;
137}
138
139#toolsdiv a{
140 clear:both;
141}
142#toolsdiv a span{
143 color:#ffffff;
144}
145.linksperpage,.tagfilter,.searchform,.addform {
146 background-color: #dedede;
147 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dedede), to(#ffffff));
148 background: -webkit-linear-gradient(#dedede, #ffffff);
149 background: -moz-linear-gradient(#dedede, #ffffff);
150 background: -ms-linear-gradient(#dedede, #ffffff);
151 background: -o-linear-gradient(#dedede, #ffffff);
152 background: linear-gradient(#dedede, #ffffff);
153 display:inline;
154 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
155 padding:5px;
156 border: none;
157 border-radius: 5px 5px 5px 5px;
158 margin:10px 3px 3px 3px;
159 color:#cecece;
160} 158}
161 159
162.linksperpage{ 160#pageheader .search {
163 box-shadow: 0 0 0 rgba(0, 0, 0, 0.5); 161 width: 100%;
164 padding:3px; 162 white-space: nowrap;
165} 163}
166 164
167.linksperpage input,.tagfilter input, .searchform input, .addform input{ 165#toolsdiv a {
168 border:none; 166 clear: both;
169 color:#606060;
170 background:none;
171 box-shadow:none;
172 padding:5px;
173} 167}
174 168
175.linksperpage input{ 169#toolsdiv #bookmark {
176 padding:0; 170 clear: none;
177} 171}
178 172
179.tagfilter input.bigbutton,.searchform input.bigbutton,.addform input.bigbutton{ 173#toolsdiv a span {
174 color: #ffffff;
175}
176
177.linksperpage, .tagfilter, .searchform, .addform {
180 background-color: #dedede; 178 background-color: #dedede;
181 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dedede), to(#ffffff)); 179 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dedede), to(#ffffff));
182 background: -webkit-linear-gradient(#dedede, #ffffff); 180 background: -webkit-linear-gradient(#dedede, #ffffff);
183 background: -moz-linear-gradient(#dedede, #ffffff); 181 background: -moz-linear-gradient(#dedede, #ffffff);
184 background: -ms-linear-gradient(#dedede, #ffffff); 182 background: -ms-linear-gradient(#dedede, #ffffff);
185 background: -o-linear-gradient(#dedede, #ffffff); 183 background: -o-linear-gradient(#dedede, #ffffff);
186 background: linear-gradient(#dedede, #ffffff); 184 background: linear-gradient(#dedede, #ffffff);
187 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); 185 display: inline;
188 padding:0 5px 0 5px; 186 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
189 margin:5px 0 5px 0; 187 padding: 5px;
190 height:20px; 188 border: none;
191 border-radius: 5px 5px 5px 5px; 189 border-radius: 5px 5px 5px 5px;
192 cursor:pointer; 190 margin: 10px 3px 3px 3px;
193} 191 color: #cecece;
194 192}
195#shaarli_title { font-weight:bold; font-style:italic; margin-top:0;} 193
196#shaarli_title a { color: #fff !important; } 194.linksperpage {
197 195 box-shadow: 0 0 0 rgba(0, 0, 0, 0.5);
198#pageheader a:visited { color:#98C943; text-decoration:none;} 196 padding: 3px;
199#pageheader a:hover { color:#FFFFC9; text-decoration:none;} 197}
200#pageheader a:active { color:#bbb; text-decoration:none;} 198
201#searchcriteria { padding: 4px 0px 5px 5px; font-weight:bold;} 199.linksperpage input, .tagfilter input, .searchform input, .addform input {
202.paging { padding:5px;background-color:#777; color:#ccc; text-align:center; clear:both;} 200 border: none;
203.paging a:link { color:#ccc; text-decoration:none;} 201 color: #606060;
204.paging a:visited { color:#ccc; } 202 background: none;
205.paging a:hover { color:#FFFFC9; } 203 box-shadow: none;
206.paging a:active { color:#fff; } 204 padding: 5px;
207#paging_privatelinks { float:left; } 205}
208#paging_linksperpage { float:right; padding-right:5px; } 206
209#paging_current { display:inline; color:#fff; padding:0 20 0 20; } 207.linksperpage input {
210#paging_older { margin-right:15px; } 208 padding: 0;
211#paging_newer { margin-left:15px; } 209}
212 210
213#headerform { color:#ffffff; padding:5px 5px 5px 5px; clear: both;} 211.searchform #searchform_value {
214#toolsdiv { color:#ffffff; padding:5px 5px 5px 5px; clear:left; } 212 width: 30%;
215#uploaddiv { color:#ffffff; padding:5px 5px 5px 5px; clear:left; } 213}
216#editlinkform { height:100%;color:#ffffff; padding:5px 5px 5px 15px; width:80%; clear:left; } 214
215.tagfilter {
216 margin-left:24px;
217}
218
219.tagfilter #tagfilter_value {
220 width: 10%;
221}
222
223.tagfilter input.bigbutton, .searchform input.bigbutton, .addform input.bigbutton {
224 background-color: #dedede;
225 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dedede), to(#ffffff));
226 background: -webkit-linear-gradient(#dedede, #ffffff);
227 background: -moz-linear-gradient(#dedede, #ffffff);
228 background: -ms-linear-gradient(#dedede, #ffffff);
229 background: -o-linear-gradient(#dedede, #ffffff);
230 background: linear-gradient(#dedede, #ffffff);
231 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
232 padding: 0 5px 0 5px;
233 margin: 5px 0 5px 0;
234 height: 20px;
235 border-radius: 5px 5px 5px 5px;
236 cursor: pointer;
237}
238
239#shaarli_title {
240 font-weight: bold;
241 font-style: italic;
242 margin-top: 0;
243}
244
245#shaarli_title a {
246 color: #fff !important;
247}
248
249#pageheader a:visited {
250 color: #98C943;
251 text-decoration: none;
252}
253
254#pageheader a:hover {
255 color: #FFFFC9;
256 text-decoration: none;
257}
258
259#pageheader a:active {
260 color: #bbb;
261 text-decoration: none;
262}
263
264#searchcriteria {
265 padding: 4px 0px 5px 5px;
266 font-weight: bold;
267}
268
269.paging {
270 padding: 5px;
271 background-color: #777;
272 color: #ccc;
273 text-align: center;
274 clear: both;
275}
276
277.paging a:link {
278 color: #ccc;
279 text-decoration: none;
280}
281
282.paging a:visited {
283 color: #ccc;
284}
285
286.paging a:hover {
287 color: #FFFFC9;
288}
289
290.paging a:active {
291 color: #fff;
292}
293
294#paging_privatelinks {
295 float: left;
296}
297
298#paging_linksperpage {
299 float: right;
300 padding-right: 5px;
301}
302
303#paging_linksperpage form.linksperpage {
304 display: inline;
305}
306
307#paging_linksperpage form.linksperpage input {
308 height: 15px;
309}
310
311#paging_current {
312 display: inline;
313 color: #fff;
314 padding: 0 20 0 20;
315}
316
317#paging_older {
318 margin-right: 15px;
319}
320
321#paging_newer {
322 margin-left: 15px;
323}
324
325#headerform {
326 color: #ffffff;
327 padding: 5px 5px 5px 5px;
328 clear: both;
329}
330
331#headerform input.linkurl {
332 width: 50%;
333}
334
335#toolsdiv {
336 color: #ffffff;
337 padding: 5px 5px 5px 5px;
338 clear: left;
339}
340
341#uploaddiv {
342 color: #ffffff;
343 padding: 5px 5px 5px 5px;
344 clear: left;
345}
346
347#editlinkform {
348 height: 100%;
349 color: #ffffff;
350 padding: 5px 5px 5px 15px;
351 width: 80%;
352 clear: left;
353}
354
355#editlinkform textarea, #editlinkform .lf_input {
356 width: 100%;
357}
358
217#linklist li { 359#linklist li {
218 padding:4px 10px 15px 20px; border-top: 1px solid #bbb; clear:both; 360 padding: 4px 10px 15px 20px;
361 border-top: 1px solid #bbb;
362 clear: both;
219 background-color: #F2F2F2; 363 background-color: #F2F2F2;
220 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#F2F2F2), to(#ffffff)); 364 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#F2F2F2), to(#ffffff));
221 background: -webkit-linear-gradient(#F2F2F2, #ffffff); 365 background: -webkit-linear-gradient(#F2F2F2, #ffffff);
222 background: -moz-linear-gradient(#F2F2F2, #ffffff); 366 background: -moz-linear-gradient(#F2F2F2, #ffffff);
223 background: -ms-linear-gradient(#F2F2F2, #ffffff); 367 background: -ms-linear-gradient(#F2F2F2, #ffffff);
224 background: -o-linear-gradient(#F2F2F2, #ffffff); 368 background: -o-linear-gradient(#F2F2F2, #ffffff);
225 background: linear-gradient(#F2F2F2, #ffffff); 369 background: linear-gradient(#F2F2F2, #ffffff);
226} 370}
227 371
228/* 372/*
229#linklist li.publicLinkHightLight:hover,#linklist li:hover{ 373#linklist li.publicLinkHightLight:hover, #linklist li:hover {
230 background: #E9FFCE; 374 background: #E9FFCE;
231} 375}
232*/ 376*/
233#linklist li.private { background: url('../images/private.png') no-repeat 10px center; padding-left:60px; }
234#linklist li { padding-left:26px; }
235.private .linktitle a {color:#969696;}
236.linktitle { font-size:14pt; font-weight:bold; }
237.linktitle a { text-decoration: none; color:#80AD48; }
238.linktitle a:hover { color:#F57900; }
239.linkdate, .linkarchive { font-size:8pt; color:#888; }
240.linkdate a, .linkarchive a { color:#E28E3F; }
241.linkdate a {background-image:url('../images/calendar.png');padding:2px 0 3px 20px;background-repeat:no-repeat;text-decoration: none; }
242.linkdate a:hover, .linkarchive a:hover { color: #F57900 }
243.linkurl { font-size:8pt; color:#4BAA74; }
244.linkdescription { color:#000; margin-top:0; margin-bottom:12px; font-weight:normal; max-height:400px; overflow:auto; }
245.linkdescription a { text-decoration: none; color:#3465A4; }
246.linkdescription a:hover { color:#F57900; }
247.linktaglist { padding-top:10px; line-height:200%;}
248.linktag {
249 377
250font-size:9pt; 378.linkdate, .linkarchive {
379 font-size:8pt;
380 color:#888;
381}
382
383.linkdate a, .linkarchive a {
384 color:#E28E3F;
385}
386
387.linkqrcode {
388 display: inline;
389 position: relative;
390}
391
392a.qrcode img {
393 width: 13px;
394 height: 13px;
395}
396
397#linklist li.private {
398 background: url('../images/private.png') no-repeat 10px center;
399 padding-left: 60px;
400}
401
402#linklist li {
403 padding-left: 26px;
404}
405
406.private .linktitle a {
407 color: #969696;
408}
409
410.linktitle {
411 font-size: 14pt;
412 font-weight: bold;
413}
414
415.linktitle a {
416 text-decoration: none;
417 color: #80AD48;
418}
419
420.linktitle a:hover {
421 color: #F57900;
422}
423
424.linkdate, .linkarchive {
425 font-size: 8pt;
426 color: #888;
427}
428
429.linkdate a, .linkarchive a {
430 background-image: url('../images/calendar.png');
431 padding: 2px 0 3px 20px;
432 background-repeat: no-repeat;
433 text-decoration: none;
434 color: #E28E3F;
435}
436
437.linkdate a:hover {
438 color: #F57900 }
439
440.linkurl {
441 font-size: 8pt;
442 color: #4BAA74;
443}
444
445.linkdescription {
446 color: #000;
447 margin-top: 0;
448 margin-bottom: 12px;
449 font-weight: normal;
450 max-height: 400px;
451 overflow: auto;
452}
453
454.linkdescription a {
455 text-decoration: none;
456 color: #3465A4;
457}
458
459.linkdescription a:hover {
460 color: #F57900;
461}
462
463.linktaglist {
464 padding-top: 10px;
465 line-height: 200%;
466}
467
468.linktag {
469 font-size: 9pt;
251 background-color: #F2F2F2; 470 background-color: #F2F2F2;
252 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#F2F2F2), to(#ffffff)); 471 background: -webkit-gradient(linear, 0 0, 0 bottom, from(#F2F2F2), to(#ffffff));
253 background: -webkit-linear-gradient(#F2F2F2, #ffffff); 472 background: -webkit-linear-gradient(#F2F2F2, #ffffff);
254 background: -moz-linear-gradient(#F2F2F2, #ffffff); 473 background: -moz-linear-gradient(#F2F2F2, #ffffff);
255 background: -ms-linear-gradient(#F2F2F2, #ffffff); 474 background: -ms-linear-gradient(#F2F2F2, #ffffff);
256 background: -o-linear-gradient(#F2F2F2, #ffffff); 475 background: -o-linear-gradient(#F2F2F2, #ffffff);
257 background: linear-gradient(#F2F2F2, #ffffff); 476 background: linear-gradient(#F2F2F2, #ffffff);
258 box-shadow: 0 0 2px rgba(0, 0, 0, 0.5); 477 box-shadow: 0 0 2px rgba(0, 0, 0, 0.5);
259 padding:3px 3px 3px 20px; 478 padding: 3px 3px 3px 20px;
260 height:20px; 479 height: 20px;
261 border-radius: 3px 3px 3px 3px; 480 border-radius: 3px 3px 3px 3px;
262 cursor:pointer; 481 cursor: pointer;
263 background-image:url('../images/tag_blue.png'); 482 background-image: url('../images/tag_blue.png');
264 background-repeat:no-repeat; 483 background-repeat: no-repeat;
265 background-position:3px center; 484 background-position: 3px center;
266 background-color:#ffffff; 485 background-color: #ffffff;
267} 486}
268.linktag:hover { border-color: #555573; color:#000; } 487
269.linktag a { color:#777; text-decoration:none; } 488.linktag:hover {
270.linkshort { font-size:8pt; color:#888; } 489 border-color: #555573;
271.linkshort a { text-decoration: none; color:#393964; } 490 color: #000;
272.linkshort a:hover { text-decoration: underline; } 491}
273.buttoneditform { display:inline; } 492
274#footer { font-size:8pt; text-align:center; border-top:1px solid #ddd; color: #888; clear:both; } 493.linktag a {
275#footer a{ color:#486D08;} 494 color: #777;
276#footer a:hover{ color:#000000;} 495 text-decoration: none;
277#newversion { background-color: #FFFFA0; color:#000; position:absolute; top:0;right:0; padding:2 7 2 7; font-size:9pt;} 496}
278#cloudtag { padding-left:10%; padding-right:10%; } 497
279#cloudtag a { color:black; text-decoration:none; } 498.linktag .remove {
280#installform td { font-size: 10pt; color:black; padding:10px 5px 10px 5px; clear:left; } 499 border-left: 1px solid #aaa;
281#changepasswordform { color:#ccc; padding:10px 5px 10px 5px; clear:left; } 500 padding-left: 5px;
282#changetag { color:#ccc; padding:10px 5px 10px 5px; clear:left; } 501 color:#6767A7;
283#configform td { color:#ccc; font-size: 10pt; padding:10px 5px 10px 5px; } 502}
284#configform { color:#ccc; padding:10px 5px 10px 5px; clear:left; } 503
285.thumbnail { float:right; margin-left: 10px; } 504.linkshort {
505 font-size: 8pt;
506 color: #888;
507}
508
509.linkshort a {
510 text-decoration: none;
511 color: #393964;
512}
513
514.linkshort a:hover {
515 text-decoration: underline;
516}
517
518.buttoneditform {
519 display: inline;
520}
521
522#footer {
523 font-size: 8pt;
524 text-align: center;
525 border-top: 1px solid #ddd;
526 color: #888;
527 clear: both;
528}
529
530#footer a {
531 color: #486D08;
532}
533
534#footer a:hover {
535 color: #000000;
536}
537
538#newversion {
539 background-color: #FFFFA0;
540 color: #000;
541 position: absolute;
542 top: 0;
543 right: 0;
544 padding: 2 7 2 7;
545 font-size: 9pt;
546}
547
548#newversion #version_id {
549 text-decoration: blink;
550}
551
552#cloudtag {
553 padding-left: 10%;
554 padding-right: 10%;
555}
556
557#cloudtag .count {
558 color: #99f;
559 font-size: 9pt;
560 padding-left: 5px;
561 padding-right: 2px;
562}
563
564#cloudtag a {
565 font-weight:bold;
566 color: black;
567 text-decoration: none;
568}
569
570#install {
571 margin: 0 20px;
572}
573
574#installform {
575 border: 1px solid black;
576 padding: 10px;
577}
578
579#installform table {
580 border: none;
581}
582
583#installform td {
584 font-size: 10pt;
585 color: black;
586 padding: 10px 5px 10px 5px;
587 clear: left;
588}
589
590#installform input.bigbutton {
591 float: right;
592}
593
594#changepasswordform {
595 color: #ccc;
596 padding: 10px 5px 10px 5px;
597 clear: left;
598}
599
600#changetag {
601 color: #ccc;
602 padding: 10px 5px 10px 5px;
603 clear: left;
604}
605
606#changetag #totag {
607 margin-left: 40px;
608}
609
610#configform td {
611 color: #ccc;
612 font-size: 10pt;
613 padding: 10px 5px 10px 5px;
614}
615
616#configform {
617 color: #ccc;
618 padding: 10px 5px 10px 5px;
619 clear: left;
620}
621
622.thumbnail {
623 float: right;
624 margin-left: 10px;
625}
626
286/* If you want thumbnails on the left: 627/* If you want thumbnails on the left:
287.thumbnail { float:left; margin-right: 10px; } 628.thumbnail {
288.linkcontainer { position: static; margin-left:130px; } 629 float: left;
630 margin-right: 10px;
631}
632.linkcontainer {
633 position: static;
634 margin-left: 130px;
635}
289*/ 636*/
290 637
638/* --- Picture wall CSS --- */
639#picwall_container {
640 color: #fff;
641 background-color: #000;
642 clear: both;
643}
291 644
645.picwall_pictureframe {
646 background-color: #000;
647 z-index: 5;
648 position: relative;
649 display: table-cell;
650 vertical-align: middle;
651 width: 90px;
652 height: 90px;
653 overflow: hidden;
654 text-align: center;
655 float: left;
656}
292 657
658.picwall_pictureframe img {
659 max-width: 100%;
660 height: auto;
661} /* Adapt the width of the image */
293 662
294/* --- Picture wall CSS --- */ 663.picwall_pictureframe a {
295#picwall_container { color:#fff; background-color:#000; clear:both; } 664 text-decoration: none;
296.picwall_pictureframe { background-color:#000; z-index:5; position:relative; display:table-cell; vertical-align:middle;width:90px; height:90px; overflow:hidden; text-align:center; float:left; } 665}
297.picwall_pictureframe img { max-width: 100%;height: auto; } /* Adapt the width of the image */
298.picwall_pictureframe a {text-decoration:none;}
299 666
300/* CSS to show title when hovering an image - no javascript required. */ 667/* CSS to show title when hovering an image - no javascript required. */
301.picwall_pictureframe span.info {display: none;} 668.picwall_pictureframe span.info {
669 display: none;
670}
671
302.picwall_pictureframe:hover span.info { 672.picwall_pictureframe:hover span.info {
303 display:block; 673 display: block;
304 position:absolute; 674 position: absolute;
305 top:0; left:0; width:90px; 675 top: 0;
306 font-weight:bold; 676 left: 0;
307 font-size:8pt; 677 width: 90px;
308 color:#fff; 678 font-weight: bold;
679 font-size: 8pt;
680 color: #fff;
309 text-align: left; 681 text-align: left;
310 background-color: transparent; 682 background-color: transparent;
311 background-color: rgba(0, 0, 0, 0.4); /* FF3+, Saf3+, Opera 10.10+, Chrome, IE9 */ 683 background-color: rgba(0, 0, 0, 0.4);
312 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#66000000,endColorstr=#66000000); /* IE6–IE9 */ 684 /* FF3+, Saf3+, Opera 10.10+, Chrome, IE9 */
313text-shadow:2px 2px 1px #000000; 685 filter: progid: DXImageTransform.Microsoft.gradient(startColorstr=#66000000, endColorstr=#66000000);
686 /* IE6–IE9 */
687 text-shadow: 2px 2px 1px #000000;
314} 688}
315 689
316/* Minimal customisation for jQuery widgets */ 690/* Minimal customisation for jQuery widgets */
317.ui-autocomplete { background-color:#fff; padding-left:5px;} 691.ui-autocomplete {
318.ui-state-hover { background-color: #604dff; color:#fff; } 692 background-color: #fff;
693 padding-left: 5px;
694}
695
696.ui-state-hover {
697 background-color: #604dff;
698 color: #fff;
699}
319 700
320#linklist li.publicLinkHightLight{ 701#linklist li.publicLinkHightLight {
321 background: #ffffff; 702 background: #ffffff;
322} 703}
323 704
324div#permalinkQrcode { 705div#permalinkQrcode {
325padding:20px; 706 padding: 20px;
326width:220px; 707 width: 220px;
327height:220px; 708 height: 220px;
328background-color: #ffffff; 709 background-color: #ffffff;
329border: 1px solid black; 710 border: 1px solid black;
330position: absolute; 711 position: absolute;
331top:-100px; 712 top: -100px;
332left:-100px; 713 left: -100px;
333text-align:center; 714 text-align: center;
334font-size: 8pt; 715 font-size: 8pt;
335z-index:50; 716 z-index: 50;
336-webkit-box-shadow:2px 2px 20px 2px #333333; 717 -webkit-box-shadow: 2px 2px 20px 2px #333333;
337-moz-box-shadow:2px 2px 20px 2px #333333; 718 -moz-box-shadow: 2px 2px 20px 2px #333333;
338-o-box-shadow:2px 2px 20px 2px #333333; 719 -o-box-shadow: 2px 2px 20px 2px #333333;
339-ms-box-shadow:2px 2px 20px 2px #333333; 720 -ms-box-shadow: 2px 2px 20px 2px #333333;
340box-shadow:2px 2px 20px 2px #333333; 721 box-shadow: 2px 2px 20px 2px #333333;
341} 722}
342 723
343div.daily 724div.daily {
344{
345 font-family: Georgia, 'DejaVu Serif', Norasi, serif; 725 font-family: Georgia, 'DejaVu Serif', Norasi, serif;
346 background-color: #E6D6BE; 726 background-color: #E6D6BE;
347 /* Background paper texture by BashCorpo: 727 /* Background paper texture by BashCorpo:
@@ -352,123 +732,301 @@ div.daily
352 -moz-background-size: cover; 732 -moz-background-size: cover;
353 -o-background-size: cover; 733 -o-background-size: cover;
354 background-size: cover; 734 background-size: cover;
355 position:relative; 735 position: relative;
356 border-bottom: 2px solid black; 736 border-bottom: 2px solid black;
357} 737}
358 738
359#daily_col1 { float:left;position:relative; width:33%; padding-left:1%; } 739#daily_col1 {
360#daily_col2 { float:left;position:relative; width:33%; } 740 float: left;
361#daily_col3 { float:left;position:relative; width:33%;} 741 position: relative;
742 width: 33%;
743 padding-left: 1%;
744}
745
746#daily_col2 {
747 float: left;
748 position: relative;
749 width: 33%;
750}
751
752#daily_col3 {
753 float: left;
754 position: relative;
755 width: 33%;
756}
362 757
363div.dailyAbout 758div.dailyAbout {
364{ 759 float: left;
365 float:left;
366 border: 1px solid black; 760 border: 1px solid black;
367 font-size: 8pt; 761 font-size: 8pt;
368 position:absolute; 762 position: absolute;
369 left:10px; 763 left: 10px;
370 top: 15px; 764 top: 15px;
371 padding: 5px 5px 5px 5px; 765 padding: 5px 5px 5px 5px;
372 text-align:center; 766 text-align: center;
767}
768
769div.dailyAbout a {
770 color: #890500;
771}
772
773div.dailyAbout img {
774 position: relative;
775 top: 3px;
776 margin-right: 4px;
777 width: 14px;
778 height: 14px;
373} 779}
374div.dailyAbout a { color: #890500; } 780
375div.dailyTitle 781div.dailyTitle {
376 { 782 font-weight: bold;
377 font-weight: bold; 783 font-size: 44pt;
378 font-size: 44pt; 784 text-align: center;
379 text-align:center; 785 padding: 10px 20px 0px 20px;
380 padding:10px 20px 0px 20px;
381} 786}
382div.dailyDate 787
383 { 788div.dailyDate {
384 font-size: 12pt; 789 font-size: 12pt;
385 font-weight:bold; 790 font-weight: bold;
386 text-align:center; 791 text-align: center;
387 padding:0px 20px 30px 20px; 792 padding: 0px 20px 30px 20px;
388} 793}
389 794
390/* Individual entries in "Daily": */ 795/* Individual entries in "Daily": */
391div.dailyEntry 796div.dailyEntry {
392{
393 margin: 5px 10px 2px 5px; 797 margin: 5px 10px 2px 5px;
394 font-size: 11pt; 798 font-size: 11pt;
395 border-top: 1px solid #555; 799 border-top: 1px solid #555;
396} 800}
397div.dailyEntry a { text-decoration:none; color: #890500; } 801
398div.dailyEntryTags { font-size:7.75pt; } 802div.dailyEntry a {
399div.dailyEntryTitle { font-size:18pt; font-weight:bold;} 803 text-decoration: none;
400div.dailyEntryThumbnail 804 color: #890500;
401{ 805}
402 width:100%; 806
403 text-align:center; 807div.dailyEntryTags {
404 background-color:rgb(128,128,128); 808 font-size: 7.75pt;
405 background:url(../images/50pc_transparent.png); 809}
406 padding:4px 0px 2px 0px; 810
407} 811div.dailyEntryTitle {
408div.dailyEntryDescription 812 font-size: 18pt;
409{ 813 font-weight: bold;
814}
815
816div.dailyEntryThumbnail {
817 width: 100%;
818 text-align: center;
819 background-color: rgb(128, 128, 128);
820 background: url(../images/50pc_transparent.png);
821 padding: 4px 0px 2px 0px;
822}
823
824div.dailyEntryDescription {
410 margin-top: 10px; 825 margin-top: 10px;
411 margin-bottom: 30px; 826 margin-bottom: 30px;
412 text-align:justify; 827 text-align: justify;
413 overflow:auto; 828 overflow: auto;
829}
830
831div.dailyNoEntry {
832 text-align: center;
833 padding: 40px 0px 90px 0px;
834}
835
836.daily #closing {
837 clear: both;
838 text-align: center;
839 padding-bottom: 20px;
414} 840}
415 841
416/* Common CSS screwdriver */ 842/* Common CSS screwdriver */
417.clear{ 843.clear {
418 clear:both; 844 clear: both;
419} 845}
420 846
421/* For lazy images loading in picture wall. 847/* For lazy images loading in picture wall.
422 Using http://www.appelsiini.net/projects/lazyload 848 Using http://www.appelsiini.net/projects/lazyload
423 */ 849*/
424.lazyimage { display:none; } 850.lazyimage {
851 display: none;
852}
425 853
426@media print { 854@media print {
427html {border:none;background:#fff!important;color:#000!important;} 855 html {
428body {font-size:12pt;width:auto!important;margin:auto!important;} 856 border: none;
429p {orphans:3; /*pas de ligne seule en bas */widows:3;/*pas de ligne seule en haut*/} 857 background: #fff !important;
430a {color:#000!important;text-decoration:none!important;} 858 color: #000 !important;
431#pageheader, .paging, #linklist li form, #footer {display:none;} 859 }
432#linklist li { padding:2 0 10 0; border-top: 2px solid #000; clear:both; } 860
433#linklist li.private { background-color: none; border-left:0; } 861 body {
434.linkdate { line-height:2; } 862 font-size: 12pt;
435.linkurl { color:#000; } 863 width: auto !important;
436.linkdescription { font-size:10pt;} 864 margin: auto !important;
437.linktag { border: 1px solid black; font-style:italic; font-size:8pt;} 865 }
438 866
439} 867 /* Minimum numer of lines to display when splitting a paragraph
440 868 over two pages */
441 869 p {
442@media handheld, only screen and (max-width: 480px), only screen and (max-device-width: 854px) 870 orphans: 3;
443{ 871 widows: 3;
444/* A few fixes for mobile devices (far from perfect). */ 872 }
445.nomobile { display:none; } 873
446#logo { display:none; } 874 a {
447#pageheader a 875 color: #000 !important;
448{ 876 text-decoration: none !important;
449 padding:5px; 877 }
878
879 #pageheader, .paging, #linklist li form, #footer {
880 display: none;
881 }
882
883 #linklist li {
884 padding: 2 0 10 0;
885 border-top: 2px solid #000;
886 clear: both;
887 }
888
889 #linklist li.private {
890 background-color: none;
891 border-left: 0;
892 }
893
894 .linkdate {
895 line-height: 2;
896 }
897
898 .linkurl {
899 color: #000;
900 }
901
902 .linkdescription {
903 font-size: 10pt;
904 }
905
906 .linktag {
907 border: 1px solid black;
908 font-style: italic;
909 font-size: 8pt;
910 }
911}
912
913@media handheld, only screen and (max-width: 480px), only screen and (max-device-width: 854px) {
914 /* A few fixes for mobile devices (far from perfect). */
915 .nomobile {
916 display: none;
917 }
918
919 #logo {
920 display: none;
921 }
922
923 #pageheader a {
924 padding: 5px;
925 border-radius: 5px 5px 5px 5px;
926 margin: 3px;
927 }
928
929 .searchform, .tagfilter {
930 display: block !important;
931 margin: 0px !important;
932 padding: 0px !important;
933 width: 100% !important;
934 }
935
936 .searchform input, .tagfilter input {
937 margin: 0px !important;
938 padding: 0px !important;
939 display: inline !important;
940 }
941
942 .tagfilter input.bigbutton, .searchform input.bigbutton, .addform input.bigbutton {
943 width: 30%;
944 font-size: smaller;
945 }
946
947 #searchform_value {
948 width: 70% !important;
949 }
950
951 #tagfilter_value {
952 width: 70% !important;
953 }
954
955 div.qrcode {
956 position: relative;
957 float: left;
958 top: -10px;
959 left: 0px;
960 }
961
962 #paging_privatelinks {
963 float: none;
964 }
965
966 #paging_linksperpage {
967 float: none;
968 margin-bottom: 10px;
969 font-size: smaller;
970 }
971
972 #paging_older, #paging_newer, #paging_linksperpage a {
973 border: 1px solid black;
974 padding: 3px 5px 3px 5px;
975 background-color: #666;
976 color: #fff;
450 border-radius: 5px 5px 5px 5px; 977 border-radius: 5px 5px 5px 5px;
451 margin:3px; 978 }
452}
453.searchform,.tagfilter { display:block !important; margin:0px !important; padding:0px !important; width:100% !important; }
454.searchform input,.tagfilter input { margin:0px !important; padding:0px !important; display:inline !important; }
455.tagfilter input.bigbutton,.searchform input.bigbutton,.addform input.bigbutton{ width:30%; font-size:smaller;}
456#searchform_value { width:70% !important; }
457#tagfilter_value { width:70% !important; }
458div.qrcode { position:relative; float:left; top:-10px; left:0px; }
459#paging_privatelinks { float:none; }
460#paging_linksperpage { float:none; margin-bottom:10px; font-size:smaller;}
461#paging_older,#paging_newer,#paging_linksperpage a { border: 1px solid black; padding:3px 5px 3px 5px; background-color:#666; color:#fff; border-radius: 5px 5px 5px 5px;}
462.thumbnail { float:none; height:auto; margin: 0px; text-align:center;}
463#cloudtag { padding:0px; }
464div.dailyAbout { float:none; position:relative; width:100%; clear:both; padding:0px; top:0px; left:0px; }
465#daily_col1,#daily_col2,#daily_col3 { float:none; width:100%; padding:0px;}
466div.dailyTitle { font-size: 18pt; margin-top:5px; padding:0px;}
467div.dailyDate { font-size: 11pt;padding:0px; display:block; }
468div.dailyEntryTitle { font-size:16pt; font-weight:bold;}
469div.dailyEntryDescription { font-size:10pt; }
470 979
980 .thumbnail {
981 float: none;
982 height: auto;
983 margin: 0px;
984 text-align: center;
985 }
986
987 #cloudtag {
988 padding: 0px;
989 }
990
991 div.dailyAbout {
992 float: none;
993 position: relative;
994 width: 100%;
995 clear: both;
996 padding: 0px;
997 top: 0px;
998 left: 0px;
999 }
1000
1001 #daily_col1, #daily_col2, #daily_col3 {
1002 float: none;
1003 width: 100%;
1004 padding: 0px;
1005 }
1006
1007 div.dailyTitle {
1008 font-size: 18pt;
1009 margin-top: 5px;
1010 padding: 0px;
1011 }
1012
1013 div.dailyDate {
1014 font-size: 11pt;
1015 padding: 0px;
1016 display: block;
1017 }
1018
1019 div.dailyEntryTitle {
1020 font-size: 16pt;
1021 font-weight: bold;
1022 }
1023
1024 div.dailyEntryDescription {
1025 font-size: 10pt;
1026 }
471} 1027}
472 1028
473/* Highlight search results */ 1029/* Highlight search results */
474.highlight { background-color: #FFFF33; } 1030.highlight {
1031 background-color: #FFFF33;
1032}
diff --git a/index.php b/index.php
index e2c68869..1a924867 100644
--- a/index.php
+++ b/index.php
@@ -89,7 +89,7 @@ header("Cache-Control: post-check=0, pre-check=0", false);
89header("Pragma: no-cache"); 89header("Pragma: no-cache");
90 90
91// Directories creations (Note that your web host may require different rights than 705.) 91// Directories creations (Note that your web host may require different rights than 705.)
92if (!is_writable(realpath(dirname(__FILE__)))) die('<pre>ERROR: Shaarli does not have the right to write in its own directory ('.realpath(dirname(__FILE__)).').</pre>'); 92if (!is_writable(realpath(dirname(__FILE__)))) die('<pre>ERROR: Shaarli does not have the right to write in its own directory.</pre>');
93 93
94// Handling of old config file which do not have the new parameters. 94// Handling of old config file which do not have the new parameters.
95if (empty($GLOBALS['title'])) $GLOBALS['title']='Shared links on '.htmlspecialchars(indexUrl()); 95if (empty($GLOBALS['title'])) $GLOBALS['title']='Shared links on '.htmlspecialchars(indexUrl());
@@ -118,7 +118,7 @@ function checkphpversion()
118 if (version_compare(PHP_VERSION, '5.1.0') < 0) 118 if (version_compare(PHP_VERSION, '5.1.0') < 0)
119 { 119 {
120 header('Content-Type: text/plain; charset=utf-8'); 120 header('Content-Type: text/plain; charset=utf-8');
121 echo 'Your server supports PHP '.PHP_VERSION.'. Shaarli requires at least php 5.1.0, and thus cannot run. Sorry.'; 121 echo 'Your PHP version is obsolete! Shaarli requires at least php 5.1.0, and thus cannot run. Sorry. Your PHP version has known security vulnerabilities and should be updated as soon as possible.';
122 exit; 122 exit;
123 } 123 }
124} 124}
@@ -1177,10 +1177,7 @@ function showDaily()
1177 $PAGE = new pageBuilder; 1177 $PAGE = new pageBuilder;
1178 $PAGE->assign('linksToDisplay',$linksToDisplay); 1178 $PAGE->assign('linksToDisplay',$linksToDisplay);
1179 $PAGE->assign('linkcount',count($LINKSDB)); 1179 $PAGE->assign('linkcount',count($LINKSDB));
1180 $PAGE->assign('col1',$columns[0]); 1180 $PAGE->assign('cols', $columns);
1181 $PAGE->assign('col1',$columns[0]);
1182 $PAGE->assign('col2',$columns[1]);
1183 $PAGE->assign('col3',$columns[2]);
1184 $PAGE->assign('day',utf8_encode(strftime('%A %d, %B %Y',linkdate2timestamp($day.'_000000')))); 1181 $PAGE->assign('day',utf8_encode(strftime('%A %d, %B %Y',linkdate2timestamp($day.'_000000'))));
1185 $PAGE->assign('previousday',$previousday); 1182 $PAGE->assign('previousday',$previousday);
1186 $PAGE->assign('nextday',$nextday); 1183 $PAGE->assign('nextday',$nextday);
@@ -2171,13 +2168,13 @@ function templateTZform($ptz=false)
2171 $continent=substr($tz,0,$spos); $city=substr($tz,$spos+1); 2168 $continent=substr($tz,0,$spos); $city=substr($tz,$spos+1);
2172 $continents[$continent]=1; 2169 $continents[$continent]=1;
2173 if (!isset($cities[$continent])) $cities[$continent]=''; 2170 if (!isset($cities[$continent])) $cities[$continent]='';
2174 $cities[$continent].='<option value="'.$city.'"'.($pcity==$city?'selected':'').'>'.$city.'</option>'; 2171 $cities[$continent].='<option value="'.$city.'"'.($pcity==$city?' selected':'').'>'.$city.'</option>';
2175 } 2172 }
2176 } 2173 }
2177 $continents_html = ''; 2174 $continents_html = '';
2178 $continents = array_keys($continents); 2175 $continents = array_keys($continents);
2179 foreach($continents as $continent) 2176 foreach($continents as $continent)
2180 $continents_html.='<option value="'.$continent.'"'.($pcontinent==$continent?'selected':'').'>'.$continent.'</option>'; 2177 $continents_html.='<option value="'.$continent.'"'.($pcontinent==$continent?' selected':'').'>'.$continent.'</option>';
2181 $cities_html = $cities[$pcontinent]; 2178 $cities_html = $cities[$pcontinent];
2182 $timezone_form = "Continent: <select name=\"continent\" id=\"continent\" onChange=\"onChangecontinent();\">${continents_html}</select>"; 2179 $timezone_form = "Continent: <select name=\"continent\" id=\"continent\" onChange=\"onChangecontinent();\">${continents_html}</select>";
2183 $timezone_form .= "&nbsp;&nbsp;&nbsp;&nbsp;City: <select name=\"city\" id=\"city\">${cities[$pcontinent]}</select><br />"; 2180 $timezone_form .= "&nbsp;&nbsp;&nbsp;&nbsp;City: <select name=\"city\" id=\"city\">${cities[$pcontinent]}</select><br />";
diff --git a/tpl/addlink.html b/tpl/addlink.html
index 853715dc..da50f45e 100644
--- a/tpl/addlink.html
+++ b/tpl/addlink.html
@@ -6,11 +6,11 @@
6 {include="page.header"} 6 {include="page.header"}
7 <div id="headerform"> 7 <div id="headerform">
8 <form method="GET" action="" name="addform" class="addform"> 8 <form method="GET" action="" name="addform" class="addform">
9 <input type="text" name="post" style="width:50%;"> 9 <input type="text" name="post" class="linkurl">
10 <input type="submit" value="Add link" class="bigbutton"> 10 <input type="submit" value="Add link" class="bigbutton">
11 </form> 11 </form>
12 </div> 12 </div>
13</div> 13</div>
14{include="page.footer"} 14{include="page.footer"}
15</body> 15</body>
16</html> \ No newline at end of file 16</html>
diff --git a/tpl/changetag.html b/tpl/changetag.html
index b22bddea..79fea9a9 100644
--- a/tpl/changetag.html
+++ b/tpl/changetag.html
@@ -9,7 +9,8 @@
9 <form method="POST" action="" name="changetag" id="changetag"> 9 <form method="POST" action="" name="changetag" id="changetag">
10 <input type="hidden" name="token" value="{$token}"> 10 <input type="hidden" name="token" value="{$token}">
11 Tag: <input type="text" name="fromtag" id="fromtag"> 11 Tag: <input type="text" name="fromtag" id="fromtag">
12 <input type="text" name="totag" style="margin-left:40px;"><input type="submit" name="renametag" value="Rename tag" class="bigbutton"> 12 <input type="text" name="totag" id="totag">
13 <input type="submit" name="renametag" value="Rename tag" class="bigbutton">
13 &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>
14<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 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</div> 16</div>
@@ -23,4 +24,4 @@ $(document).ready(function()
23</script> 24</script>
24{/if} 25{/if}
25</body> 26</body>
26</html> \ No newline at end of file 27</html>
diff --git a/tpl/daily.html b/tpl/daily.html
index 4bc8568b..b92425b5 100644
--- a/tpl/daily.html
+++ b/tpl/daily.html
@@ -7,57 +7,51 @@
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&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&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#" width="14" height="14" style="position:relative;top:3px; margin-right:4px;">Daily RSS Feed</a> 13 <a href="?do=dailyrss" title="1 RSS entry per day"><img src="images/feed-icon-14x14.png#">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"> The Daily Shaarli <img src="../images/floral_right.png" width="51" height="50" class="nomobile"></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">&#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>
17 <div style="clear:both;"></div> 17 <div class="clear"></div>
18
19 {if="$linksToDisplay"}
20 <div id="daily_col1">
21 {loop="col1"}
22 <div class="dailyEntry">
23 <div style="float:right;position:relative;top:-1px;"><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 style="float:right;position:relative;top:-1px;"><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="$link.tags"}
45 {loop="col3"} 32 <div class="dailyEntryTags">
46 <div class="dailyEntry"> 33 {loop="link.taglist"}
47 <div style="float:right;position:relative;top:-1px;"><a href="?{$value.linkdate|smallHash}"><img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink"></a></div> 34 {$value|htmlspecialchars} -
48 {if="$value.tags"}<div class="dailyEntryTags">{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}</div>{/if} 35 {/loop}
49 <div class="dailyEntryTitle"><a href="{$value.url}">{$value.title|htmlspecialchars}</a></div> 36 </div>
50 {if="$value.thumbnail"}<div class="dailyEntryThumbnail">{$value.thumbnail}</div>{/if} 37 {/if}
51 <div class="dailyEntryDescription">{$value.formatedDescription}</div> 38 <div class="dailyEntryTitle">
52 </div> 39 <a href="{$link.url}">{$link.title|htmlspecialchars}</a>
40 </div>
41 {if="$link.thumbnail"}
42 <div class="dailyEntryThumbnail">{$link.thumbnail}</div>
43 {/if}
44 <div class="dailyEntryDescription">{$link.formatedDescription}</div>
45 </div>
46 {/loop}
47 </div>
48 {/if}
53 {/loop} 49 {/loop}
54 </div>
55 {else} 50 {else}
56 <div style="text-align:center; padding:40px 0px 90px 0px;">No articles on this day.</div> 51 <div class="dailyNoEntry">No articles on this day.</div>
57 {/if} 52 {/if}
58 <div style="clear:both;"></div> 53 <div id="closing"><img src="../images/squiggle_closing.png" width="66" height="61" alt="-"></div>
59 <div style="text-align:center; padding-bottom:20px;"><img src="../images/squiggle_closing.png" width="66" height="61" alt="-"></div>
60</div> 54</div>
61{include="page.footer"} 55{include="page.footer"}
62</body> 56</body>
63</html> \ No newline at end of file 57</html>
diff --git a/tpl/editlink.html b/tpl/editlink.html
index 48945a30..454dfff4 100644
--- a/tpl/editlink.html
+++ b/tpl/editlink.html
@@ -12,10 +12,10 @@
12 <div id="editlinkform"> 12 <div id="editlinkform">
13 <form method="post" name="linkform"> 13 <form method="post" name="linkform">
14 <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> 14 <input type="hidden" name="lf_linkdate" value="{$link.linkdate}">
15 <i>URL</i><br><input type="text" name="lf_url" value="{$link.url|htmlspecialchars}" style="width:100%"><br> 15 <i>URL</i><br><input type="text" name="lf_url" value="{$link.url|htmlspecialchars}" class="lf_input"><br>
16 <i>Title</i><br><input type="text" name="lf_title" value="{$link.title|htmlspecialchars}" style="width:100%"><br> 16 <i>Title</i><br><input type="text" name="lf_title" value="{$link.title|htmlspecialchars}" class="lf_input"><br>
17 <i>Description</i><br><textarea name="lf_description" rows="4" cols="25" style="width:100%">{$link.description|htmlspecialchars}</textarea><br> 17 <i>Description</i><br><textarea name="lf_description" rows="4" cols="25">{$link.description|htmlspecialchars}</textarea><br>
18 <i>Tags</i><br><input type="text" id="lf_tags" name="lf_tags" value="{$link.tags|htmlspecialchars}" style="width:100%"><br> 18 <i>Tags</i><br><input type="text" id="lf_tags" name="lf_tags" value="{$link.tags|htmlspecialchars}" class="lf_input"><br>
19 {if="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"} 19 {if="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"}
20 <input type="checkbox" checked="checked" name="lf_private" id="lf_private"> 20 <input type="checkbox" checked="checked" name="lf_private" id="lf_private">
21 &nbsp;<label for="lf_private"><i>Private</i></label><br> 21 &nbsp;<label for="lf_private"><i>Private</i></label><br>
@@ -23,9 +23,9 @@
23 <input type="checkbox" name="lf_private" id="lf_private"> 23 <input type="checkbox" name="lf_private" id="lf_private">
24 &nbsp;<label for="lf_private"><i>Private</i></label><br> 24 &nbsp;<label for="lf_private"><i>Private</i></label><br>
25 {/if} 25 {/if}
26 <input type="submit" value="Save" name="save_edit" class="bigbutton" style="margin-left:40px;"> 26 <input type="submit" value="Save" name="save_edit" class="bigbutton">
27 <input type="submit" value="Cancel" name="cancel_edit" class="bigbutton" style="margin-left:40px;"> 27 <input type="submit" value="Cancel" name="cancel_edit" class="bigbutton">
28 {if="!$link_is_new"}<input type="submit" value="Delete" name="delete_link" class="bigbutton" style="margin-left:180px;" onClick="return confirmDeleteLink();">{/if} 28 {if="!$link_is_new"}<input type="submit" value="Delete" name="delete_link" class="bigbutton delete" onClick="return confirmDeleteLink();">{/if}
29 <input type="hidden" name="token" value="{$token}"> 29 <input type="hidden" name="token" value="{$token}">
30 {if="$http_referer"}<input type="hidden" name="returnurl" value="{$http_referer|htmlspecialchars}">{/if} 30 {if="$http_referer"}<input type="hidden" name="returnurl" value="{$http_referer|htmlspecialchars}">{/if}
31 </form> 31 </form>
diff --git a/tpl/export.html b/tpl/export.html
index 938cbe64..911b02c1 100644
--- a/tpl/export.html
+++ b/tpl/export.html
@@ -7,9 +7,10 @@
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&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&what=public"><b>Export public</b> <span>: Export public links only</a><br><br>
10 <a href="?do=export&what=private"><b>Export private</b> <span>: Export private links only</a><br><br style="clear:both;"> 10 <a href="?do=export&what=private"><b>Export private</b> <span>: Export private links only</a>
11 <div class="clear"></div>
11 </div> 12 </div>
12</div> 13</div>
13{include="page.footer"} 14{include="page.footer"}
14</body> 15</body>
15</html> \ No newline at end of file 16</html>
diff --git a/tpl/install.html b/tpl/install.html
index 4034ef1b..32b8811b 100644
--- a/tpl/install.html
+++ b/tpl/install.html
@@ -2,20 +2,19 @@
2<html> 2<html>
3<head>{include="includes"}{$timezone_js}</head> 3<head>{include="includes"}{$timezone_js}</head>
4<body onload="document.installform.setlogin.focus();"> 4<body onload="document.installform.setlogin.focus();">
5<div style="margin-left:20px;"> 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<div style="color:white !important;"> 8<form method="POST" action="" name="installform" id="installform">
9<form method="POST" action="" name="installform" id="installform" style="border:1px solid black; padding:10 10 10 10;"> 9<table>
10<table border="0" cellpadding="20">
11<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>
12<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>
13{$timezone_html} 12{$timezone_html}
14<tr><td><b>Page title:</b></td><td><input type="text" name="title" size="30"></td></tr> 13<tr><td><b>Page title:</b></td><td><input type="text" name="title" size="30"></td></tr>
15<tr><td></td><td align="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr> 14<tr><td colspan="2"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr>
16</table> 15</table>
17</form> 16</form>
18</div> 17</div>
19{include="page.footer"} 18{include="page.footer"}
20</body> 19</body>
21</html> \ No newline at end of file 20</html>
diff --git a/tpl/linklist.html b/tpl/linklist.html
index d33fc3c3..eadbc4cd 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -4,9 +4,9 @@
4<body> 4<body>
5<div id="pageheader"> 5<div id="pageheader">
6 {include="page.header"} 6 {include="page.header"}
7 <div id="headerform" style="width:100%; white-space:nowrap;"> 7 <div id="headerform" class="search">
8 <form method="GET" class="searchform" name="searchform" style="display:inline;"><input type="text" id="searchform_value" name="searchterm" style="width:30%" value=""> <input type="submit" value="Search" class="bigbutton"></form> 8 <form method="GET" class="searchform" name="searchform"><input type="text" id="searchform_value" name="searchterm" value=""> <input type="submit" value="Search" class="bigbutton"></form>
9 <form method="GET" class="tagfilter" name="tagfilter" style="display:inline;margin-left:24px;"><input type="text" name="searchtags" id="tagfilter_value" style="width:10%" value=""> <input type="submit" value="Filter by tag" class="bigbutton"></form> 9 <form method="GET" class="tagfilter" name="tagfilter"><input type="text" name="searchtags" id="tagfilter_value" value=""> <input type="submit" value="Filter by tag" class="bigbutton"></form>
10 </div> 10 </div>
11</div> 11</div>
12 12
@@ -23,7 +23,7 @@
23 {if="$search_type=='tags'"} 23 {if="$search_type=='tags'"}
24 <div id="searchcriteria">{$result_count} results for tags <i> 24 <div id="searchcriteria">{$result_count} results for tags <i>
25 {loop="search_crits"} 25 {loop="search_crits"}
26 <span class="linktag" title="Remove tag"><a href="?removetag={$value|htmlspecialchars}">{$value|htmlspecialchars} <span style="border-left:1px solid #aaa; padding-left:5px; color:#6767A7;">x</span></a></span> 26 <span class="linktag" title="Remove tag"><a href="?removetag={$value|htmlspecialchars}">{$value|htmlspecialchars} <span class="remove">x</span></a></span>
27 {/loop}</i></div> 27 {/loop}</i></div>
28 {/if} 28 {/if}
29 {/if} 29 {/if}
@@ -42,7 +42,7 @@
42 {/if} 42 {/if}
43 <span class="linktitle"><a href="{$redirector}{$value.url|htmlspecialchars}">{$value.title|htmlspecialchars}</a></span> 43 <span class="linktitle"><a href="{$redirector}{$value.url|htmlspecialchars}">{$value.title|htmlspecialchars}</a></span>
44 <br> 44 <br>
45 {if="$value.description"}<div class="linkdescription"{if="$search_type=='permalink'"} style="max-height:none !important;"{/if}>{$value.description}</div>{/if} 45 {if="$value.description"}<div class="linkdescription">{$value.description}</div>{/if}
46 {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"} 46 {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
47 <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{$value.localdate|htmlspecialchars} - permalink</a> - </span> 47 <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{$value.localdate|htmlspecialchars} - permalink</a> - </span>
48 {else} 48 {else}
@@ -51,8 +51,8 @@
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 style="position:relative;display:inline;"><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&s=8&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#" width="13" height="13" title="QR-Code"></a></div> - 55 onclick="showQrCode(this); return false;" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}"><img src="images/qrcode.png#" title="QR-Code"></a></div> -
56 <a href={$value.url|htmlspecialchars}><span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span></a><br> 56 <a href={$value.url|htmlspecialchars}><span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span></a><br>
57 {if="$value.tags"} 57 {if="$value.tags"}
58 <div class="linktaglist"> 58 <div class="linktaglist">
diff --git a/tpl/linklist.paging.html b/tpl/linklist.paging.html
index b0c119d9..c2b98971 100644
--- a/tpl/linklist.paging.html
+++ b/tpl/linklist.paging.html
@@ -12,9 +12,9 @@
12{/if} 12{/if}
13 <div id="paging_linksperpage"> 13 <div id="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" style="display:inline;" class="linksperpage"><input type="text" name="linksperpage" size="2" style="height:15px;"></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}" id="paging_older">&#x25C4;Older</a> {/if}
18 <div id="paging_current">page {$page_current} / {$page_max} </div> 18 <div id="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}" id="paging_newer">Newer&#x25BA;</a> {/if}
20</div> \ No newline at end of file 20</div>
diff --git a/tpl/loginform.html b/tpl/loginform.html
index 805a0148..954f6f1f 100644
--- a/tpl/loginform.html
+++ b/tpl/loginform.html
@@ -13,7 +13,7 @@
13 Login: <input type="text" name="login" tabindex="1">&nbsp;&nbsp;&nbsp; 13 Login: <input type="text" name="login" tabindex="1">&nbsp;&nbsp;&nbsp;
14 Password : <input type="password" name="password" tabindex="2"> 14 Password : <input type="password" name="password" tabindex="2">
15 <input type="submit" value="Login" class="bigbutton" tabindex="4"><br> 15 <input type="submit" value="Login" class="bigbutton" tabindex="4"><br>
16 <input style="margin:10 0 0 40;" type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3"><label for="longlastingsession">&nbsp;Stay signed in (Do not check on public computers)</label> 16 <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3"><label for="longlastingsession">&nbsp;Stay signed in (Do not check on public computers)</label>
17 <input type="hidden" name="token" value="{$token}"> 17 <input type="hidden" name="token" value="{$token}">
18 {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl|htmlspecialchars}">{/if} 18 {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl|htmlspecialchars}">{/if}
19 </form> 19 </form>
@@ -23,4 +23,4 @@
23 23
24{include="page.footer"} 24{include="page.footer"}
25</body> 25</body>
26</html> \ No newline at end of file 26</html>
diff --git a/tpl/page.footer.html b/tpl/page.footer.html
index 8e5869c5..b494bf7d 100644
--- a/tpl/page.footer.html
+++ b/tpl/page.footer.html
@@ -2,7 +2,7 @@
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>. 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 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 language="JavaScript">function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script>
diff --git a/tpl/page.header.html b/tpl/page.header.html
index 654a551d..17c0c75c 100644
--- a/tpl/page.header.html
+++ b/tpl/page.header.html
@@ -1,6 +1,6 @@
1 1
2 <div id="logo" title="Share your links !" onclick="document.location='?';"></div> 2 <div id="logo" title="Share your links !" onclick="document.location='?';"></div>
3 <div style="float:right; font-style:italic; color:#bbb; text-align:right; padding:0 5 0 0;" class="nomobile">Shaare your links...<br> 3 <div id="linkcount" class="nomobile">Shaare your links...<br>
4 {if="!empty($linkcount)"}{$linkcount} links{/if}</div> 4 {if="!empty($linkcount)"}{$linkcount} links{/if}</div>
5 <span id="shaarli_title"><a href="{$titleLink}">{$shaarlititle|htmlspecialchars}</a></span> 5 <span id="shaarli_title"><a href="{$titleLink}">{$shaarlititle|htmlspecialchars}</a></span>
6 6
@@ -17,7 +17,7 @@
17 {/if} 17 {/if}
18 <a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a> 18 <a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a>
19 {if="$GLOBALS['config']['SHOW_ATOM']"} 19 {if="$GLOBALS['config']['SHOW_ATOM']"}
20 <a href="{$feedurl}?do=atom{$searchcrits}" style="padding-left:10px;" class="nomobile">ATOM Feed</a> 20 <a href="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a>
21 {/if} 21 {/if}
22 <a href="?do=tagcloud">Tag cloud</a> 22 <a href="?do=tagcloud">Tag cloud</a>
23 <a href="?do=picwall{$searchcrits}">Picture wall</a> 23 <a href="?do=picwall{$searchcrits}">Picture wall</a>
diff --git a/tpl/tagcloud.html b/tpl/tagcloud.html
index 0dd2c0d3..9418e248 100644
--- a/tpl/tagcloud.html
+++ b/tpl/tagcloud.html
@@ -6,10 +6,10 @@
6<center> 6<center>
7<div id="cloudtag"> 7<div id="cloudtag">
8 {loop="tags"} 8 {loop="tags"}
9 <span style="color:#99f; font-size:9pt; padding-left:5px; padding-right:2px;">{$value.count}</span><a href="?searchtags={$key|urlencode}" style="font-size:{$value.size}pt; font-weight:bold; color:black; text-decoration:none">{$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</center> 12</center>
13{include="page.footer"} 13{include="page.footer"}
14</body> 14</body>
15</html> \ No newline at end of file 15</html>
diff --git a/tpl/tools.html b/tpl/tools.html
index ba1c1e8e..c2520fda 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -10,10 +10,10 @@
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="#" 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> 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>
17{include="page.footer"} 17{include="page.footer"}
18</body> 18</body>
19</html> \ No newline at end of file 19</html>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 20:56:35 +0000