Commit 133c9334 authored by Jonny Bradley's avatar Jonny Bradley

[MOD] admin: Preference filter improvements - allow all prefs to be returned...

[MOD] admin: Preference filter improvements - allow all prefs to be returned in the pref search, and add labels to ones that would normally be hidden according to the user's current settings
parent 08d457dc
......@@ -77,7 +77,7 @@
}
});
show($('.adminoptionbox.preference.modified'))
show($('.adminoptionbox.preference.modified'));
$('input[name="filters"]').val(filters.join(' '));
$('.tabset .tabmark a').each(function () {
......@@ -161,7 +161,7 @@
<form method="post" action="" href="tiki-admin.php" class="table" role="form">
<div class="pref_search_results panel-body">
{foreach from=$lm_searchresults item=prefName}
{preference name=$prefName get_pages="y"}
{preference name=$prefName get_pages='y' visible='always'}
{/foreach}
</div>
<div class="panel-footer text-center">
......@@ -179,6 +179,7 @@
{/jq}
{elseif $lm_criteria}
{remarksbox type="note" title="{tr}No results{/tr}" icon="magnifier"}
{tr}No preferences were found for your search query with your <a class='alert-link' target='tikihelp' href='https://doc.tiki.org/Preference+Filters'>current choice of Preference Filters</a> ({icon name="filter"}).{/tr}{if $prefs.unified_engine eq 'lucene'}{tr} Not what you expected? Try {/tr}<a class="alert-link" href="tiki-admin.php?prefrebuild">{tr}rebuild{/tr}</a> {tr}the preferences search index.{/tr}{/if}
{tr}No preferences were found for your search query.{/tr}<br>
{tr _0='<a class="alert-link" href="tiki-admin.php?prefrebuild">' _1='</a>'}Not what you expected? Try %0rebuilding%1 the preferences search index.{/tr}
{/remarksbox}
{/if}
......@@ -35,14 +35,14 @@
<div class="adminoptionboxchild fgal_use_db_childcontainer n">
{preference name='fgal_use_dir'}
</div>
<div class="col-lg-8 col-sm-offset-4 margin-bottom-md">
<div class="col-sm-8 col-sm-offset-4 margin-bottom-md">
{button href="tiki-admin.php?page=fgal&amp;move=to_fs" _text="{tr}Move files from database to directory{/tr}"}
{button href="tiki-admin.php?page=fgal&amp;move=to_db" _text="{tr}Move files from directory to database{/tr}"}
</div>
{preference name='fgal_podcast_dir'}
<input type="hidden" name="filegalfeatures" />
<input type="hidden" name="filegalfeatures">
<fieldset>
<legend>{tr}Features{/tr}{help url="File+Gallery+Config"}</legend>
......
......@@ -32,3 +32,14 @@
{/if}
{$p.pages}
{if not $pref_filters.advanced.selected and in_array('advanced', $p.tags)}
<label class="label label-warning tips" title=":{tr}Change your preference filter settings in order to view advanced preferences by default{/tr}">
{tr}advanced{/tr}
</label>
{/if}
{if not $pref_filters.experimental.selected and in_array('experimental', $p.tags)}
<label class="label label-danger tips" title=":{tr}Change your preference filter settings in order to view experimental preferences by default{/tr}">
{tr}experimental{/tr}
</label>
{/if}
......@@ -213,7 +213,7 @@ if ( isset( $_REQUEST['lm_criteria'] ) ) {
set_time_limit(0);
try {
$smarty->assign('lm_criteria', $_REQUEST['lm_criteria']);
$results = $prefslib->getMatchingPreferences($_REQUEST['lm_criteria'], $temp_filters);
$results = $prefslib->getMatchingPreferences($_REQUEST['lm_criteria']);
$results = array_slice($results, 0, 50);
$smarty->assign('lm_searchresults', $results);
} catch(ZendSearch\Lucene\Exception\ExceptionInterface $e) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment