Index: /trunk/admin.php =================================================================== --- /trunk/admin.php (revision 13281) +++ /trunk/admin.php (revision 13282) @@ -197,5 +197,4 @@ 'U_CONFIG_THEMES'=> $link_start.'themes', 'U_CATEGORIES'=> $link_start.'cat_list', - 'U_MOVE'=> $link_start.'cat_move', 'U_CAT_OPTIONS'=> $link_start.'cat_options', 'U_CAT_UPDATE'=> $link_start.'site_update&site=1', @@ -206,5 +205,4 @@ 'U_USERS'=> $link_start.'user_list', 'U_GROUPS'=> $link_start.'group_list', - 'U_PERMALINKS'=> $link_start.'permalinks', 'U_RETURN'=> get_gallery_home_url(), 'U_ADMIN'=> PHPWG_ROOT_PATH.'admin.php', Index: /trunk/admin/cat_list.php =================================================================== --- /trunk/admin/cat_list.php (revision 13281) +++ /trunk/admin/cat_list.php (revision 13282) @@ -101,4 +101,11 @@ // +-----------------------------------------------------------------------+ +// | tabs | +// +-----------------------------------------------------------------------+ + +$page['tab'] = 'list'; +include(PHPWG_ROOT_PATH.'admin/include/albums_tab.inc.php'); + +// +-----------------------------------------------------------------------+ // | virtual categories management | // +-----------------------------------------------------------------------+ @@ -135,19 +142,17 @@ } // save manual category ordering -else if (isset($_POST['submitOrder'])) -{ - if ('manual' == $_POST['order_type']) - { - asort($_POST['catOrd'], SORT_NUMERIC); - save_categories_order(array_keys($_POST['catOrd'])); - - array_push( - $page['infos'], - l10n('Album manual order was saved') - ); - } - else - { - $query = ' +else if (isset($_POST['submitManualOrder'])) +{ + asort($_POST['catOrd'], SORT_NUMERIC); + save_categories_order(array_keys($_POST['catOrd'])); + + array_push( + $page['infos'], + l10n('Album manual order was saved') + ); +} +else if (isset($_POST['submitAutoOrder'])) +{ + $query = ' SELECT id FROM '.CATEGORIES_TABLE.' @@ -155,49 +160,48 @@ (!isset($_GET['parent_id']) ? 'IS NULL' : '= '.$_GET['parent_id']).' ;'; - $category_ids = array_from_query($query, 'id'); - - if (isset($_POST['recursive'])) - { - $category_ids = get_subcat_ids($category_ids); - } - - $categories = array(); - $names = array(); - $id_uppercats = array(); + $category_ids = array_from_query($query, 'id'); + + if (isset($_POST['recursive'])) + { + $category_ids = get_subcat_ids($category_ids); + } - $query = ' + $categories = array(); + $names = array(); + $id_uppercats = array(); + + $query = ' SELECT id, name, id_uppercat FROM '.CATEGORIES_TABLE.' WHERE id IN ('.implode(',', $category_ids).') ;'; - $result = pwg_query($query); - while ($row = pwg_db_fetch_assoc($result)) - { - array_push( - $categories, - array( - 'id' => $row['id'], - 'id_uppercat' => $row['id_uppercat'], - ) - ); - array_push( - $names, - $row['name'] - ); - } - - array_multisort( + $result = pwg_query($query); + while ($row = pwg_db_fetch_assoc($result)) + { + array_push( + $categories, + array( + 'id' => $row['id'], + 'id_uppercat' => $row['id_uppercat'], + ) + ); + array_push( $names, - SORT_REGULAR, - 'asc' == $_POST['ascdesc'] ? SORT_ASC : SORT_DESC, - $categories + $row['name'] ); - save_categories_order($categories); - - array_push( - $page['infos'], - l10n('Albums automatically sorted') - ); - } + } + + array_multisort( + $names, + SORT_REGULAR, + 'asc' == $_POST['ascdesc'] ? SORT_ASC : SORT_DESC, + $categories + ); + save_categories_order($categories); + + array_push( + $page['infos'], + l10n('Albums automatically sorted') + ); } Index: /trunk/admin/cat_move.php =================================================================== --- /trunk/admin/cat_move.php (revision 13281) +++ /trunk/admin/cat_move.php (revision 13282) @@ -72,4 +72,11 @@ // +-----------------------------------------------------------------------+ +// | tabs | +// +-----------------------------------------------------------------------+ + +$page['tab'] = 'move'; +include(PHPWG_ROOT_PATH.'admin/include/albums_tab.inc.php'); + +// +-----------------------------------------------------------------------+ // | Categories display | // +-----------------------------------------------------------------------+ Index: /trunk/admin/include/albums_tab.inc.php =================================================================== --- /trunk/admin/include/albums_tab.inc.php (revision 13282) +++ /trunk/admin/include/albums_tab.inc.php (revision 13282) @@ -0,0 +1,35 @@ +add('list', l10n('List'), $my_base_url.'cat_list'); +$tabsheet->add('move', l10n('Move'), $my_base_url.'cat_move'); +$tabsheet->add('permalinks', l10n('Permalinks'), $my_base_url.'permalinks'); +$tabsheet->select($page['tab']); +$tabsheet->assign(); + +?> Index: /trunk/admin/permalinks.php =================================================================== --- /trunk/admin/permalinks.php (revision 13281) +++ /trunk/admin/permalinks.php (revision 13282) @@ -50,5 +50,5 @@ { $url = $base_url; - $disp = '⇓'; // TODO: an small image is better + $disp = '↓'; // TODO: an small image is better if ( $field !== @$_GET[$get_param] ) @@ -106,4 +106,12 @@ $template->set_filename('permalinks', 'permalinks.tpl' ); + +// +-----------------------------------------------------------------------+ +// | tabs | +// +-----------------------------------------------------------------------+ + +$page['tab'] = 'permalinks'; +include(PHPWG_ROOT_PATH.'admin/include/albums_tab.inc.php'); + $query = ' Index: /trunk/admin/themes/clear/theme.css =================================================================== --- /trunk/admin/themes/clear/theme.css (revision 13281) +++ /trunk/admin/themes/clear/theme.css (revision 13282) @@ -117,5 +117,5 @@ label { cursor:pointer } .categoryLi, .menuLi { background: #ddd } -.virtual_cat, .menuLi_hidden { background: #ccc !important; } +.menuLi_hidden { background: #ccc !important; } a.Piwigo { font-family: verdana, arial, helvetica, sans-serif !important; @@ -312,2 +312,4 @@ color:white; } + +p.albumTitle img {margin-bottom:-3px;} Index: /trunk/admin/themes/default/template/admin.tpl =================================================================== --- /trunk/admin/themes/default/template/admin.tpl (revision 13281) +++ /trunk/admin/themes/default/template/admin.tpl (revision 13282) @@ -50,7 +50,5 @@
Index: /trunk/admin/themes/default/template/cat_list.tpl =================================================================== --- /trunk/admin/themes/default/template/cat_list.tpl (revision 13281) +++ /trunk/admin/themes/default/template/cat_list.tpl (revision 13282) @@ -1,60 +1,108 @@ -{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+ + {'Cancel'|@translate} +
+ {if count($categories) } - - - -{/if} Index: /trunk/admin/themes/default/template/cat_move.tpl =================================================================== --- /trunk/admin/themes/default/template/cat_move.tpl (revision 13281) +++ /trunk/admin/themes/default/template/cat_move.tpl (revision 13282) @@ -1,5 +1,2 @@ - -{include file='include/resize.inc.tpl'} -+
-
Index: /trunk/admin/themes/default/template/permalinks.tpl =================================================================== --- /trunk/admin/themes/default/template/permalinks.tpl (revision 13281) +++ /trunk/admin/themes/default/template/permalinks.tpl (revision 13282) @@ -1,31 +1,61 @@ +{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} +