aboutsummaryrefslogtreecommitdiffstats
path: root/admin/themes/default
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--admin/themes/default/template/cat_modify.tpl22
-rw-r--r--admin/themes/default/template/element_set_ranks.tpl26
-rw-r--r--admin/themes/default/thumbnails.css13
3 files changed, 20 insertions, 41 deletions
diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index 4c6ebe7fb..8c51785e2 100644
--- a/admin/themes/default/template/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
@@ -14,8 +14,8 @@
{/if}
{if isset($U_MANAGE_ELEMENTS) }
<li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage album photos'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'Photos'|@translate}"></a></li>
- <li><a href="{$U_MANAGE_RANKS}" title="{'manage photo ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/ranks.png" class="button" alt="{'ranks'|@translate}"></a></li>
{/if}
+ <li><a href="{$U_MANAGE_RANKS}" title="{'manage photo ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/ranks.png" class="button" alt="{'ranks'|@translate}"></a></li>
<li><a href="{$U_CHILDREN}" title="{'manage sub-albums'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_children.png" class="button" alt="{'sub-albums'|@translate}"></a></li>
{if isset($U_MANAGE_PERMISSIONS) }
<li><a href="{$U_MANAGE_PERMISSIONS}" title="{'edit album permissions'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_permissions.png" class="button" alt="{'Permissions'|@translate}"></a></li>
@@ -88,26 +88,6 @@
</table>
</fieldset>
-<fieldset id="image_order">
- <legend>{'Sort order'|@translate}</legend>
- <input type="checkbox" name="image_order_default" id="image_order_default" {$IMG_ORDER_DEFAULT}>
- <label for="image_order_default">{'Use the default photo sort order (defined in the configuration file)'|@translate}</label>
- <br>
- <input type="checkbox" name="image_order_subcats" id="image_order_subcats">
- <label for="image_order_subcats">{'Apply to sub-albums'|@translate}</label>
- <br>
-
- {foreach from=$image_orders item=order}
- <select name="order_field_{$order.ID}">
- {html_options options=$image_order_field_options selected=$order.FIELD }
- </select>
- <select name="order_direction_{$order.ID}">
- {html_options options=$image_order_direction_options selected=$order.DIRECTION }
- </select><br>
- {/foreach}
-
-</fieldset>
-
<p style="text-align:center;">
<input class="submit" type="submit" value="{'Submit'|@translate}" name="submit">
<input class="submit" type="reset" value="{'Reset'|@translate}" name="reset">
diff --git a/admin/themes/default/template/element_set_ranks.tpl b/admin/themes/default/template/element_set_ranks.tpl
index 84fc33b40..808f35531 100644
--- a/admin/themes/default/template/element_set_ranks.tpl
+++ b/admin/themes/default/template/element_set_ranks.tpl
@@ -36,12 +36,13 @@ jQuery(document).ready(function() {
<h3>{$CATEGORIES_NAV}</h3>
-{if !empty($thumbnails)}
<form action="{$F_ACTION}" method="post">
+{if !empty($thumbnails)}
<p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit"></p>
<fieldset>
- <legend>{'Edit ranks'|@translate}</legend>
+ <legend>{'Manual order'|@translate}</legend>
{if !empty($thumbnails)}
+ <p>{'Drag to re-order'|@translate}</p>
<ul class="thumbnails">
{foreach from=$thumbnails item=thumbnail}
<li class="rank-of-image">
@@ -50,12 +51,13 @@ jQuery(document).ready(function() {
<img src="{$thumbnail.TN_SRC}" class="thumbnail" alt="">
</div>
</div>
- <input type="text" name="rank_of_image[{$thumbnail.ID}]" value="{$thumbnail.RANK}">
+ <input type="text" name="rank_of_image[{$thumbnail.ID}]" value="{$thumbnail.RANK}" style="display:none">
</li>
{/foreach}
</ul>
{/if}
</fieldset>
+{/if}
<fieldset>
<legend>{'Sort order'|@translate}</legend>
@@ -65,11 +67,11 @@ jQuery(document).ready(function() {
</p>
<p class="field">
<input type="radio" name="image_order_choice" id="image_order_rank" value="rank"{if $image_order_choice=='rank'} checked="checked"{/if}>
- <label for="image_order_rank">{'By rank'|@translate}</label>
+ <label for="image_order_rank">{'manual order'|@translate}</label>
</p>
<p class="field">
<input type="radio" name="image_order_choice" id="image_order_user_define" value="user_define"{if $image_order_choice=='user_define'} checked="checked"{/if}>
- <label for="image_order_user_define">{'Manual order'|@translate}</label>
+ <label for="image_order_user_define">{'automatic order'|@translate}</label>
<div id="image_order_user_define_options">
{foreach from=$image_orders item=order}
<p class="field">
@@ -83,10 +85,12 @@ jQuery(document).ready(function() {
{/foreach}
</div>
</fieldset>
- <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit"></p>
-</form>
-
+ <p>
+ <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit">
-{else}
-<div class="infos"><p>{'No photo in this album'|@translate}</p></div>
-{/if}
+ <label>
+ <input type="checkbox" name="image_order_subcats" id="image_order_subcats">
+ {'Apply to sub-albums'|@translate}
+ </label>
+ </p>
+</form>
diff --git a/admin/themes/default/thumbnails.css b/admin/themes/default/thumbnails.css
index 993c21535..b43edd752 100644
--- a/admin/themes/default/thumbnails.css
+++ b/admin/themes/default/thumbnails.css
@@ -6,19 +6,18 @@ UL.thumbnails {
UL.thumbnails LI { display: inline }
UL.thumbnails li.rank-of-image {
float: left;
- background-color: #111;
- border: 1px solid #666;
+ background-color: #333;
color: #666;
- -moz-border-radius: 4px;
+ -moz-border-radius: 5px;
display: block;
width: 104px;
- height: 128px;
+ height: 104px;
cursor: move;
margin: 10px;
}
UL.thumbnails li.rank-of-image img {
margin: 0 20px;
- padding: 4px 2px;
+ padding: 8px 2px;
float: left;
}
.clipwrapper {
@@ -30,10 +29,6 @@ UL.thumbnails li.rank-of-image img {
position:absolute;
}
UL.thumbnails li.rank-of-image input {
- height: 12px;
- width: 50px;
- position: relative;
- top: 4px;
}
UL.thumbnails SPAN.wrap1 {
margin: 0 5px 5px 5px;