From 68a6f0298e4ebbe74d353d130da0094490a4579c Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 30 Sep 2015 18:50:44 +0200 Subject: [PATCH] The events moved from the profile to the navigation bar - for supported themes --- boot.php | 1 + include/identity.php | 47 ++++++++++++++++++++------------------- include/nav.php | 1 + mod/events.php | 7 +++++- mod/notes.php | 2 ++ mod/photos.php | 2 ++ mod/videos.php | 2 ++ view/theme/vier/theme.php | 3 +++ 8 files changed, 41 insertions(+), 24 deletions(-) diff --git a/boot.php b/boot.php index 5f633fd878..b395d3423a 100644 --- a/boot.php +++ b/boot.php @@ -408,6 +408,7 @@ if(! class_exists('App')) { public $videoheight = 350; public $force_max_items = 0; public $theme_thread_allow = true; + public $theme_events_in_profile = true; // An array for all theme-controllable parameters // Mostly unimplemented yet. Only options 'stylesheet' and diff --git a/include/identity.php b/include/identity.php index 0fba0c592f..b4bc79e00f 100644 --- a/include/identity.php +++ b/include/identity.php @@ -501,7 +501,7 @@ if(! function_exists('get_events')) { } $today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false); - + $rr['title'] = $title; $rr['description'] = $desciption; $rr['date'] = day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ? ' ' . t('[today]') : ''); @@ -533,21 +533,21 @@ function advanced_profile(&$a) { if($a->profile['name']) { $tpl = get_markup_template('profile_advanced.tpl'); - + $profile = array(); - + $profile['fullname'] = array( t('Full Name:'), $a->profile['name'] ) ; - + if($a->profile['gender']) $profile['gender'] = array( t('Gender:'), $a->profile['gender'] ); - + if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { - + $year_bd_format = t('j F, Y'); $short_bd_format = t('j F'); - - $val = ((intval($a->profile['dob'])) + + $val = ((intval($a->profile['dob'])) ? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00',$year_bd_format)) : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],5) . ' 00:00 +00:00',$short_bd_format))); @@ -556,7 +556,7 @@ function advanced_profile(&$a) { } if($age = age($a->profile['dob'],$a->profile['timezone'],'')) $profile['age'] = array( t('Age:'), $age ); - + if($a->profile['marital']) $profile['marital'] = array( t('Status:'), $a->profile['marital']); @@ -591,7 +591,7 @@ function advanced_profile(&$a) { if($txt = prepare_text($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt); if($txt = prepare_text($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt); - + if($txt = prepare_text($a->profile['book'])) $profile['book'] = array( t('Books, literature:'), $txt); if($txt = prepare_text($a->profile['tv'])) $profile['tv'] = array( t('Television:'), $txt); @@ -599,14 +599,14 @@ function advanced_profile(&$a) { if($txt = prepare_text($a->profile['film'])) $profile['film'] = array( t('Film/dance/culture/entertainment:'), $txt); if($txt = prepare_text($a->profile['romance'])) $profile['romance'] = array( t('Love/Romance:'), $txt); - + if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt); if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt ); - + if ($a->profile['uid'] == local_user()) $profile['edit'] = array($a->get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile')); - + return replace_macros($tpl, array( '$title' => t('Profile'), '$profile' => $profile @@ -664,14 +664,15 @@ if(! function_exists('profile_tabs')){ ); if ($is_owner){ - $tabs[] = array( - 'label' => t('Events'), - 'url' => $a->get_baseurl() . '/events', - 'sel' =>((!isset($tab)&&$a->argv[0]=='events')?'active':''), - 'title' => t('Events and Calendar'), - 'id' => 'events-tab', - 'accesskey' => 'e', - ); + if ($a->theme_events_in_profile) + $tabs[] = array( + 'label' => t('Events'), + 'url' => $a->get_baseurl() . '/events', + 'sel' =>((!isset($tab)&&$a->argv[0]=='events')?'active':''), + 'title' => t('Events and Calendar'), + 'id' => 'events-tab', + 'accesskey' => 'e', + ); $tabs[] = array( 'label' => t('Personal Notes'), 'url' => $a->get_baseurl() . '/notes', @@ -737,8 +738,8 @@ function zrl($s,$force = false) { // Used from within PCSS themes to set theme parameters. If there's a // puid request variable, that is the "page owner" and normally their theme -// settings take precedence; unless a local user sets the "always_my_theme" -// system pconfig, which means they don't want to see anybody else's theme +// settings take precedence; unless a local user sets the "always_my_theme" +// system pconfig, which means they don't want to see anybody else's theme // settings except their own while on this site. function get_theme_uid() { diff --git a/include/nav.php b/include/nav.php index 972a6248c1..7fa9754ef1 100644 --- a/include/nav.php +++ b/include/nav.php @@ -240,6 +240,7 @@ function nav_set_selected($item){ 'settings' => null, 'contacts' => null, 'manage' => null, + 'events' => null, 'register' => null, ); $a->nav_sel[$item] = 'selected'; diff --git a/mod/events.php b/mod/events.php index ff61514170..c9c9b7d9f1 100644 --- a/mod/events.php +++ b/mod/events.php @@ -179,6 +179,10 @@ function events_content(&$a) { ); } + if ($a->theme_events_in_profile) + nav_set_selected('home'); + else + nav_set_selected('events'); $editselect = 'none'; if( feature_enabled(local_user(), 'richtext') ) @@ -249,7 +253,8 @@ function events_content(&$a) { $o =""; // tabs - $tabs = profile_tabs($a, True); + if ($a->theme_events_in_profile) + $tabs = profile_tabs($a, True); diff --git a/mod/notes.php b/mod/notes.php index b960924956..73c1507e3e 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -9,6 +9,8 @@ function notes_init(&$a) { $which = $a->user['nickname']; + nav_set_selected('home'); + // profile_load($a,$which,$profile); } diff --git a/mod/photos.php b/mod/photos.php index a19cfaaa72..6d147a6f55 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -17,6 +17,8 @@ function photos_init(&$a) { return; } + nav_set_selected('home'); + $o = ''; if($a->argc > 1) { diff --git a/mod/videos.php b/mod/videos.php index df47262f1d..a7d48cb751 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -15,6 +15,8 @@ function videos_init(&$a) { return; } + nav_set_selected('home'); + $o = ''; if($a->argc > 1) { diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index 7c94f001aa..c52a2be82e 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -10,6 +10,9 @@ */ function vier_init(&$a) { + +$a->theme_events_in_profile = false; + set_template_engine($a, 'smarty3'); $baseurl = $a->get_baseurl();