Skip to content

Commit

Permalink
feature 3094: redesign of search form
Browse files Browse the repository at this point in the history 
- fix comments page filter form (css changes affected also that .filter form - simplified also css rules)
- better query for author list (using id for visible_images instead of image_id field)
- don't show author list if there is only one author

git-svn-id: http://piwigo.org/svn/trunk@28744 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
rvelices committed Jun 19, 2014
1 parent e9c7c08 commit a61307e
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 64 deletions.
2 changes: 1 addition & 1 deletion search.php
View file
Expand Up @@ -221,7 +221,7 @@
array(
'forbidden_categories' => 'category_id',
'visible_categories' => 'category_id',
'visible_images' => 'ic.image_id'
'visible_images' => 'id'
),
' WHERE '
).'
Expand Down
110 changes: 72 additions & 38 deletions themes/default/template/comments.tpl
View file
Expand Up @@ -14,51 +14,85 @@
<fieldset>
<legend>{'Filter'|@translate}</legend>

<label>{'Keyword'|@translate}<input type="text" name="keyword" value="{$F_KEYWORD}"></label>

<label>{'Author'|@translate}<input type="text" name="author" value="{$F_AUTHOR}"></label>

<label>
{'Album'|@translate}
<select name="cat">
<option value="0">------------</option>
{html_options options=$categories selected=$categories_selected}
</select>
</label>

<label>
{'Since'|@translate}
<select name="since">
{html_options options=$since_options selected=$since_options_selected}
</select>
</label>
<ul>
<li>
<label>{'Keyword'|@translate}</label>
</li>
<li>
<input type="text" name="keyword" value="{$F_KEYWORD}">
</li>
</ul>

<ul>
<li>
<label>{'Author'|@translate}</label>
</li>
<li>
<input type="text" name="author" value="{$F_AUTHOR}">
</li>
</ul>

<ul>
<li>
<label>{'Album'|@translate}</label>
</li>
<li>
<select name="cat">
<option value="0">------------</option>
{html_options options=$categories selected=$categories_selected}
</select>
</li>
</ul>

<ul>
<li>
<label>{'Since'|@translate}</label>
</li>
<li>
<select name="since">
{html_options options=$since_options selected=$since_options_selected}
</select>
</li>
</ul>

</fieldset>

<fieldset>

<legend>{'Display'|@translate}</legend>

<label>
{'Sort by'|@translate}
<select name="sort_by">
{html_options options=$sort_by_options selected=$sort_by_options_selected}
</select>
</label>

<label>
{'Sort order'|@translate}
<select name="sort_order">
{html_options options=$sort_order_options selected=$sort_order_options_selected}
</select>
</label>

<label>
{'Number of items'|@translate}
<select name="items_number">
{html_options options=$item_number_options selected=$item_number_options_selected}
</select>
</label>
<ul>
<li>
<label>{'Sort by'|@translate}</label>
</li>
<li>
<select name="sort_by">
{html_options options=$sort_by_options selected=$sort_by_options_selected}
</select>
</li>
</ul>

<ul>
<li>
<label>{'Sort order'|@translate}</label>
</li>
<li>
<select name="sort_order">
{html_options options=$sort_order_options selected=$sort_order_options_selected}
</select>
</li>
</ul>

<ul>
<li>
<label>{'Number of items'|@translate}</label>
</li>
<li>
<select name="items_number">
{html_options options=$item_number_options selected=$item_number_options_selected}
</select>
</li>
</ul>

</fieldset>

Expand Down
6 changes: 4 additions & 2 deletions themes/default/template/search.tpl
View file
Expand Up @@ -48,6 +48,7 @@ jQuery(document).ready(function() {

</fieldset>

{if count($AUTHORS)>1}
<fieldset>
<legend>{'Search for Author'|@translate}</legend>
<p>
Expand All @@ -58,6 +59,7 @@ jQuery(document).ready(function() {
</select>
</p>
</fieldset>
{/if}

{if isset($TAGS)}
<fieldset>
Expand Down Expand Up @@ -135,8 +137,8 @@ jQuery(document).ready(function() {
</p>
</fieldset>
<p>
<input class="submit" type="submit" name="submit" value="{'Submit'|@translate}">
<input class="submit" type="reset" value="{'Reset'|@translate}">
<input type="submit" name="submit" value="{'Submit'|@translate}">
<input type="reset" value="{'Reset'|@translate}">
</p>
</form>

Expand Down
24 changes: 1 addition & 23 deletions themes/default/theme.css
View file
Expand Up @@ -493,11 +493,6 @@ FORM P {
margin-bottom: 2em;
}

SELECT.categoryList {
height: 20em;
width: 500px;
}


/**
* Filter forms are displayed label by label with the input (or select...)
Expand All @@ -512,7 +507,7 @@ FIELDSET {
.filter UL {
display: block;
float: left;
margin-right: 1em;
margin: 0 1em 1em 0;
padding: 0;
}

Expand All @@ -525,11 +520,6 @@ FIELDSET {
padding-bottom:0;
}

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

.filter P {
text-align:left;
margin:0 0 15px 0;
Expand All @@ -553,18 +543,6 @@ FIELDSET {
margin-right:1em;
}

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

.filter FIELDSET * LABEL>INPUT {
display: inline;
vertical-align: top;
margin: 0 0.5em 0 0;
}


.properties UL {
Expand Down

0 comments on commit a61307e

Please sign in to comment.