aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFlorian Eula <eula.florian@gmail.com>2014-11-21 19:43:53 +0100
committerFlorian Eula <eula.florian@gmail.com>2014-11-21 19:43:53 +0100
commitd741c9fc16d80cbb99c192a816c1643a12a38266 (patch)
tree61a5ba6bf9b73403399a57ad409c81068e3c7a6c
parent732e683bdacc2033b03820c8e80f7d31c54b94ef (diff)
downloadShaarli-d741c9fc16d80cbb99c192a816c1643a12a38266.tar.gz
Shaarli-d741c9fc16d80cbb99c192a816c1643a12a38266.tar.zst
Shaarli-d741c9fc16d80cbb99c192a816c1643a12a38266.zip
Added a link to the visible URL in the link list
Corrected CSS to prevent a line from showing underneath Fixes https://github.com/shaarli/Shaarli/issues/53
-rw-r--r--inc/shaarli.css50
-rw-r--r--tpl/linklist.html18
2 files changed, 36 insertions, 32 deletions
diff --git a/inc/shaarli.css b/inc/shaarli.css
index 28394ed5..bc428f74 100644
--- a/inc/shaarli.css
+++ b/inc/shaarli.css
@@ -24,6 +24,10 @@ input, textarea {
24 24
25 } 25 }
26 26
27a {
28 text-decoration: none;
29}
30
27h1 { font-size:20pt; font-weight:bold; font-style:italic; margin-bottom:20px; } 31h1 { font-size:20pt; font-weight:bold; font-style:italic; margin-bottom:20px; }
28/* I don't give a shit about IE. He can't understand selectors such as input[type='submit']. */ 32/* I don't give a shit about IE. He can't understand selectors such as input[type='submit']. */
29 33
@@ -69,9 +73,9 @@ h1 { font-size:20pt; font-weight:bold; font-style:italic; margin-bottom:20px; }
69 73
70/* Small tab on the left of each link with edit/delete buttons. */ 74/* Small tab on the left of each link with edit/delete buttons. */
71.button_edit, .button_delete { border-radius:0; box-shadow:none; border-style:none; border-width:0; padding:0; background:none; } 75.button_edit, .button_delete { border-radius:0; box-shadow:none; border-style:none; border-width:0; padding:0; background:none; }
72.linkeditbuttons { 76.linkeditbuttons {
73 position:absolute; 77 position:absolute;
74 left:-1px; 78 left:-1px;
75 padding:4px 2px 2px 2px; 79 padding:4px 2px 2px 2px;
76 background-color:#f0f0f0; 80 background-color:#f0f0f0;
77 81
@@ -111,7 +115,7 @@ cursor:pointer;
111 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); 115 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
112 width:auto; 116 width:auto;
113 padding:0 10px 5px 10px; 117 padding:0 10px 5px 10px;
114 margin: auto; 118 margin: auto;
115} 119}
116 120
117#pageheader a 121#pageheader a
@@ -306,7 +310,7 @@ font-size:9pt;
306 background-color: transparent; 310 background-color: transparent;
307 background-color: rgba(0, 0, 0, 0.4); /* FF3+, Saf3+, Opera 10.10+, Chrome, IE9 */ 311 background-color: rgba(0, 0, 0, 0.4); /* FF3+, Saf3+, Opera 10.10+, Chrome, IE9 */
308 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#66000000,endColorstr=#66000000); /* IE6–IE9 */ 312 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#66000000,endColorstr=#66000000); /* IE6–IE9 */
309text-shadow:2px 2px 1px #000000; 313text-shadow:2px 2px 1px #000000;
310} 314}
311 315
312/* Minimal customisation for jQuery widgets */ 316/* Minimal customisation for jQuery widgets */
@@ -338,7 +342,7 @@ box-shadow:2px 2px 20px 2px #333333;
338 342
339div.daily 343div.daily
340{ 344{
341 font-family: Georgia, 'DejaVu Serif', Norasi, serif; 345 font-family: Georgia, 'DejaVu Serif', Norasi, serif;
342 background-color: #E6D6BE; 346 background-color: #E6D6BE;
343 /* Background paper texture by BashCorpo: 347 /* Background paper texture by BashCorpo:
344 http://www.bashcorpo.dk/textures.php 348 http://www.bashcorpo.dk/textures.php
@@ -357,7 +361,7 @@ div.daily
357#daily_col3 { float:left;position:relative; width:33%;} 361#daily_col3 { float:left;position:relative; width:33%;}
358 362
359div.dailyAbout 363div.dailyAbout
360{ 364{
361 float:left; 365 float:left;
362 border: 1px solid black; 366 border: 1px solid black;
363 font-size: 8pt; 367 font-size: 8pt;
@@ -365,21 +369,21 @@ div.dailyAbout
365 left:10px; 369 left:10px;
366 top: 15px; 370 top: 15px;
367 padding: 5px 5px 5px 5px; 371 padding: 5px 5px 5px 5px;
368 text-align:center; 372 text-align:center;
369} 373}
370div.dailyAbout a { color: #890500; } 374div.dailyAbout a { color: #890500; }
371div.dailyTitle 375div.dailyTitle
372 { 376 {
373 font-weight: bold; 377 font-weight: bold;
374 font-size: 44pt; 378 font-size: 44pt;
375 text-align:center; 379 text-align:center;
376 padding:10px 20px 0px 20px; 380 padding:10px 20px 0px 20px;
377} 381}
378div.dailyDate 382div.dailyDate
379 { 383 {
380 font-size: 12pt; 384 font-size: 12pt;
381 font-weight:bold; 385 font-weight:bold;
382 text-align:center; 386 text-align:center;
383 padding:0px 20px 30px 20px; 387 padding:0px 20px 30px 20px;
384} 388}
385 389
@@ -393,19 +397,19 @@ div.dailyEntry
393div.dailyEntry a { text-decoration:none; color: #890500; } 397div.dailyEntry a { text-decoration:none; color: #890500; }
394div.dailyEntryTags { font-size:7.75pt; } 398div.dailyEntryTags { font-size:7.75pt; }
395div.dailyEntryTitle { font-size:18pt; font-weight:bold;} 399div.dailyEntryTitle { font-size:18pt; font-weight:bold;}
396div.dailyEntryThumbnail 400div.dailyEntryThumbnail
397{ 401{
398 width:100%; 402 width:100%;
399 text-align:center; 403 text-align:center;
400 background-color:rgb(128,128,128); 404 background-color:rgb(128,128,128);
401 background:url(../images/50pc_transparent.png); 405 background:url(../images/50pc_transparent.png);
402 padding:4px 0px 2px 0px; 406 padding:4px 0px 2px 0px;
403} 407}
404div.dailyEntryDescription 408div.dailyEntryDescription
405{ 409{
406 margin-top: 10px; 410 margin-top: 10px;
407 margin-bottom: 30px; 411 margin-bottom: 30px;
408 text-align:justify; 412 text-align:justify;
409 overflow:auto; 413 overflow:auto;
410} 414}
411 415
@@ -415,7 +419,7 @@ div.dailyEntryDescription
415} 419}
416 420
417/* For lazy images loading in picture wall. 421/* For lazy images loading in picture wall.
418 Using http://www.appelsiini.net/projects/lazyload 422 Using http://www.appelsiini.net/projects/lazyload
419 */ 423 */
420.lazyimage { display:none; } 424.lazyimage { display:none; }
421 425
@@ -464,7 +468,7 @@ div.dailyDate { font-size: 11pt;padding:0px; display:block; }
464div.dailyEntryTitle { font-size:16pt; font-weight:bold;} 468div.dailyEntryTitle { font-size:16pt; font-weight:bold;}
465div.dailyEntryDescription { font-size:10pt; } 469div.dailyEntryDescription { font-size:10pt; }
466 470
467} 471}
468 472
469/* Highlight search results */ 473/* Highlight search results */
470.highlight { background-color: #FFFF33; } 474.highlight { background-color: #FFFF33; }
diff --git a/tpl/linklist.html b/tpl/linklist.html
index acb4bab0..d33fc3c3 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -51,9 +51,9 @@
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 style="position:relative;display:inline;"><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#" width="13" height="13" title="QR-Code"></a></div> -
56 <span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span><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">
59 {loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value|htmlspecialchars}</a></span> {/loop} 59 {loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value|htmlspecialchars}</a></span> {/loop}
@@ -68,12 +68,12 @@
68 68
69</div> 69</div>
70 70
71 {include="page.footer"} 71 {include="page.footer"}
72 72
73<script language="JavaScript"> 73<script language="JavaScript">
74// Remove any displayed QR-Code 74// Remove any displayed QR-Code
75function remove_qrcode() 75function remove_qrcode()
76{ 76{
77 var elem = document.getElementById("permalinkQrcode"); 77 var elem = document.getElementById("permalinkQrcode");
78 if (elem) elem.parentNode.removeChild(elem); 78 if (elem) elem.parentNode.removeChild(elem);
79 return false; 79 return false;
@@ -81,7 +81,7 @@ function remove_qrcode()
81 81
82// Show the QR-Code of a permalink (when the QR-Code icon is clicked). 82// Show the QR-Code of a permalink (when the QR-Code icon is clicked).
83function showQrCode(caller,loading=false) 83function showQrCode(caller,loading=false)
84{ 84{
85 // Dynamic javascript lib loading: We only load qr.js if the QR code icon is clicked: 85 // 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. 86 if (typeof(qr)=='undefined') // Load qr.js only if not present.
87 { 87 {
@@ -97,18 +97,18 @@ function showQrCode(caller,loading=false)
97 97
98 // Remove previous qrcode if present. 98 // Remove previous qrcode if present.
99 remove_qrcode(); 99 remove_qrcode();
100 100
101 // Build the div which contains the QR-Code: 101 // Build the div which contains the QR-Code:
102 var element = document.createElement('div'); 102 var element = document.createElement('div');
103 element.id="permalinkQrcode"; 103 element.id="permalinkQrcode";
104 // Make QR-Code div commit sepuku when clicked: 104 // Make QR-Code div commit sepuku when clicked:
105 if ( element.attachEvent ){ element.attachEvent('onclick', 'this.parentNode.removeChild(this);' ); } // Damn IE 105 if ( element.attachEvent ){ element.attachEvent('onclick', 'this.parentNode.removeChild(this);' ); } // Damn IE
106 else { element.setAttribute('onclick', 'this.parentNode.removeChild(this);' ); } 106 else { element.setAttribute('onclick', 'this.parentNode.removeChild(this);' ); }
107 107
108 // Build the QR-Code: 108 // Build the QR-Code:
109 var image = qr.image({size: 8,value: caller.dataset.permalink}); 109 var image = qr.image({size: 8,value: caller.dataset.permalink});
110 if (image) 110 if (image)
111 { 111 {
112 element.appendChild(image); 112 element.appendChild(image);
113 element.innerHTML+= "<br>Click to close"; 113 element.innerHTML+= "<br>Click to close";
114 caller.parentNode.appendChild(element); 114 caller.parentNode.appendChild(element);