From: nodiscc 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=f2b2ac8c79c7698088acee1b00ef121e2e0e885d;p=github%2Fshaarli%2FShaarli.git Merge pull request #59 from tst2005/master uniform if syntax --- diff --git a/tpl/editlink.html b/tpl/editlink.html index 4a2c30cc..48945a30 100644 --- a/tpl/editlink.html +++ b/tpl/editlink.html @@ -4,8 +4,8 @@ {if="empty($GLOBALS['disablejquery'])"}{/if}

{include="page.header"} @@ -16,7 +16,7 @@ Title

Description

Tags

- {if condition="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"} + {if="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"} Private
{else} @@ -25,9 +25,9 @@ {/if} - {if condition="!$link_is_new"}{/if} + {if="!$link_is_new"}{/if} - {if condition="$http_referer"}{/if} + {if="$http_referer"}{/if}

@@ -41,4 +41,4 @@ $(document).ready(function() {/if} - \ No newline at end of file + diff --git a/tpl/includes.html b/tpl/includes.html index 2b61f1e1..cc573801 100644 --- a/tpl/includes.html +++ b/tpl/includes.html @@ -6,4 +6,4 @@ -{if condition="is_file('inc/user.css')"}{/if} +{if="is_file('inc/user.css')"}{/if} diff --git a/tpl/linklist.html b/tpl/linklist.html index 770819fc..acb4bab0 100644 --- a/tpl/linklist.html +++ b/tpl/linklist.html @@ -42,7 +42,7 @@ {/if} {$value.title|htmlspecialchars}
- {if="$value.description"}

{$value.description}

{/if} + {if="$value.description"}

{$value.description}

{/if} {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"} {$value.localdate|htmlspecialchars} - permalink - {else}