From b00d0842439da9f88b4be690a5c382d5192631f0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 2 Sep 2016 15:05:19 +0200 Subject: [PATCH] show home icon in first position in nav, provide register link also if register policy is set to approve and whitespace cleanup --- include/nav.php | 4 +-- view/tpl/nav.tpl | 74 +++++++++++++++++++++++++----------------------- 2 files changed, 41 insertions(+), 37 deletions(-) diff --git a/include/nav.php b/include/nav.php index 9b6896d15..4d411e603 100644 --- a/include/nav.php +++ b/include/nav.php @@ -145,10 +145,10 @@ EOT; $homelink = (($observer) ? $observer['xchan_url'] : ''); } - if((App::$module != 'home') && (! (local_channel()))) + if(! local_channel()) $nav['home'] = array($homelink, t('Home'), "", t('Home Page'),'home_nav_btn'); - if((App::$config['system']['register_policy'] == REGISTER_OPEN) && (! $_SESSION['authenticated'])) + if((App::$config['system']['register_policy'] == REGISTER_OPEN) || (App::$config['system']['register_policy'] == REGISTER_APPROVE) && (! $_SESSION['authenticated'])) $nav['register'] = array('register',t('Register'), "", t('Create an account'),'register_nav_btn'); if(! get_config('system','hide_help')) { diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 5be6d21bd..23a9977ad 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -52,41 +52,6 @@