From 114ae324452ac88fe7b672338cba931d838ee2a4 Mon Sep 17 00:00:00 2001 From: plegall Date: Wed, 15 Mar 2006 22:44:35 +0000 Subject: new: cleaner URL. Instead of category.php?cat=search&search=123&start=42, you now have category.php?/search/123/start-42. Functions make_index_url and make_picture_url build these new URLs. Functions duplicate_picture_url and duplicate_index_url provide shortcuts to URL creation. The current main page page is still category.php but this can be modified easily in make_index_url function. In this first version, no backward compatibility. Calendar definition in URL must be discussed with rvelices. improvement: picture.php redesigned. First actions like "set as representative" or "delete a comment" which all lead to a redirection. Then the page (the big mess) and includes of new sub pages to manage specific parts of the page (metadata, user comments, rates). new: with the cleaner URL comes a new terminology. $page['cat'] doesn't exist anymore. $page['section'] is among 'categories', 'tags' (TODO), 'list', 'most_seen'... And sub parameters are set : $page['category'] if $page['section'] is "categories". See URL analyse in include/section_init.inc.php for details. git-svn-id: http://piwigo.org/svn/trunk@1082 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/cat_modify.php | 69 +++++++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 31 deletions(-) (limited to 'admin/cat_modify.php') diff --git a/admin/cat_modify.php b/admin/cat_modify.php index d1aad58c0..cfff0d31f 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.php @@ -269,37 +269,44 @@ if (!empty($category['id_uppercat'])) $self_url.= '&parent_id='.$category['id_uppercat']; } -$template->assign_vars(array( - 'CATEGORIES_NAV'=>$navigation, - 'CAT_NAME'=>$category['name'], - 'CAT_COMMENT'=>$category['comment'], - - $status=>'checked="checked"', - $lock=>'checked="checked"', - $commentable=>'checked="checked"', - $uploadable=>'checked="checked"', - - 'L_EDIT_NAME'=>$lang['name'], - 'L_STORAGE'=>$lang['storage'], - 'L_REMOTE_SITE'=>$lang['remote_site'], - 'L_EDIT_COMMENT'=>$lang['description'], - 'L_EDIT_STATUS'=>$lang['conf_access'], - 'L_STATUS_PUBLIC'=>$lang['public'], - 'L_STATUS_PRIVATE'=>$lang['private'], - 'L_EDIT_LOCK'=>$lang['lock'], - 'L_EDIT_UPLOADABLE'=>$lang['editcat_uploadable'], - 'L_EDIT_COMMENTABLE'=>$lang['comments'], - 'L_YES'=>$lang['yes'], - 'L_NO'=>$lang['no'], - 'L_SUBMIT'=>$lang['submit'], - 'L_SET_RANDOM_REPRESENTANT'=>$lang['cat_representant'], - - 'U_JUMPTO'=>PHPWG_ROOT_PATH.'category.php?cat='.$category['id'], - 'U_CHILDREN'=>$cat_list_url.'&parent_id='.$category['id'], - 'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=cat_modify', - - 'F_ACTION'=>$form_action - )); +$template->assign_vars( + array( + 'CATEGORIES_NAV' => $navigation, + 'CAT_NAME' => $category['name'], + 'CAT_COMMENT' => $category['comment'], + + $status => 'checked="checked"', + $lock => 'checked="checked"', + $commentable => 'checked="checked"', + $uploadable => 'checked="checked"', + + 'L_EDIT_NAME' => $lang['name'], + 'L_STORAGE' => $lang['storage'], + 'L_REMOTE_SITE' => $lang['remote_site'], + 'L_EDIT_COMMENT' => $lang['description'], + 'L_EDIT_STATUS' => $lang['conf_access'], + 'L_STATUS_PUBLIC' => $lang['public'], + 'L_STATUS_PRIVATE' => $lang['private'], + 'L_EDIT_LOCK' => $lang['lock'], + 'L_EDIT_UPLOADABLE' => $lang['editcat_uploadable'], + 'L_EDIT_COMMENTABLE' => $lang['comments'], + 'L_YES' => $lang['yes'], + 'L_NO' => $lang['no'], + 'L_SUBMIT' => $lang['submit'], + 'L_SET_RANDOM_REPRESENTANT'=>$lang['cat_representant'], + + 'U_JUMPTO' => make_index_url( + array( + 'category' => $category['id'], + ) + ), + + 'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'], + 'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=cat_modify', + + 'F_ACTION' => $form_action, + ) + ); if ('private' == $category['status']) -- cgit v1.2.3