From: nodiscc <nodiscc@gmail.com>
Date: Thu, 13 Nov 2014 00:48:52 +0000 (+0100)
Subject: Merge pull request #59 from tst2005/master
X-Git-Tag: v0.0.43beta~27
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=9362352e124151a0fa8a145fe1dba4e6256b35c7;hp=-c;p=github%2Fshaarli%2FShaarli.git

Merge pull request #59 from tst2005/master

uniform if syntax
---

9362352e124151a0fa8a145fe1dba4e6256b35c7
diff --combined tpl/linklist.html
index 770819fc,5a742737..acb4bab0
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@@ -42,15 -42,12 +42,15 @@@
                  {/if}
                  <span class="linktitle"><a href="{$redirector}{$value.url|htmlspecialchars}">{$value.title|htmlspecialchars}</a></span>
                  <br>
-                 {if="$value.description"}<div class="linkdescription"{if condition="$search_type=='permalink'"} style="max-height:none !important;"{/if}>{$value.description}</div>{/if}
+                 {if="$value.description"}<div class="linkdescription"{if="$search_type=='permalink'"} style="max-height:none !important;"{/if}>{$value.description}</div>{/if}
                  {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
                      <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{$value.localdate|htmlspecialchars} - permalink</a> - </span>
                  {else}
                      <span class="linkdate" title="Short link here"><a href="?{$value.linkdate|smallHash}">permalink</a> - </span>
                  {/if}
 +                {if="$GLOBALS['config']['ARCHIVE_ORG']"}
 +                <span class="linkarchive"><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">archive</a> - </span>
 +                {/if}
                  <div style="position:relative;display:inline;"><a href="http://qrfree.kaywa.com/?l=1&s=8&d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}" 
                      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> - 
                  <span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span><br>