diff --git a/about.php b/about.php index 41b68b220..9f37275f5 100644 --- a/about.php +++ b/about.php @@ -33,17 +33,16 @@ include_once( PHPWG_ROOT_PATH.'include/common.inc.php' ); // Start output of page // $title= $lang['about_page_title']; +$page['body_id'] = 'theAboutPage'; include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames(array('about'=>'about.tpl')); -$template->assign_vars(array( - 'PAGE_TITLE' => $title, - 'L_ABOUT' => $lang['about_message'], - 'L_RETURN' => $lang['home'], - 'L_RETURN_HINT' => $lang['home_hint'], - 'U_RETURN' => add_session_id(PHPWG_ROOT_PATH.'category.php?'.$_SERVER['QUERY_STRING']) - ) - ); +$template->assign_vars( + array( + 'L_ABOUT' => $lang['about_message'], + 'U_HOME' => add_session_id(PHPWG_ROOT_PATH.'category.php') + ) + ); $template->parse('about'); include(PHPWG_ROOT_PATH.'include/page_tail.php'); diff --git a/admin.php b/admin.php index 28c7dc992..b2113b22a 100644 --- a/admin.php +++ b/admin.php @@ -57,6 +57,8 @@ $conf_link = $link_start.'configuration&section='; $opt_link = $link_start.'cat_options&section='; //----------------------------------------------------- template initialization $title = l10n('PhpWebGallery administration'); // for include/page_header.php +$page['gallery_title'] = l10n('PhpWebGallery Administration'); +$page['body_id'] = 'theAdminPage'; include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames(array('admin' => 'admin.tpl')); diff --git a/admin/search.php b/admin/search.php deleted file mode 100644 index 482d6afbc..000000000 --- a/admin/search.php +++ /dev/null @@ -1,108 +0,0 @@ -set_filenames( array('search'=>'admin/search_username.tpl') ); -$template->assign_vars(array( - 'USERNAME'=>( !empty($search_match) ) ? strip_tags($search_match) : '', - - 'L_SEARCH_USERNAME'=>$lang['Find_username'], - 'L_SEARCH'=>$lang['search'], - 'L_SEARCH_EXPLAIN'=>$lang['search_explain'], - 'L_SELECT'=>$lang['Select'], - 'L_UPDATE_USERNAME'=>$lang['Look_up_user'], - 'L_CLOSE_WINDOW'=>$lang['Close'], - - 'F_SEARCH_ACTION' => add_session_id($_SERVER['PHP_SELF']), - )); - -//----------------------------------------------------------------- form action -// -// Define initial vars -// -if ( isset($_POST['mode']) || isset($_GET['mode']) ) -{ - $mode = ( isset($_POST['mode']) ) ? $_POST['mode'] : $_GET['mode']; -} -else -{ - $mode = ''; -} -$search_match = ''; -if ( isset($_POST['search_username']) ) -{ - $search_match = $_POST['search_username']; -} - -$username_list = ''; -if ( !empty($search_match) ) -{ - $username_search = preg_replace('/\*/', '%', trim(strip_tags($search_match))); - - $sql = "SELECT username - FROM " . USERS_TABLE . " - WHERE username LIKE '" . str_replace("\'", "''", $username_search) . "' - AND id <> ".$conf['guest_id']." - ORDER BY username"; - if ( !($result = pwg_query($sql)) ) - { - die('Could not obtain search results'); - } - - if ( $row = mysql_fetch_array($result) ) - { - do - { - $username_list .= ''; - } - while ( $row = mysql_fetch_array($result) ); - } - else - { - $username_list .= ''; - } - mysql_free_result($result); -} - -//------------------------------------------------------------------ users list -if ( !empty($username_list)) -{ - $template->assign_block_vars('switch_select_name', array( - 'F_USERNAME_OPTIONS'=>$username_list - )); -} - -$template->parse('search'); -include(PHPWG_ROOT_PATH.'include/page_tail.php'); -?> \ No newline at end of file diff --git a/admin/user_list.php b/admin/user_list.php index aa1bbff22..e4a4c6d7e 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -124,17 +124,29 @@ DELETE FROM '.USER_GROUP_TABLE.' $formfields = array('nb_image_line', 'nb_line_page', 'template', 'language', - 'recent_period', 'expand', 'show_nb_comments', 'maxwidth', + 'recent_period', 'maxwidth', 'expand', 'show_nb_comments', 'maxheight', 'status'); - + + $true_false_fields = array('expand', 'show_nb_comments'); + foreach ($formfields as $formfield) { - if ($_POST[$formfield.'_action'] != 'leave') + // special for true/false fields + if (in_array($formfield, $true_false_fields)) + { + $test = $formfield; + } + else + { + $test = $formfield.'_action'; + } + + if ($_POST[$test] != 'leave') { array_push($dbfields['update'], $formfield); } } - + // updating elements is useful only if needed... if (count($dbfields['update']) > 0) { @@ -150,7 +162,8 @@ DELETE FROM '.USER_GROUP_TABLE.' { // if the action is 'unset', the key won't be in row and // mass_updates function will set this field to NULL - if ('set' == $_POST[$dbfield.'_action']) + if (in_array($dbfield, $true_false_fields) + or 'set' == $_POST[$dbfield.'_action']) { $data[$dbfield] = $_POST[$dbfield]; } @@ -165,6 +178,10 @@ DELETE FROM '.USER_GROUP_TABLE.' array_push($datas, $data); } +// echo '
';
+//       print_r($datas);
+//       echo '
'; + mass_updates(USER_INFOS_TABLE, $dbfields, $datas); } } @@ -366,12 +383,6 @@ else 'MAXWIDTH' => @$conf['default_maxwidth'], 'MAXHEIGHT' => @$conf['default_maxheight'], 'RECENT_PERIOD' => $conf['recent_period'], - 'EXPAND_YES' => $conf['auto_expand'] ? 'checked="checked"' : '', - 'EXPAND_NO' => !$conf['auto_expand'] ? 'checked="checked"' : '', - 'SHOW_NB_COMMENTS_YES' => - $conf['show_nb_comments'] ? 'checked="checked"' : '', - 'SHOW_NB_COMMENTS_NO' => - !$conf['show_nb_comments'] ? 'checked="checked"' : '' )); } diff --git a/category.php b/category.php index cfef60065..7e2a037f5 100644 --- a/category.php +++ b/category.php @@ -112,6 +112,7 @@ if ( $user['expand'] ) // Start output of page // $title = $page['title']; +$page['body_id'] = 'theCategoryPage'; include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames( array('category'=>'category.tpl') ); @@ -134,7 +135,8 @@ if ( isset( $page['cat_nb_images'] ) and $page['cat_nb_images'] > 0 ) $icon_recent = get_icon(date('Y-m-d')); -$template->assign_vars(array( +$template->assign_vars( + array( 'NB_PICTURE' => count_user_total_images(), 'TITLE' => $template_title, 'USERNAME' => $user['username'], diff --git a/comments.php b/comments.php index 6b949eb31..a2fdc466f 100644 --- a/comments.php +++ b/comments.php @@ -165,11 +165,10 @@ UPDATE '.COMMENTS_TABLE.' // +-----------------------------------------------------------------------+ // | page header and options | // +-----------------------------------------------------------------------+ -if (!defined('IN_ADMIN')) -{ - $title= l10n('title_comments'); - include(PHPWG_ROOT_PATH.'include/page_header.php'); -} + +$title= l10n('title_comments'); +$page['body_id'] = 'theCommentsPage'; +include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames(array('comments'=>'comments.tpl')); $template->assign_vars( diff --git a/doc/ChangeLog b/doc/ChangeLog index 7d325c215..cdf5bc542 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,22 @@ +2005-08-26 Pierrick LE GALL + + * new : HTML BODY identifier to let CSS stylesheets manage + specific behaviour. + + * deletion : admin/search useless + + * improvement : in admin/user_list, special behaviour for + true/false fields (expand, show_comments) + + * new : gallery_title and gallery_description are displayed at the + top of each page. + + * improvement : simplification in HTML for categories menu. + + * improvement : standardization of presentation in all public + pages (identification, registration, search, profile, + notification, comments, etc.) + 2005-08-25 Pierrick LE GALL * deletion : no mail notification anymore. Feature replaced by RSS diff --git a/identification.php b/identification.php index 2301934dd..79157e632 100644 --- a/identification.php +++ b/identification.php @@ -64,6 +64,7 @@ SELECT '.$conf['user_fields']['id'].' AS id, // Start output of page // $title = $lang['identification']; +$page['body_id'] = 'theIdentificationPage'; include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames( array('identification'=>'identification.tpl') ); diff --git a/include/config_default.inc.php b/include/config_default.inc.php index e13090fd4..62e4a2782 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -270,9 +270,13 @@ $conf['allow_random_representative'] = false; // category and element description. $conf['allow_html_descriptions'] = true; -// gallery_title : Title for RSS feed -$conf['gallery_title'] = 'PhpWebGallery demo'; +// gallery_title : Title at top of each page and for RSS feed +$conf['gallery_title'] = 'PhpWebGallery demonstration site'; + +// gallery_description : Short description displayed with gallery title +$conf['gallery_description'] = 'My photos web site'; // galery_url : URL given in RSS feed $conf['gallery_url'] = 'http://demo.phpwebgallery.net'; + ?> diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index b797d2657..b3aacb70d 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -374,27 +374,21 @@ function get_html_menu_category($categories) $menu.= str_repeat("\n",($ref_level-$level)); } $ref_level = $level; - + $menu.= ' -
  • '; - - $url = add_session_id(PHPWG_ROOT_PATH.'category.php?cat='.$category['id']); - - $class = ''; + '.$category['name'].''; + '.$category['name'].''; if ($category['nb_images'] > 0) { diff --git a/include/page_header.php b/include/page_header.php index 7b00e7055..8bf830cf5 100644 --- a/include/page_header.php +++ b/include/page_header.php @@ -35,6 +35,18 @@ $css.= '/'.$user['template'].'.css'; $template->assign_vars( array( + 'GALLERY_TITLE' => + isset($page['gallery_title']) ? + $page['gallery_title'] : $conf['gallery_title'], + + 'GALLERY_DESCRIPTION' => + isset($page['gallery_description']) ? + $page['gallery_description'] : $conf['gallery_description'], + + 'BODY_ID' => + isset($page['body_id']) ? + $page['body_id'] : '', + 'CONTENT_ENCODING' => $lang_info['charset'], 'PAGE_TITLE' => $title, 'LANG'=>$lang_info['code'], diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php index c53518b8c..2793b9a30 100644 --- a/language/en_UK.iso-8859-1/common.lang.php +++ b/language/en_UK.iso-8859-1/common.lang.php @@ -224,11 +224,10 @@ $lang['total'] = 'images'; // About $lang['about_page_title'] = 'About PhpWebGallery'; $lang['about_title'] = 'About...'; -$lang['about_message'] = '
    Information about PhpWebGallery
    - -

    +

    @@ -152,7 +152,7 @@

    -

    +

    diff --git a/template/cclear/admin/group_list.tpl b/template/cclear/admin/group_list.tpl index 3a5688af0..4344c10da 100644 --- a/template/cclear/admin/group_list.tpl +++ b/template/cclear/admin/group_list.tpl @@ -1,52 +1,27 @@ - -
    -
      - -
    • {errors.error.ERROR}
      • - -
    -
    - - -
    {L_GROUP_SELECT}
    - -{S_GROUP_SELECT}   - -
    -{L_GROUP_CONFIRM} -
    - - - -
    -
    - -
    {L_GROUP_EDIT} [{edit_group.GROUP_NAME}]
    - - - - - - - - - - - +

    {lang:title_groups}

    + + +
    + {lang:Add group} + + +
    + + +
    {L_USER_NAME}{L_USER_EMAIL}{L_USER_SELECT}
    {edit_group.user.NAME}{edit_group.user.EMAIL}
    + + + + - - - - + + + + + + +
    {lang:Group name}{lang:Members}{lang:Actions}
    - -
    {group.NAME}{group.MEMBERS} + permissions + delete +
    -
    - - - - -
    -
    - - \ No newline at end of file diff --git a/template/cclear/admin/group_perm.tpl b/template/cclear/admin/group_perm.tpl index 9bf490e5b..91c2f637a 100644 --- a/template/cclear/admin/group_perm.tpl +++ b/template/cclear/admin/group_perm.tpl @@ -1,7 +1,7 @@ - -
    -
    {L_GROUP_SELECT}
    - {S_GROUP_SELECT}   - +

    {TITLE}

    + + + {DOUBLE_SELECT}
    - \ No newline at end of file + +

    {lang:Only private categories are listed}

    diff --git a/template/cclear/admin/infos_images.tpl b/template/cclear/admin/infos_images.tpl deleted file mode 100644 index 2e786483b..000000000 --- a/template/cclear/admin/infos_images.tpl +++ /dev/null @@ -1,96 +0,0 @@ - -
    -
      - -
    • {errors.error.ERROR}
      • - -
    -
    - - -
    -
    {L_INFOS_TITLE} "{CATEGORY}"
    - - - - - - - - - - - - - - - - -
    {L_AUTHOR}
    		 - - - - {L_INFOS_OVERALL_USE} -
    -
    {L_INFOS_CREATION_DATE} [DD/MM/YYYY]
    -     		- - - - {L_INFOS_OVERALL_USE} -
    -
    {L_KEYWORD} {L_KEYWORD_SEPARATION}
    -     		- - - - {L_INFOS_ADDTOALL} - - {L_INFOS_REMOVEFROMALL} -
    -
    -
    {L_INFOS_DETAIL}
    -
    {NAV_BAR}
    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {L_THUMBNAIL}{L_INFOS_IMG}{L_AUTHOR}{L_INFOS_COMMENT}{L_INFOS_CREATION_DATE}{L_KEYWORD}
    -
    - -
    -     		{picture.DEFAULTNAME_IMG}
    - ↑ - {L_INFOS_ASSOCIATE} - -
    - -
    -
    diff --git a/template/cclear/admin/remote_site.tpl b/template/cclear/admin/remote_site.tpl index 4b8260279..f4b31d1e4 100644 --- a/template/cclear/admin/remote_site.tpl +++ b/template/cclear/admin/remote_site.tpl @@ -55,7 +55,7 @@
    {L_REMOTE_SITE_CREATE} - +
    diff --git a/template/cclear/admin/search_username.tpl b/template/cclear/admin/search_username.tpl deleted file mode 100644 index f3e676f8d..000000000 --- a/template/cclear/admin/search_username.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -
    {L_SEARCH_USERNAME}
    - -   -
    - {L_SEARCH_EXPLAIN}
    - - {L_UPDATE_USERNAME}
    -   -
    - -
    {L_CLOSE_WINDOW} - diff --git a/template/cclear/admin/thumbnail.tpl b/template/cclear/admin/thumbnail.tpl index e6e140f7d..aa8bbcd0f 100644 --- a/template/cclear/admin/thumbnail.tpl +++ b/template/cclear/admin/thumbnail.tpl @@ -98,7 +98,7 @@
    - +
    diff --git a/template/cclear/admin/update.tpl b/template/cclear/admin/update.tpl index 182a9a868..8e952c329 100644 --- a/template/cclear/admin/update.tpl +++ b/template/cclear/admin/update.tpl @@ -79,8 +79,8 @@

    - - + +

    diff --git a/template/cclear/admin/user_list.tpl b/template/cclear/admin/user_list.tpl index a66c6f4ba..ad6b18678 100644 --- a/template/cclear/admin/user_list.tpl +++ b/template/cclear/admin/user_list.tpl @@ -1,11 +1,11 @@ -

    {lang:title_liste_users}

    +

    {lang:title_liste_users}

    {lang:Add a user} - +
    @@ -60,7 +60,7 @@ - + @@ -68,14 +68,14 @@
    - +
    - - - - - - + + + + + + @@ -90,13 +90,34 @@
    {L_USERNAME}{L_STATUS}{L_EMAIL}{L_GROUPS}{L_ACTIONS} {L_USERNAME}{L_STATUS}{L_EMAIL}{lang:Groups}{L_ACTIONS}
    +
    {NAVBAR}
    {lang:Deletions} - {lang:confirm} - + + +
    + +
    + {lang:Status} + + + + + + +
    {L_STATUS} + + + +
    +
    @@ -139,8 +160,8 @@ {L_NB_IMAGE_LINE} - leave unchanged - set to + + @@ -149,8 +170,8 @@ {L_NB_LINE_PAGE} - leave unchanged - set to + + @@ -159,8 +180,8 @@ {L_TEMPLATE} - leave unchanged - set to + + leave unchanged - set to + + leave unchanged - set to + + @@ -195,33 +216,29 @@ {L_EXPAND} - leave unchanged - set to - {L_YES} - {L_NO} + + / {lang:set to} + + {L_SHOW_NB_COMMENTS} - leave unchanged - set to - {L_YES} - {L_NO} + + / {lang:set to} + + {L_MAXWIDTH} - leave unchanged - unset - set to + + + @@ -231,40 +248,28 @@ {L_MAXHEIGHT} - leave unchanged - unset - set to + + + - - {L_STATUS} - - leave unchanged - set to - - - -

    - target - all - selection +

    + {lang:target} +

    -

    - - +

    + +

    diff --git a/template/cclear/admin/user_perm.tpl b/template/cclear/admin/user_perm.tpl index e3944fe42..a24fd9096 100644 --- a/template/cclear/admin/user_perm.tpl +++ b/template/cclear/admin/user_perm.tpl @@ -1,6 +1,21 @@ -
    {L_SELECT_USERNAME}
    -
    - - - -
    \ No newline at end of file +

    {TITLE}

    + + +
    + {lang:Categories authorized thanks to group associations} + +
      + +
    • {groups.category.NAME}
      • + +
    +
    + + +
    + {lang:Other private categories} + +
    + {DOUBLE_SELECT} +
    +
    diff --git a/template/cclear/category.tpl b/template/cclear/category.tpl index 17ff0d2bb..bb218f9be 100644 --- a/template/cclear/category.tpl +++ b/template/cclear/category.tpl @@ -1,6 +1,4 @@ -

    PhpWebGallery demonstration site

    - + + diff --git a/template/cclear/notification.tpl b/template/cclear/notification.tpl index ac50a7d8f..cc4a0ee9f 100644 --- a/template/cclear/notification.tpl +++ b/template/cclear/notification.tpl @@ -1,4 +1,13 @@ -{lang:The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.} +
    -

    {lang:RSS feed}

    -

    {lang:Return to home page}

    +
    +
      +
    • {lang:home}
      • +
    +

    {lang:Notification}

    +
    + +

    {lang:The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.}

    + +

    {lang:RSS feed}

    +
    diff --git a/template/cclear/profile.tpl b/template/cclear/profile.tpl index 429999397..76fe2dba6 100644 --- a/template/cclear/profile.tpl +++ b/template/cclear/profile.tpl @@ -76,10 +76,11 @@ -

    - - +

    + +

    +

    [{L_RETURN}]

    diff --git a/template/cclear/register.tpl b/template/cclear/register.tpl index 8bae0bc16..c696bfe8b 100644 --- a/template/cclear/register.tpl +++ b/template/cclear/register.tpl @@ -1,59 +1,42 @@ -

    {L_TITLE}

    +
    + +
    + +
    +
      +
    • {lang:home}
      • +
    +

    {lang:Registration}

    +
    + -
    - - - - - + +
    +
      + +
    • {errors.error.ERROR}
      • + +
    +
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
      - -
    • {errors.error.ERROR}
      • - -
    -
    -
    {L_USERNAME} - -
    {L_PASSWORD} - -
    {L_CONFIRM_PASSWORD} - -
    {L_EMAIL} - -
     
    - -
    - [ {L_GUEST} ] -
    + + +
    + {lang:Enter your personnal informations} + + + + + +
    + +

    + +

    +
    + +
    +
    diff --git a/template/cclear/search.tpl b/template/cclear/search.tpl index 93315a663..75147cffa 100644 --- a/template/cclear/search.tpl +++ b/template/cclear/search.tpl @@ -1,4 +1,12 @@ -

    {L_SEARCH_TITLE}

    +
    + +
    +
      +
    • {lang:home}
      • +
    +

    {lang:Search}

    +
    +
    @@ -11,9 +19,6 @@
    - - -
    {L_SEARCH_TITLE}
    {L_SEARCH_KEYWORDS} :
    {L_SEARCH_KEYWORDS_HINT}    		 @@ -129,4 +134,5 @@
    -[ {L_RETURN} ] + + diff --git a/template/cclear/theme/register.png b/template/cclear/theme/register.png new file mode 100644 index 000000000..a28069cb7 Binary files /dev/null and b/template/cclear/theme/register.png differ