aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2016-08-05 12:31:18 +0200
committerArthurHoaro <arthur@hoa.ro>2016-08-07 12:17:36 +0200
commit4fe87e697425e28cd0be00cc397d62b82eb13b26 (patch)
treec36a4c7bfc1ac74c145d0220221059617a5f6934
parentf791ba634e733811b3e10bb662e30cd5ba0b29e3 (diff)
downloadShaarli-4fe87e697425e28cd0be00cc397d62b82eb13b26.tar.gz
Shaarli-4fe87e697425e28cd0be00cc397d62b82eb13b26.tar.zst
Shaarli-4fe87e697425e28cd0be00cc397d62b82eb13b26.zip
Rebase: new config manager, search criteria, and private links
-rw-r--r--tpl/default/linklist.html30
-rw-r--r--tpl/default/page.header.html30
2 files changed, 33 insertions, 27 deletions
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index 4a0f44c6..ccdb5f21 100644
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -20,22 +20,26 @@
20 {/loop} 20 {/loop}
21 </div> 21 </div>
22 22
23 <!-- TODO: Search results. -->
24 {if="count($links)==0"} 23 {if="count($links)==0"}
25 <div id="searchcriteria">Nothing found.</div> 24 <div id="searchcriteria">Nothing found.</div>
26 {else} 25 {elseif="!empty($search_term) or !empty($search_tags)"}
27 {if="$search_type=='fulltext'"} 26 <div id="searchcriteria">
28 <div id="searchcriteria">{$result_count} results for <i>{$search_crits}</i></div> 27 {$result_count} results
29 {/if} 28 {if="!empty($search_term)"}
30 {if="$search_type=='tags'"} 29 for <em>{$search_term}</em>
31 <div id="searchcriteria">{$result_count} results for tags <i> 30 {/if}
32 {loop="search_crits"} 31 {if="!empty($search_tags)"}
33 <span class="linktag" title="Remove tag"> 32 {$exploded_tags=explode(' ', $search_tags)}
33 tagged
34 {loop="$exploded_tags"}
35 <span class="linktag" title="Remove tag">
34 <a href="?removetag={function="urlencode($value)"}">{$value} <span class="remove">x</span></a> 36 <a href="?removetag={function="urlencode($value)"}">{$value} <span class="remove">x</span></a>
35 </span> 37 </span>
36 {/loop}</i></div> 38 {/loop}
37 {/if} 39 {/if}
40 </div>
38 {/if} 41 {/if}
42
39 <div class="pure-g"> 43 <div class="pure-g">
40 <div class="pure-u-2-24"></div> 44 <div class="pure-u-2-24"></div>
41 <div class="pure-u-20-24"> 45 <div class="pure-u-20-24">
@@ -96,7 +100,7 @@
96 <div class="pure-g"> 100 <div class="pure-g">
97 <div class="linklist-item-infos-dateblock pure-u-lg-3-8 pure-u-1"> 101 <div class="linklist-item-infos-dateblock pure-u-lg-3-8 pure-u-1">
98 <a href="?{$value.shorturl}" title="Permalink"> 102 <a href="?{$value.shorturl}" title="Permalink">
99 {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"} 103 {if="!$hide_timestamps || isLoggedIn()"}
100 <span class="linkdate"> 104 <span class="linkdate">
101 <i class="fa fa-clock-o"></i> 105 <i class="fa fa-clock-o"></i>
102 {function="strftime('%d %B %Y %H:%M', $value.timestamp)"} &middot; 106 {function="strftime('%d %B %Y %H:%M', $value.timestamp)"} &middot;
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index e368d00d..ca080fda 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -1,11 +1,9 @@
1<div class="shaarli-menu pure-g" id="shaarli-menu"> 1<div class="shaarli-menu pure-g" id="shaarli-menu">
2 <div class="pure-u-lg-0 pure-u-1"> 2 <div class="pure-u-lg-0 pure-u-1">
3 <div class="pure-menu"> 3 <div class="pure-menu">
4 <!-- FIXME! default value in PHP --> 4 <a href="{$titleLink}" class="pure-menu-link">
5 <a href="{if="!empty($GLOBALS['titleLink'])"}{$GLOBALS['titleLink']}{else}?{/if}"
6 class="pure-menu-link">
7 <i class="fa fa-home"></i> 5 <i class="fa fa-home"></i>
8 {$GLOBALS['title']} 6 {$shaarlititle}
9 </a> 7 </a>
10 <a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></a> 8 <a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></a>
11 </div> 9 </div>
@@ -14,8 +12,7 @@
14 <div class="pure-menu menu-transform pure-menu-horizontal pure-g"> 12 <div class="pure-menu menu-transform pure-menu-horizontal pure-g">
15 <ul class="pure-menu-list pure-u-lg-11-12 pure-u-1"> 13 <ul class="pure-menu-list pure-u-lg-11-12 pure-u-1">
16 <li class="pure-menu-item pure-menu-selected pure-u-0 pure-u-lg-visible"> 14 <li class="pure-menu-item pure-menu-selected pure-u-0 pure-u-lg-visible">
17 <a href="{if="!empty($GLOBALS['titleLink'])"}{$GLOBALS['titleLink']}{else}?{/if}" 15 <a href="{$titleLink}" class="pure-menu-link">
18 class="pure-menu-link">
19 <i class="fa fa-home"></i> 16 <i class="fa fa-home"></i>
20 </a> 17 </a>
21 </li> 18 </li>
@@ -27,7 +24,7 @@
27 <a href="?do=tools" class="pure-menu-link">Tools</a> 24 <a href="?do=tools" class="pure-menu-link">Tools</a>
28 </li> 25 </li>
29 26
30 {elseif="$GLOBALS['config']['OPEN_SHAARLI']"} 27 {elseif="$openshaarli"}
31 <li class="pure-menu-item"> 28 <li class="pure-menu-item">
32 <a href="?do=addlink" class="pure-menu-link">Shaare</a> 29 <a href="?do=addlink" class="pure-menu-link">Shaare</a>
33 </li> 30 </li>
@@ -91,19 +88,24 @@
91 88
92<div id="header" class="pure-u-0 pure-u-lg-visible"> 89<div id="header" class="pure-u-0 pure-u-lg-visible">
93 <h1 id="header-title"> 90 <h1 id="header-title">
94 <a href="{if="!empty($GLOBALS['titleLink'])"}{$GLOBALS['titleLink']}{else}?{/if}"> 91 <a href="{if="{$titleLink}">
95 {$GLOBALS['title']} 92 {$shaarlititle}
96 </a> 93 </a>
97 </h1> 94 </h1>
98 <div id="linkcount"> 95 <div id="linkcount">
99 {if="!empty($linkcount)"}<span class="strong">{$linkcount}</span> shaares{/if} 96 {if="!empty($linkcount)"}
97 <span class="strong">{$linkcount}</span> shaares
98 {if="$privateLinkcount>0"}
99 - <span class="strong">{$privateLinkcount}</span> private links
100 {/if}
101 {/if}
100 </div> 102 </div>
101 103
102 <div id="search"> 104 <div id="search">
103 <form method="GET" class="searchform" name="searchform"> 105 <form method="GET" class="searchform" name="searchform">
104 <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="Search text" 106 <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="Search text"
105 {if="!empty($search_crits) && $search_type=='fulltext'"} 107 {if="!empty($search_term)"}
106 value="{$search_crits}" 108 value="{$search_term}"
107 {/if} 109 {/if}
108 tabindex="1" 110 tabindex="1"
109 > 111 >
@@ -111,8 +113,8 @@
111 </form> 113 </form>
112 <form method="GET" class="tagfilter" name="tagfilter"> 114 <form method="GET" class="tagfilter" name="tagfilter">
113 <input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="Filter by tag" 115 <input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="Filter by tag"
114 {if="!empty($search_crits) && $search_type=='tags'"} 116 {if="!empty($search_tags}"}
115 value="{function="implode(' ', $search_crits)"}" 117 value="{$search_tags}"
116 {/if} 118 {/if}
117 autocomplete="off" data-multiple data-minChars="1" 119 autocomplete="off" data-multiple data-minChars="1"
118 data-list="{loop="$tags"}{$key}, {/loop}" 120 data-list="{loop="$tags"}{$key}, {/loop}"