- 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.)

(not in ChangeLog, below this line)

- add forgotten notification.php (should have been added in a previous
  commit)

- [template cclear] deletion of useless class .bouton

- [template cclear] for test purpose, new presentation of register page
  (using FORM.filter)

- [template cclear] adaptation of admin/group_list from template default

- [template cclear] deletion of obsolete admin/infos_images

- [template cclear] deletion of obsolete admin/search_username

- [template cclear] new icon register.png


git-svn-id: http://piwigo.org/svn/trunk@850 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 25 insertions, 15 deletions

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</ul>",($ref_level-$level));
     }
     $ref_level = $level;
-    
-    $menu.= '
 
-           <li>';
-  
-    $url = add_session_id(PHPWG_ROOT_PATH.'category.php?cat='.$category['id']);
+    $menu.= '
 
-    $class = '';
+           <li';
     if (isset($page['cat'])
         and is_numeric($page['cat'])
         and $category['id'] == $page['cat'])
     {
-      $class = 'menuCategorySelected';
+      $menu.= ' class="selected"';
     }
-    else
-    {
-      $class = 'menuCategoryNotSelected';
-    }
-
+    $menu.= '>';
+  
+    $url = add_session_id(PHPWG_ROOT_PATH.'category.php?cat='.$category['id']);
     $menu.= '
-             <a href="'.$url.'" class="'.$class.'">'.$category['name'].'</a>';
+             <a href="'.$url.'">'.$category['name'].'</a>';
 
     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'],