Skip to content

Commit

Permalink
feature 3093: search form, ability to select the list of properties o…
Browse files Browse the repository at this point in the history 
…n which

the search terms applies.

feature 3094: minor redesign on search form.


git-svn-id: http://piwigo.org/svn/trunk@28709 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
@plegall
plegall committed Jun 17, 2014
1 parent 583af81 commit 6f8caf2
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 32 deletions.
8 changes: 7 additions & 1 deletion include/functions_search.inc.php
View file
Expand Up @@ -85,7 +85,13 @@ function get_sql_search_clause($search)

if (isset($search['fields']['allwords']))
{
$fields = array('file', 'name', 'comment', 'author');
$fields = array('file', 'name', 'comment');

if (isset($search['fields']['allwords']['fields']) and count($search['fields']['allwords']['fields']) > 0)
{
$fields = array_intersect($fields, $search['fields']['allwords']['fields']);
}

// in the OR mode, request bust be :
// ((field1 LIKE '%word1%' OR field2 LIKE '%word1%')
// OR (field1 LIKE '%word2%' OR field2 LIKE '%word2%'))
Expand Down
3 changes: 3 additions & 0 deletions language/en_UK/common.lang.php
View file
Expand Up @@ -419,4 +419,7 @@
$lang['%d photos per page'] = '%d photos per page';
$lang['Theme'] = 'Theme';
$lang['No results for'] = 'No results for';
$lang['Apply on properties'] = 'Apply on properties';
$lang['Photo title'] = 'Photo title';
$lang['Photo description'] = 'Photo description';
?>
5 changes: 4 additions & 1 deletion language/fr_FR/common.lang.php
View file
Expand Up @@ -418,4 +418,7 @@
$lang['Password confirmation is missing. Please confirm the chosen password.'] = "La confirmation du mot de passe manque. Veuillez confirmer le mot de passe choisi.";
$lang['%d photos per page'] = '%d photos par page';
$lang['Theme'] = 'Thème';
$lang['No results for'] = 'Aucun résultat pour';
$lang['No results for'] = 'Aucun résultat pour';
$lang['Apply on properties'] = 'Appliquer sur les propriétés';
$lang['Photo title'] = 'Titre de la photo';
$lang['Photo description'] = 'Description de la photo';
3 changes: 3 additions & 0 deletions search.php
View file
Expand Up @@ -48,6 +48,8 @@
and !preg_match('/^\s*$/', $_POST['search_allwords']))
{
check_input_parameter('mode', $_POST, false, '/^(OR|AND)$/');

$fields = array_intersect($_POST['fields'], array('name', 'comment', 'file'));

$drop_char_match = array(
'-','^','$',';','#','&','(',')','<','>','`','\'','"','|',',','@','_',
Expand All @@ -69,6 +71,7 @@
)
),
'mode' => $_POST['mode'],
'fields' => $fields,
);
}

Expand Down
54 changes: 27 additions & 27 deletions themes/default/template/search.tpl
View file
Expand Up @@ -31,39 +31,46 @@ jQuery(document).ready(function() {

<form class="filter" method="post" name="search" action="{$F_SEARCH_ACTION}">
<fieldset>
<legend>{'Filter'|@translate}</legend>
<label>{'Search for words'|@translate}
<input type="text" name="search_allwords" size="35">
</label>
<ul>
<li><label>
<input type="radio" name="mode" value="AND" checked="checked">{'Search for all terms'|@translate}
</label></li>
<li><label>
<input type="radio" name="mode" value="OR">{'Search for any term'|@translate}
</label></li>
</ul>
<label>{'Search for Author'|@translate}
<legend>{'Search for words'|@translate}</legend>
<p>
<input type="text" name="search_allwords">
<br>
<label><input type="radio" name="mode" value="AND" checked="checked">{'Search for all terms'|@translate}</label>
<label><input type="radio" name="mode" value="OR">{'Search for any term'|@translate}</label>
</p>

<p>
<strong>{'Apply on properties'|translate}</strong><br>
<label><input type="checkbox" name="fields[]" value="name" checked="checked">{'Photo title'|translate}</label>
<label><input type="checkbox" name="fields[]" value="comment" checked="checked">{'Photo description'|translate}</label>
<label><input type="checkbox" name="fields[]" value="file" checked="checked">{'File name'|translate}</label>
</p>

</fieldset>

<fieldset>
<legend>{'Search for Author'|@translate}</legend>
<p>
<select id="authors" placeholder="{'Type in a search term'|translate}" name="authors[]" multiple style="width:500px;">
{foreach from=$AUTHORS item=author}
<option value="{$author.author|strip_tags:false|escape:html}">{$author.author|strip_tags:false} ({$author.counter|translate_dec:'%d photo':'%d photos'})</option>
{/foreach}
</select>
</label>
</p>
</fieldset>

{if isset($TAGS)}
<fieldset>
<legend>{'Search tags'|@translate}</legend>

<p>
<select id="tags" placeholder="{'Type in a search term'|translate}" name="tags[]" multiple style="width:500px;">
{foreach from=$TAGS item=tag}
<option value="{$tag.id}">{$tag.name} ({$tag.counter|translate_dec:'%d photo':'%d photos'})</option>
{/foreach}
</select>

<label><span><input type="radio" name="tag_mode" value="AND" checked="checked"> {'All tags'|@translate}</span></label>
<label><span><input type="radio" name="tag_mode" value="OR"> {'Any tag'|@translate}</span></label>
</p>
</fieldset>
{/if}

Expand Down Expand Up @@ -120,20 +127,13 @@ jQuery(document).ready(function() {

<fieldset>
<legend>{'Search in albums'|@translate}</legend>
<label>{'Albums'|@translate}
<p>
<select class="categoryList" name="cat[]" multiple="multiple" size="15">
{html_options options=$category_options selected=$category_options_selected}
</select>
</label>
<ul>
<li><label>{'Search in sub-albums'|@translate}</label></li>
<li><label>
<input type="radio" name="subcats-included" value="1" checked="checked">{'Yes'|@translate}
</label></li>
<li><label>
<input type="radio" name="subcats-included" value="0">{'No'|@translate}
</label></li>
</ul>
<br>
<label><input type="checkbox" name="subcats-included" value="1" checked="checked">{'Search in sub-albums'|@translate}</label>
</p>
</fieldset>
<p>
<input class="submit" type="submit" name="submit" value="{'Submit'|@translate}">
Expand Down
32 changes: 29 additions & 3 deletions themes/default/theme.css
View file
Expand Up @@ -509,8 +509,7 @@ FIELDSET {
margin: 1em;
}

.filter UL,
.filter LABEL {
.filter UL {
display: block;
float: left;
margin-right: 1em;
Expand All @@ -522,15 +521,42 @@ FIELDSET {
margin-bottom: 0.5em;
}

.filter FIELDSET {
padding-bottom:0;
}

.filter LI LABEL {
display: inline;
float: none;
}

.filter P {
text-align:left;
margin:0 0 15px 0;
line-height:20px;
}

.filter input[name="search_allwords"] {
width:500px;
}

.filter P input[type="checkbox"], .filter P input[type="radio"] {
vertical-align:middle;
margin-top:-4px;
}

.filter input[type="submit"] {
margin-left:1em;
}

.filter P LABEL {
margin-right:1em;
}

/*IE6 needs override because of > selector*/
.filter LABEL>INPUT,
.filter LABEL>SELECT {
display: block;
/* display: block; */
margin: 0.5em 0;
}

Expand Down

0 comments on commit 6f8caf2

Please sign in to comment.