Merge pull request #59 from tst2005/master

uniform if syntax
author: nodiscc <nodiscc@gmail.com> 2014-11-13 01:48:52 +0100
committer: nodiscc <nodiscc@gmail.com> 2014-11-13 01:48:52 +0100
commit: 9362352e124151a0fa8a145fe1dba4e6256b35c7 (patch)
tree: 3fdbf3cbfb864021921cd93122dcf78513cb4134
parent: f2b2ac8c79c7698088acee1b00ef121e2e0e885d (diff)
parent: ae22a12b8adcc5788406b8637ab4db48085681fe (diff)
download: Shaarli-9362352e124151a0fa8a145fe1dba4e6256b35c7.tar.gz
Shaarli-9362352e124151a0fa8a145fe1dba4e6256b35c7.tar.zst
Shaarli-9362352e124151a0fa8a145fe1dba4e6256b35c7.zip
3 files changed, 8 insertions, 8 deletions
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'])"}<script src="inc/jquery.min.js#"></script><script src="inc/jquery-ui.min.js#"></script>{/if}
 </head>
 <body
-{if condition="$link.title==''"}onload="document.linkform.lf_title.focus();"
+{if="$link.title==''"}onload="document.linkform.lf_title.focus();"
-{elseif condition="$link.description==''"}onload="document.linkform.lf_description.focus();"
+{elseif="$link.description==''"}onload="document.linkform.lf_description.focus();"
 {else}onload="document.linkform.lf_tags.focus();"{/if} >
 <div id="pageheader">
        {include="page.header"}
@@ -16,7 +16,7 @@
                <i>Title</i><br><input type="text" name="lf_title" value="{$link.title|htmlspecialchars}" style="width:100%"><br>
                <i>Description</i><br><textarea name="lf_description" rows="4" cols="25" style="width:100%">{$link.description|htmlspecialchars}</textarea><br>
                <i>Tags</i><br><input type="text" id="lf_tags" name="lf_tags" value="{$link.tags|htmlspecialchars}" style="width:100%"><br>
-                {if condition="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"}
+                {if="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"}
            <input type="checkbox" checked="checked" name="lf_private" id="lf_private">
            &nbsp;<label for="lf_private"><i>Private</i></label><br>
            {else}
@@ -25,9 +25,9 @@
            {/if}
                <input type="submit" value="Save" name="save_edit" class="bigbutton" style="margin-left:40px;">
                <input type="submit" value="Cancel" name="cancel_edit" class="bigbutton" style="margin-left:40px;">
-                {if condition="!$link_is_new"}<input type="submit" value="Delete" name="delete_link" class="bigbutton" style="margin-left:180px;" onClick="return confirmDeleteLink();">{/if}
+                {if="!$link_is_new"}<input type="submit" value="Delete" name="delete_link" class="bigbutton" style="margin-left:180px;" onClick="return confirmDeleteLink();">{/if}
                <input type="hidden" name="token" value="{$token}">
-                {if condition="$http_referer"}<input type="hidden" name="returnurl" value="{$http_referer|htmlspecialchars}">{/if}
+                {if="$http_referer"}<input type="hidden" name="returnurl" value="{$http_referer|htmlspecialchars}">{/if}
            </form>
        </div>
 </div>
@@ -41,4 +41,4 @@ $(document).ready(function()
 </script>
 {/if}
 </body>
-</html>
-\ No newline at end of file
+</html>
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 @@
 <link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
 <link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />
 <link type="text/css" rel="stylesheet" href="inc/shaarli.css?version={$version|urlencode}#" />
-{if condition="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css?version={$version}#" />{/if}
+{if="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css?version={$version}#" />{/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}
                <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}
author	nodiscc <nodiscc@gmail.com>	2014-11-13 01:48:52 +0100
committer	nodiscc <nodiscc@gmail.com>	2014-11-13 01:48:52 +0100
commit	9362352e124151a0fa8a145fe1dba4e6256b35c7 (patch)
tree	3fdbf3cbfb864021921cd93122dcf78513cb4134
parent	f2b2ac8c79c7698088acee1b00ef121e2e0e885d (diff)
parent	ae22a12b8adcc5788406b8637ab4db48085681fe (diff)
download	Shaarli-9362352e124151a0fa8a145fe1dba4e6256b35c7.tar.gz Shaarli-9362352e124151a0fa8a145fe1dba4e6256b35c7.tar.zst Shaarli-9362352e124151a0fa8a145fe1dba4e6256b35c7.zip

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 @@
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.min.js#"></script><script src="inc/jquery-ui.min.js#"></script>{/if}
5	</head>	5	</head>
6	<body	6	<body
7	{if condition="$link.title==''"}onload="document.linkform.lf_title.focus();"	7	{if="$link.title==''"}onload="document.linkform.lf_title.focus();"
8	{elseif condition="$link.description==''"}onload="document.linkform.lf_description.focus();"	8	{elseif="$link.description==''"}onload="document.linkform.lf_description.focus();"
9	{else}onload="document.linkform.lf_tags.focus();"{/if} >	9	{else}onload="document.linkform.lf_tags.focus();"{/if} >
10	<div id="pageheader">	10	<div id="pageheader">
11	{include="page.header"}	11	{include="page.header"}
@@ -16,7 +16,7 @@
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}" style="width:100%"><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" style="width:100%">{$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}" style="width:100%"><br>
19	{if condition="($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	<label for="lf_private"><i>Private</i></label><br>	21	<label for="lf_private"><i>Private</i></label><br>
22	{else}	22	{else}
@@ -25,9 +25,9 @@
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" style="margin-left:40px;">
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" style="margin-left:40px;">
28	{if condition="!$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" style="margin-left:180px;" onClick="return confirmDeleteLink();">{/if}
29	<input type="hidden" name="token" value="{$token}">	29	<input type="hidden" name="token" value="{$token}">
30	{if condition="$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>
32	</div>	32	</div>
33	</div>	33	</div>
@@ -41,4 +41,4 @@ $(document).ready(function()
41	</script>	41	</script>
42	{/if}	42	{/if}
43	</body>	43	</body>
44	</html> \ No newline at end of file	44	</html>


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 @@
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 condition="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}#" />{/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 @@
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 condition="$search_type=='permalink'"} style="max-height:none !important;"{/if}>{$value.description}</div>{/if}	45	{if="$value.description"}<div class="linkdescription"{if="$search_type=='permalink'"} style="max-height:none !important;"{/if}>{$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}