archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature 3094: redesign of search form

Browse source 
- 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
This commit is contained in:
rvelices 2014-06-19 20:39:12 +00:00
parent e9c7c08ec4
commit a61307e652
4 changed files with 73 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
search.php
View file

@ -221,7 +221,7 @@ SELECT
array( array(
'forbidden_categories' => 'category_id', 'forbidden_categories' => 'category_id',
'visible_categories' => 'category_id', 'visible_categories' => 'category_id',
'visible_images' => 'ic.image_id' 'visible_images' => 'id'
), ),
' WHERE ' ' WHERE '
).' ).'

68
themes/default/template/comments.tpl
View file

@ -14,24 +14,46 @@
<fieldset> <fieldset>
<legend>{'Filter'|@translate}</legend> <legend>{'Filter'|@translate}</legend>
<label>{'Keyword'|@translate}<input type="text" name="keyword" value="{$F_KEYWORD}"></label> <ul>
<li>
<label>{'Keyword'|@translate}</label>
</li>
<li>
<input type="text" name="keyword" value="{$F_KEYWORD}">
</li>
</ul>
<label>{'Author'|@translate}<input type="text" name="author" value="{$F_AUTHOR}"></label> <ul>
<li>
<label>{'Author'|@translate}</label>
</li>
<li>
<input type="text" name="author" value="{$F_AUTHOR}">
</li>
</ul>
<label> <ul>
{'Album'|@translate} <li>
<label>{'Album'|@translate}</label>
</li>
<li>
<select name="cat"> <select name="cat">
<option value="0">------------</option> <option value="0">------------</option>
{html_options options=$categories selected=$categories_selected} {html_options options=$categories selected=$categories_selected}
</select> </select>
</label> </li>
</ul>
<label> <ul>
{'Since'|@translate} <li>
<label>{'Since'|@translate}</label>
</li>
<li>
<select name="since"> <select name="since">
{html_options options=$since_options selected=$since_options_selected} {html_options options=$since_options selected=$since_options_selected}
</select> </select>
</label> </li>
</ul>
</fieldset> </fieldset>
@ -39,26 +61,38 @@
<legend>{'Display'|@translate}</legend> <legend>{'Display'|@translate}</legend>
<label> <ul>
{'Sort by'|@translate} <li>
<label>{'Sort by'|@translate}</label>
</li>
<li>
<select name="sort_by"> <select name="sort_by">
{html_options options=$sort_by_options selected=$sort_by_options_selected} {html_options options=$sort_by_options selected=$sort_by_options_selected}
</select> </select>
</label> </li>
</ul>
<label> <ul>
{'Sort order'|@translate} <li>
<label>{'Sort order'|@translate}</label>
</li>
<li>
<select name="sort_order"> <select name="sort_order">
{html_options options=$sort_order_options selected=$sort_order_options_selected} {html_options options=$sort_order_options selected=$sort_order_options_selected}
</select> </select>
</label> </li>
</ul>
<label> <ul>
{'Number of items'|@translate} <li>
<label>{'Number of items'|@translate}</label>
</li>
<li>
<select name="items_number"> <select name="items_number">
{html_options options=$item_number_options selected=$item_number_options_selected} {html_options options=$item_number_options selected=$item_number_options_selected}
</select> </select>
</label> </li>
</ul>
</fieldset> </fieldset>

6
themes/default/template/search.tpl
View file

@ -48,6 +48,7 @@ jQuery(document).ready(function() {
</fieldset> </fieldset>
{if count($AUTHORS)>1}
<fieldset> <fieldset>
<legend>{'Search for Author'|@translate}</legend> <legend>{'Search for Author'|@translate}</legend>
<p> <p>
@ -58,6 +59,7 @@ jQuery(document).ready(function() {
</select> </select>
</p> </p>
</fieldset> </fieldset>
{/if}
{if isset($TAGS)} {if isset($TAGS)}
<fieldset> <fieldset>
@ -135,8 +137,8 @@ jQuery(document).ready(function() {
</p> </p>
</fieldset> </fieldset>
<p> <p>
<input class="submit" type="submit" name="submit" value="{'Submit'|@translate}"> <input type="submit" name="submit" value="{'Submit'|@translate}">
<input class="submit" type="reset" value="{'Reset'|@translate}"> <input type="reset" value="{'Reset'|@translate}">
</p> </p>
</form> </form>

24
themes/default/theme.css
View file

@ -493,11 +493,6 @@ FORM P {
margin-bottom: 2em; margin-bottom: 2em;
} }
SELECT.categoryList {
height: 20em;
width: 500px;
}
/** /**
* Filter forms are displayed label by label with the input (or select...) * Filter forms are displayed label by label with the input (or select...)
@ -512,7 +507,7 @@ FIELDSET {
.filter UL { .filter UL {
display: block; display: block;
float: left; float: left;
margin-right: 1em; margin: 0 1em 1em 0;
padding: 0; padding: 0;
} }
@ -525,11 +520,6 @@ FIELDSET {
padding-bottom:0; padding-bottom:0;
} }
.filter LI LABEL {
display: inline;
float: none;
}
.filter P { .filter P {
text-align:left; text-align:left;
margin:0 0 15px 0; margin:0 0 15px 0;
@ -553,18 +543,6 @@ FIELDSET {
margin-right:1em; 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 { .properties UL {