aboutsummaryrefslogtreecommitdiffstats
path: root/admin/themes
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2011-07-01 13:38:43 +0000
committermistic100 <mistic@piwigo.org>2011-07-01 13:38:43 +0000
commit5c545444cb52b95a4062e69d012c1f5203672532 (patch)
treea21245b4641d9328a03d2de2388d5db54d212468 /admin/themes
parent9c0cfb008446eaa0f3fc3cffc71e5bebe5d02710 (diff)
feature:2317 move order config to Admin->Config->Options
each drop-down menu is on a new line git-svn-id: http://piwigo.org/svn/trunk@11588 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/themes')
-rw-r--r--admin/themes/default/template/configuration.tpl8
-rw-r--r--admin/themes/default/theme.css12
2 files changed, 8 insertions, 12 deletions
diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index d2fb8910a..fc5f42b26 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -96,25 +96,25 @@
</span>
</li>
- <li>
+ <li style="margin-top:20px;">
&nbsp;
<span class="property">
{'Default photos order'|@translate}
{foreach from=$main.order_by item=order}
- <span class="filter {if $ORDER_BY_IS_CUSTOM}transparent{/if}">
- <a class="removeFilter" title="{'remove this filter'|@translate}"><span>[x]</span></a>
+ <span class="filter {if $ORDER_BY_IS_CUSTOM}transparent{/if}">
<select name="order_by_field[]" {if $ORDER_BY_IS_CUSTOM}disabled{/if}>
{html_options options=$main.order_field_options selected=$order.FIELD }
</select>
<select name="order_by_direction[]" {if $ORDER_BY_IS_CUSTOM}disabled{/if}>
{html_options options=$main.order_direction_options selected=$order.DIRECTION }
</select>
+ <a class="removeFilter">{'delete'|@translate}</a>
</span>
{/foreach}
{if !$ORDER_BY_IS_CUSTOM}
- <a class="addFilter" title="{'Add a filter'|@translate}"><span>[+]</span></a>
+ <a class="addFilter">{'Add a criteria'|@translate}</a>
{else}
<span class="order_by_is_custom">{'You can\'t define a default photo order because you have a custom setting in your local configuration.'|@translate}</span>
{/if}
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 72920e3ac..3bfffcaea 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -1049,13 +1049,9 @@ div.token-input-dropdown ul li.token-input-dropdown-item2 {background-color: #ff
div.token-input-dropdown ul li em {font-weight: bold;font-style: normal;}
div.token-input-dropdown ul li.token-input-selected-dropdown-item {background-color: #3b5998;color: #fff;}
-#mainConfCheck a.addFilter {background: url(icon/plus.gif) no-repeat 0 4px;width:19px;height:19px;display:inline-block;}
-#mainConfCheck a.addFilter:hover {background-position:0 5px;border:none;}
-#mainConfCheck a.addFilter span {display:none;}
-#mainConfCheck a.removeFilter {background: url(icon/remove_filter.png) no-repeat top left;width:7px;height:7px;display:inline-block;}
-#mainConfCheck a.removeFilter:hover {background: url(icon/remove_filter_hover.png);border:none;}
-#mainConfCheck a.removeFilter span {display:none;}
+#mainConfCheck a.addFilter {font-weight:normal;margin-left:20px;}
+#mainConfCheck a.removeFilter {font-weight:normal;}
#mainConfCheck span.property span.filter:first-child a.removeFilter {display:none;} /* can't delete the first field */
-#mainConfCheck span.filter {margin-right:10px;}
+#mainConfCheck span.filter {display:block;margin-left:20px;}
#mainConfCheck .transparent {opacity:0.5;filter:alpha(opacity=50);}
-#mainConfCheck .order_by_is_custom {display:block;font-weight:normal;font-style:italic;} \ No newline at end of file
+#mainConfCheck .order_by_is_custom {display:block;font-weight:normal;font-style:italic;margin-left:20px;} \ No newline at end of file