From 12bf0f72bb1e0c5d897bd7b11bea363cfb0b9e06 Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 20 Feb 2012 19:28:43 +0000 Subject: feature 2581: new design on albums list management. icons removed, replaced by text links visible on :hover better ergonomy for automatic order: the "save manual order" submit button only appears when a change is detected in the album ordering. The "automatic sort order" becomes a dedicated fieldset, hidden by default, displayed "on user demand". new virtual album form displayed only "on user demand" cat_list, cat_move and permalinks are 3 tabs for the "Albums > Manage" link in the menubar. permalinks admin page slightly redesign: fieldsets instead of centered h3, "on user demand" form to add/modify permalinks. git-svn-id: http://piwigo.org/svn/trunk@13282 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/themes/default/template/admin.tpl | 2 - admin/themes/default/template/cat_list.tpl | 200 ++++++++++++++++----------- admin/themes/default/template/cat_move.tpl | 6 +- admin/themes/default/template/permalinks.tpl | 67 ++++++--- admin/themes/default/theme.css | 26 ++-- 5 files changed, 189 insertions(+), 112 deletions(-) (limited to 'admin/themes/default') diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl index f9da9fccf..a35aab58a 100644 --- a/admin/themes/default/template/admin.tpl +++ b/admin/themes/default/template/admin.tpl @@ -49,9 +49,7 @@ Raphael("menubarUsers", 20, 16).path("").scale(0.6, 0.6, 0, 0).attr({fill: "#464
diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl index 51c9f9b03..47c32ff75 100644 --- a/admin/themes/default/template/cat_list.tpl +++ b/admin/themes/default/template/cat_list.tpl @@ -1,93 +1,118 @@ -{footer_script require='jquery.ui.sortable'} -jQuery(document).ready(function(){ldelim} - jQuery(".catPos").hide(); - jQuery(".drag_button").show(); - jQuery(".categoryLi").css("cursor","move"); - jQuery(".categoryUl").sortable({ldelim} - axis: "y", - opacity: 0.8 - }); - jQuery("#categoryOrdering").submit(function(){ldelim} - ar = jQuery('.categoryUl').sortable('toArray'); - for(i=0;i{$CATEGORIES_NAV} › {'Album list management'|@translate} -

{'Album list management'|@translate}

+
+ -

{$CATEGORIES_NAV}

+

+ + {'create a new album'|@translate} + | {'apply automatic sort order'|@translate} + + +

- -

- - {'Add a virtual album'|@translate} : - - {if count($categories)>9 } - - page_end - {/if} +

{if count($categories) } -
- -
- - - - -
+ -
- - {/if} + diff --git a/admin/themes/default/template/cat_move.tpl b/admin/themes/default/template/cat_move.tpl index d0dc98e13..d8a9c9430 100644 --- a/admin/themes/default/template/cat_move.tpl +++ b/admin/themes/default/template/cat_move.tpl @@ -1,6 +1,3 @@ - -{include file='include/resize.inc.tpl'} -

{'Move albums'|@translate}

@@ -28,9 +25,8 @@ -

+

-

diff --git a/admin/themes/default/template/permalinks.tpl b/admin/themes/default/template/permalinks.tpl index 57d8afa37..8ec0f3a6d 100644 --- a/admin/themes/default/template/permalinks.tpl +++ b/admin/themes/default/template/permalinks.tpl @@ -1,32 +1,62 @@ +{footer_script require='jquery.ui.sortable'}{literal} +jQuery(document).ready(function(){ + jQuery("#addPermalinkOpen").click(function(){ + jQuery("#addPermalink").show(); + jQuery("#showAddPermalink").hide(); + }); + + jQuery("#addPermalinkClose").click(function(){ + jQuery("#addPermalink").hide(); + jQuery("#showAddPermalink").show(); + }); +}); +{/literal}{/footer_script} + +{literal} + +{/literal} +

{'Permalinks'|@translate}

-
-
{'Add/delete a permalink'|@translate} -
-

{'Permalinks'|@translate}

- +
+ {'Permalinks'|@translate} +
@@ -40,16 +70,18 @@ {/foreach}
Id {$SORT_ID} {'Album'|@translate} {$SORT_NAME}
+ -

{'Permalink history'|@translate}

- +
+ {'Permalink history'|@translate} +
- + {foreach from=$deleted_permalinks item=permalink} @@ -64,3 +96,4 @@ {/foreach}
Id {$SORT_OLD_CAT_ID} {'Album'|@translate} {'Permalink'|@translate} {$SORT_OLD_PERMALINK} {'Deleted on'|@translate} {$SORT_OLD_DATE_DELETED} {'Last hit'|@translate} {$SORT_OLD_LAST_HIT}{'Hit'|@translate} {$SORT_OLD_HIT}{'Hit'|@translate} {$SORT_OLD_HIT}
+ \ No newline at end of file diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index dd49c3ee4..53f220fb6 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -151,26 +151,24 @@ SELECT.categoryList { width: 100%; } -FORM#categoryOrdering { - padding-left: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */ - padding-right: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */ -} FORM#categoryOrdering p { text-align: left; - margin-top: 1em; - margin-bottom: 1em; + /* margin-top: 1em; */ + /* margin-bottom: 1em; */ } UL.categoryUl { list-style: none; padding: 0; - margin: 0; + margin: 1em; } LI.categoryLi { +/* width: 100%; - border: 1px solid #666; - padding: 0px 5px; +*/ + padding: 5px; margin-bottom: 5px; + border-radius:5px; } FORM#categoryOrdering UL.categoryActions { @@ -1072,4 +1070,12 @@ p#uploadModeInfos {text-align:left;margin-top:1em;font-size:90%;color:#999;} #pendingComments .bottomButtons { text-align:left; -} \ No newline at end of file +} + +FORM#categoryOrdering p.albumTitle {margin:0;} +FORM#categoryOrdering p.albumActions {visibility:hidden; margin:0} +FORM#categoryOrdering .categoryLi:hover p.albumActions {visibility:visible;} + +.showCreateAlbum {text-align:left; margin:0 1em 1em 1em;line-height:22px;} +#autoOrder p, #createAlbum p {text-align:left; margin:0 0 1em 0;} +#autoOrder p.actionButtons, #createAlbum p.actionButtons {margin-bottom:0;} \ No newline at end of file -- cgit v1.2.3