mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-03-28 17:42:57 +01:00
traduction fixes and covering filters conf absence in gallery
This commit is contained in:
@@ -89,7 +89,13 @@ for(const filter_name of filters_names){
|
||||
disabled
|
||||
{/if}
|
||||
>
|
||||
{ucfirst(str_replace('_', ' ', $filter_name))|translate}
|
||||
{if $filter_name == 'words'}
|
||||
{'Search for words'|translate}
|
||||
{else if $filter_name == 'file_size'}
|
||||
{'Filesize'|translate}
|
||||
{else}
|
||||
{ucfirst(str_replace('_', ' ', $filter_name))|translate}
|
||||
{/if}
|
||||
</label>
|
||||
<div class='select-views-arrow icon-down-open' id="{$filter_name}Arrow"> </div>
|
||||
<select name="filters_views[{$filter_name}][access]" id="f{$filter_name}Select" class="select-views">
|
||||
@@ -116,7 +122,7 @@ for(const filter_name of filters_names){
|
||||
</div>
|
||||
|
||||
<label class="filter-manager-options-container">
|
||||
<span class="mcs-icon-options gallery-icon-search">{'Words'|translate}</span>
|
||||
<span class="mcs-icon-options gallery-icon-search">{'Search for words'|translate}</span>
|
||||
<input type="checkbox" class="filter-manager-options-check" name="filters_views[words][default]" id="default_words"
|
||||
{if ($search.filters_views.words.default)}
|
||||
checked="checked"
|
||||
|
||||
@@ -8015,7 +8015,7 @@ color:#FF7B00;
|
||||
/* Filters options */
|
||||
.filters-grid{
|
||||
display: grid;
|
||||
grid-template-columns: 150px 118px 25px;
|
||||
grid-template-columns: 200px 118px 25px;
|
||||
margin-bottom: 0px !important;
|
||||
}
|
||||
.select-views{
|
||||
@@ -8029,7 +8029,7 @@ color:#FF7B00;
|
||||
.select-views-arrow{
|
||||
display: flex;
|
||||
position: absolute;
|
||||
margin-left: 249.9px;
|
||||
margin-left: 299.9px;
|
||||
margin-top: 5px;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
@@ -119,7 +119,16 @@ function get_regular_search_results($search, $images_where='')
|
||||
|
||||
$image_ids_for_filter = array();
|
||||
|
||||
$display_filters = unserialize($conf["filters_views"]);
|
||||
if (isset($conf['filters_views']))
|
||||
{
|
||||
$display_filters = unserialize($conf['filters_views']);
|
||||
}
|
||||
else
|
||||
{
|
||||
$display_filters = unserialize('a:14:{s:5:"words";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:1;}s:4:"tags";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:9:"post_date";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:13:"creation_date";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:1;}s:5:"album";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:1;}s:6:"author";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:8:"added_by";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:9:"file_type";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:5:"ratio";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:6:"rating";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:9:"file_size";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:6:"height";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:5:"width";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:17:"last_filters_conf";b:1;}');
|
||||
}
|
||||
|
||||
|
||||
foreach($display_filters as $filt_name => $filt_conf){
|
||||
if(isset($filt_conf['access']))
|
||||
{
|
||||
|
||||
@@ -6,7 +6,15 @@
|
||||
// | file that was distributed with this source code. |
|
||||
// +-----------------------------------------------------------------------+
|
||||
|
||||
$filters_views = unserialize($conf['filters_views']);
|
||||
if (isset($conf['filters_views']))
|
||||
{
|
||||
$filters_views = unserialize($conf['filters_views']);
|
||||
}
|
||||
else
|
||||
{
|
||||
$filters_views = unserialize('a:14:{s:5:"words";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:1;}s:4:"tags";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:9:"post_date";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:13:"creation_date";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:1;}s:5:"album";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:1;}s:6:"author";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:8:"added_by";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:9:"file_type";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:5:"ratio";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:6:"rating";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:9:"file_size";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:6:"height";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:5:"width";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:17:"last_filters_conf";b:1;}');
|
||||
}
|
||||
|
||||
$template->assign('display_filter', $filters_views);
|
||||
|
||||
// we add isset($page['search_details']) in this condition because it only
|
||||
|
||||
10
search.php
10
search.php
@@ -30,7 +30,15 @@ $search = array(
|
||||
// list of filters in user preferences
|
||||
// allwords, cat, tags, author, added_by, filetypes, date_posted, date_created, ratios, ratings (if rating is allowed in this Piwigo), height, width
|
||||
//import the conf for the filters
|
||||
$filters_conf = unserialize($conf['filters_views']);
|
||||
if (isset($conf['filters_views']))
|
||||
{
|
||||
$filters_conf = unserialize($conf['filters_views']);
|
||||
}
|
||||
else
|
||||
{
|
||||
$filters_conf = unserialize('a:14:{s:5:"words";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:1;}s:4:"tags";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:9:"post_date";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:13:"creation_date";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:1;}s:5:"album";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:1;}s:6:"author";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:8:"added_by";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:9:"file_type";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:5:"ratio";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:6:"rating";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:9:"file_size";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:6:"height";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:5:"width";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:17:"last_filters_conf";b:1;}');
|
||||
}
|
||||
|
||||
//change the name of the keys so that they can be used with this part of the program
|
||||
$filters_conf = array_combine
|
||||
(
|
||||
|
||||
Reference in New Issue
Block a user