Fix search tag style
This commit is contained in:
parent
645557480c
commit
da3abc7591
6 changed files with 21 additions and 15 deletions
|
@ -32,7 +32,7 @@
|
||||||
// Note: You must have publisher.php in the same directory as Shaarli index.php
|
// Note: You must have publisher.php in the same directory as Shaarli index.php
|
||||||
$GLOBALS['config']['UPDATECHECK_FILENAME'] = $GLOBALS['config']['DATADIR'].'/lastupdatecheck.txt'; // For updates check of Shaarli.
|
$GLOBALS['config']['UPDATECHECK_FILENAME'] = $GLOBALS['config']['DATADIR'].'/lastupdatecheck.txt'; // For updates check of Shaarli.
|
||||||
$GLOBALS['config']['UPDATECHECK_INTERVAL'] = 86400; // Updates check frequency for Shaarli. 86400 seconds=24 hours
|
$GLOBALS['config']['UPDATECHECK_INTERVAL'] = 86400; // Updates check frequency for Shaarli. 86400 seconds=24 hours
|
||||||
$GLOBALS['config']['UPDATECHECK_URL'] = 'https://book.knah-tsaeb.org/shaarli_version.txt'; // Define last version of myShaarli
|
$GLOBALS['config']['UPDATECHECK_URL'] = 'https://forge.leslibres.org/Knah-Tsaeb/MyShaarli/raw/myShaarli/shaarli_version.txt'; // Define last version of myShaarli
|
||||||
$GLOBALS['config']['UPDATECHECK_DOWNLOAD'] = 'https://forge.leslibres.org/Knah-Tsaeb/MyShaarli';
|
$GLOBALS['config']['UPDATECHECK_DOWNLOAD'] = 'https://forge.leslibres.org/Knah-Tsaeb/MyShaarli';
|
||||||
$GLOBALS['config']['ENABLE_UPDATECHECK'] = true;
|
$GLOBALS['config']['ENABLE_UPDATECHECK'] = true;
|
||||||
$GLOBALS['config']['externalThumbshot'] = ''; // Url for external thumbnailer
|
$GLOBALS['config']['externalThumbshot'] = ''; // Url for external thumbnailer
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
require $GLOBALS['config']['DATADIR'].'/options.php';
|
require $GLOBALS['config']['DATADIR'].'/options.php';
|
||||||
}
|
}
|
||||||
|
|
||||||
define('myShaarli_version', '1.1.5');
|
define('myShaarli_version', '1.1.6');
|
||||||
define('PHPPREFIX', '<?php /* '); // Prefix to encapsulate data in php code.
|
define('PHPPREFIX', '<?php /* '); // Prefix to encapsulate data in php code.
|
||||||
define('PHPSUFFIX', ' */ ?>'); // Suffix to encapsulate data in php code.
|
define('PHPSUFFIX', ' */ ?>'); // Suffix to encapsulate data in php code.
|
||||||
// http://server.com/x/shaarli --> /shaarli/
|
// http://server.com/x/shaarli --> /shaarli/
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
1.1.5
|
1.1.6
|
||||||
|
|
|
@ -24,18 +24,18 @@
|
||||||
<div id="linklist">
|
<div id="linklist">
|
||||||
{include="linklist.paging"}
|
{include="linklist.paging"}
|
||||||
{if="count($links)==0"}
|
{if="count($links)==0"}
|
||||||
<div id="searchcriteria">
|
<div id="searchcriteria" class="tags">
|
||||||
Nothing found.
|
Nothing found.
|
||||||
</div>
|
</div>
|
||||||
{else}
|
{else}
|
||||||
{if="$search_type=='fulltext'"}
|
{if="$search_type=='fulltext'"}
|
||||||
<div id="searchcriteria">
|
<div id="searchcriteria" class="tags">
|
||||||
{$result_count} results for <i>{$search_crits}</i>
|
{$result_count} results for <i>{$search_crits}</i>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
{if="$search_type=='tags'"}
|
{if="$search_type=='tags'"}
|
||||||
<div id="searchcriteria">
|
<div id="searchcriteria" class="tags">
|
||||||
{$result_count} results for tags <i> {loop="search_crits"} <span class="linktag" title="Remove tag"><a href="?removetag={$value|htmlspecialchars}">{$value|htmlspecialchars} <span class="removeTag">x</span></a></span> {/loop}</i>
|
{$result_count} results for tags <i> {loop="search_crits"} <a href="?removetag={$value|htmlspecialchars}">{$value|htmlspecialchars} <span class="removeTag">x</span></a> {/loop}</i>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
{/if}
|
{/if}
|
||||||
|
|
|
@ -413,8 +413,11 @@ a, .linkdescription a {
|
||||||
}
|
}
|
||||||
|
|
||||||
#searchcriteria {
|
#searchcriteria {
|
||||||
|
background-color: #fff;
|
||||||
|
border-radius: .3em;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
padding: 4px 0 5px 5px;
|
padding: 4px 0 5px 5px;
|
||||||
|
margin: 1em 0 0 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.paging {
|
.paging {
|
||||||
|
@ -622,11 +625,11 @@ a, .linkdescription a {
|
||||||
}
|
}
|
||||||
|
|
||||||
.tags a {
|
.tags a {
|
||||||
float: left;
|
|
||||||
background: #777;
|
background: #777;
|
||||||
|
display: inline-block;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
margin: 0 0 10px 18px;
|
margin: .1em 0 .1em 1em;
|
||||||
padding: 2px 10px 1px;
|
padding: 2px 10px 1px;
|
||||||
border-top-right-radius: 3px;
|
border-top-right-radius: 3px;
|
||||||
border-bottom-right-radius: 3px;
|
border-bottom-right-radius: 3px;
|
||||||
|
|
|
@ -414,8 +414,11 @@ a, .linkdescription a {
|
||||||
}
|
}
|
||||||
|
|
||||||
#searchcriteria {
|
#searchcriteria {
|
||||||
|
background-color: #fff;
|
||||||
|
border-radius: .3em;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
padding: 4px 0 5px 5px;
|
padding: 4px 0 5px 5px;
|
||||||
|
margin: .3em 0 0 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.paging {
|
.paging {
|
||||||
|
@ -634,11 +637,11 @@ a, .linkdescription a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
.tags a {
|
.tags a {
|
||||||
float: left;
|
|
||||||
background: #777;
|
background: #777;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
display: inline-block;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
margin: 0 0 10px 18px;
|
margin: .1em 0 .1em 1em;
|
||||||
padding: 2px 10px 1px;
|
padding: 2px 10px 1px;
|
||||||
border-top-right-radius: 3px;
|
border-top-right-radius: 3px;
|
||||||
border-bottom-right-radius: 3px;
|
border-bottom-right-radius: 3px;
|
||||||
|
|
|
@ -24,18 +24,18 @@
|
||||||
<div id="linklist">
|
<div id="linklist">
|
||||||
{include="linklist.paging"}
|
{include="linklist.paging"}
|
||||||
{if="count($links)==0"}
|
{if="count($links)==0"}
|
||||||
<div id="searchcriteria">
|
<div id="searchcriteria" class="tags">
|
||||||
Nothing found.
|
Nothing found.
|
||||||
</div>
|
</div>
|
||||||
{else}
|
{else}
|
||||||
{if="$search_type=='fulltext'"}
|
{if="$search_type=='fulltext'"}
|
||||||
<div id="searchcriteria">
|
<div id="searchcriteria" class="tags">
|
||||||
{$result_count} results for <i>{$search_crits}</i>
|
{$result_count} results for <i>{$search_crits}</i>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
{if="$search_type=='tags'"}
|
{if="$search_type=='tags'"}
|
||||||
<div id="searchcriteria">
|
<div id="searchcriteria" class="tags">
|
||||||
{$result_count} results for tags <i> {loop="search_crits"} <span class="linktag" title="Remove tag"><a href="?removetag={$value|htmlspecialchars}">{$value|htmlspecialchars} <span class="removeTag">x</span></a></span> {/loop}</i>
|
{$result_count} results for tags <i> {loop="search_crits"} <a href="?removetag={$value|htmlspecialchars}">{$value|htmlspecialchars} <span class="removeTag">x</span></a> {/loop}</i>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
{/if}
|
{/if}
|
||||||
|
|
Loading…
Reference in a new issue