From e38092f36cac68694ee891f6e90399240b88a58a Mon Sep 17 00:00:00 2001 From: mistic100 Date: Mon, 9 May 2011 15:04:15 +0000 Subject: restore HOME links, change parameter name for remove menu on certain page git-svn-id: http://piwigo.org/svn/trunk@10824 68402e56-0260-453c-a942-63ccdbb3a9ee --- about.php | 2 +- comments.php | 2 +- identification.php | 2 +- nbm.php | 2 +- notification.php | 2 +- password.php | 2 +- picture.php | 2 +- profile.php | 2 +- register.php | 2 +- search.php | 2 +- tags.php | 2 +- themes/default/template/about.tpl | 6 +++++- themes/default/template/comments.tpl | 6 +++++- themes/default/template/identification.tpl | 6 +++++- themes/default/template/nbm.tpl | 6 +++++- themes/default/template/notification.tpl | 6 +++++- themes/default/template/password.tpl | 6 +++++- themes/default/template/profile.tpl | 6 +++++- themes/default/template/register.tpl | 6 +++++- themes/default/template/search.tpl | 3 +++ themes/default/template/tags.tpl | 3 +++ 21 files changed, 57 insertions(+), 19 deletions(-) diff --git a/about.php b/about.php index ec524938a..5d23ca8d0 100644 --- a/about.php +++ b/about.php @@ -51,7 +51,7 @@ if ( $theme_about !== false ) // include menubar $themeconf = $template->get_template_vars('themeconf'); -if (!isset($themeconf['Exclude']) OR !in_array('theAboutPage', $themeconf['Exclude'])) +if (!isset($themeconf['hide_menu_on']) OR !in_array('theAboutPage', $themeconf['hide_menu_on'])) { include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); } diff --git a/comments.php b/comments.php index 40a3f7338..3acef27bc 100644 --- a/comments.php +++ b/comments.php @@ -530,7 +530,7 @@ SELECT c.id, name, permalink, uppercats, com.id as comment_id // include menubar $themeconf = $template->get_template_vars('themeconf'); -if (!isset($themeconf['Exclude']) OR !in_array('theCommentsPage', $themeconf['Exclude'])) +if (!isset($themeconf['hide_menu_on']) OR !in_array('theCommentsPage', $themeconf['hide_menu_on'])) { include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); } diff --git a/identification.php b/identification.php index 20be085b1..c66edcbb7 100644 --- a/identification.php +++ b/identification.php @@ -98,7 +98,7 @@ if ( sizeof( $errors ) != 0 ) // include menubar $themeconf = $template->get_template_vars('themeconf'); -if (!isset($themeconf['Exclude']) OR !in_array('theIdentificationPage', $themeconf['Exclude'])) +if (!isset($themeconf['hide_menu_on']) OR !in_array('theIdentificationPage', $themeconf['hide_menu_on'])) { include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); } diff --git a/nbm.php b/nbm.php index d98f8c1ac..e9e541cad 100644 --- a/nbm.php +++ b/nbm.php @@ -80,7 +80,7 @@ $template->assign( // include menubar $themeconf = $template->get_template_vars('themeconf'); -if (!isset($themeconf['Exclude']) OR !in_array('theNBMPage', $themeconf['Exclude'])) +if (!isset($themeconf['hide_menu_on']) OR !in_array('theNBMPage', $themeconf['hide_menu_on'])) { include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); } diff --git a/notification.php b/notification.php index d89d00c29..c799cdf00 100644 --- a/notification.php +++ b/notification.php @@ -80,7 +80,7 @@ $template->assign( // include menubar $themeconf = $template->get_template_vars('themeconf'); -if (!isset($themeconf['Exclude']) OR !in_array('theNotificationPage', $themeconf['Exclude'])) +if (!isset($themeconf['hide_menu_on']) OR !in_array('theNotificationPage', $themeconf['hide_menu_on'])) { include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); } diff --git a/password.php b/password.php index d47d75c65..acbeedd19 100644 --- a/password.php +++ b/password.php @@ -155,7 +155,7 @@ $template->assign('infos', $page['infos']); // include menubar $themeconf = $template->get_template_vars('themeconf'); -if (!isset($themeconf['Exclude']) OR !in_array('thePasswordPage', $themeconf['Exclude'])) +if (!isset($themeconf['hide_menu_on']) OR !in_array('thePasswordPage', $themeconf['hide_menu_on'])) { include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); } diff --git a/picture.php b/picture.php index b62f1ab5b..3970839fe 100644 --- a/picture.php +++ b/picture.php @@ -1042,7 +1042,7 @@ if ($metadata_showable and pwg_get_session_var('show_metadata') <> null ) // include menubar $themeconf = $template->get_template_vars('themeconf'); -if ($conf['picture_menu'] AND (!isset($themeconf['Exclude']) OR !in_array('theIdentificationPage', $themeconf['Exclude']))) +if ($conf['picture_menu'] AND (!isset($themeconf['hide_menu_on']) OR !in_array('thePicturePage', $themeconf['hide_menu_on']))) { include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); if (is_admin()) $template->assign('U_ADMIN', $url_admin); // overwrited by the menu diff --git a/profile.php b/profile.php index ee17b26ed..2580b375c 100644 --- a/profile.php +++ b/profile.php @@ -85,7 +85,7 @@ SELECT '.implode(',', $fields).' // include menubar $themeconf = $template->get_template_vars('themeconf'); - if (!isset($themeconf['Exclude']) OR !in_array('theProfilePage', $themeconf['Exclude'])) + if (!isset($themeconf['hide_menu_on']) OR !in_array('theProfilePage', $themeconf['hide_menu_on'])) { include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); } diff --git a/register.php b/register.php index af90bbfa4..29a72a92e 100644 --- a/register.php +++ b/register.php @@ -98,7 +98,7 @@ if (count($errors) != 0) // include menubar $themeconf = $template->get_template_vars('themeconf'); -if (!isset($themeconf['Exclude']) OR !in_array('theRegisterPage', $themeconf['Exclude'])) +if (!isset($themeconf['hide_menu_on']) OR !in_array('theRegisterPage', $themeconf['hide_menu_on'])) { include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); } diff --git a/search.php b/search.php index 7cfbab3ae..f59323db9 100644 --- a/search.php +++ b/search.php @@ -230,7 +230,7 @@ if (sizeof($errors) != 0) // include menubar $themeconf = $template->get_template_vars('themeconf'); -if (!isset($themeconf['Exclude']) OR !in_array('theSearchPage', $themeconf['Exclude'])) +if (!isset($themeconf['hide_menu_on']) OR !in_array('theSearchPage', $themeconf['hide_menu_on'])) { include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); } diff --git a/tags.php b/tags.php index 2681e5363..9167ddd83 100644 --- a/tags.php +++ b/tags.php @@ -193,7 +193,7 @@ foreach ($tags as $tag) // include menubar $themeconf = $template->get_template_vars('themeconf'); -if (!isset($themeconf['Exclude']) OR !in_array('theTagsPage', $themeconf['Exclude'])) +if (!isset($themeconf['hide_menu_on']) OR !in_array('theTagsPage', $themeconf['hide_menu_on'])) { include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); } diff --git a/themes/default/template/about.tpl b/themes/default/template/about.tpl index f86d7bef3..55f2ec830 100644 --- a/themes/default/template/about.tpl +++ b/themes/default/template/about.tpl @@ -1,7 +1,11 @@ {if isset($MENUBAR)}{$MENUBAR}{/if}
-
    +

    {'About'|@translate}

    diff --git a/themes/default/template/comments.tpl b/themes/default/template/comments.tpl index 543a15cb8..ab1455590 100644 --- a/themes/default/template/comments.tpl +++ b/themes/default/template/comments.tpl @@ -2,7 +2,11 @@
    -
      +

      {'User comments'|@translate}

      diff --git a/themes/default/template/identification.tpl b/themes/default/template/identification.tpl index 2741e685b..5ccfb7133 100644 --- a/themes/default/template/identification.tpl +++ b/themes/default/template/identification.tpl @@ -2,7 +2,11 @@
      -
        +

        {'Identification'|@translate}

        diff --git a/themes/default/template/nbm.tpl b/themes/default/template/nbm.tpl index 2227e1453..943f9cdc7 100644 --- a/themes/default/template/nbm.tpl +++ b/themes/default/template/nbm.tpl @@ -1,7 +1,11 @@ {if isset($MENUBAR)}{$MENUBAR}{/if}
        -
          +

          {'Notification'|@translate}

          diff --git a/themes/default/template/notification.tpl b/themes/default/template/notification.tpl index 62a6d47cd..3bd8a4d1f 100644 --- a/themes/default/template/notification.tpl +++ b/themes/default/template/notification.tpl @@ -7,7 +7,11 @@
          -
            +

            {'Notification'|@translate}

            diff --git a/themes/default/template/password.tpl b/themes/default/template/password.tpl index 8b7390e4b..6c6f9a35d 100644 --- a/themes/default/template/password.tpl +++ b/themes/default/template/password.tpl @@ -2,7 +2,11 @@
            -
              +

              {'Password forgotten'|@translate}

              diff --git a/themes/default/template/profile.tpl b/themes/default/template/profile.tpl index 0c23b7ee1..7870cf832 100644 --- a/themes/default/template/profile.tpl +++ b/themes/default/template/profile.tpl @@ -12,7 +12,11 @@ {/if}
              -
                +

                {'Profile'|@translate}

                diff --git a/themes/default/template/register.tpl b/themes/default/template/register.tpl index a96200f8a..b173061cf 100644 --- a/themes/default/template/register.tpl +++ b/themes/default/template/register.tpl @@ -4,7 +4,11 @@
                -
                  +

                  {'Registration'|@translate}

                  diff --git a/themes/default/template/search.tpl b/themes/default/template/search.tpl index 1a9a685d7..f56cb26a2 100644 --- a/themes/default/template/search.tpl +++ b/themes/default/template/search.tpl @@ -23,6 +23,9 @@
                •  {'Help'|@translate}
                  • +
                • +  {'Home'|@translate} +

                  • {'Search'|@translate}

                  diff --git a/themes/default/template/tags.tpl b/themes/default/template/tags.tpl index 05b739fe4..af80502a1 100644 --- a/themes/default/template/tags.tpl +++ b/themes/default/template/tags.tpl @@ -13,6 +13,9 @@  {'letters'|@translate} {/if} +
                • +  {'Home'|@translate} +

                  • {'Tags'|@translate}

                  -- cgit v1.2.3