harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename channel app events to calendar and add nav_set_selected() to /cal

Browse Source
This commit is contained in:
Mario Vavti 2017-11-07 11:22:11 +01:00
parent 1bb6dfc9a0
commit 47fbdda409
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Cal.php
View File

@ -70,6 +70,8 @@ class Cal extends \Zotlabs\Web\Controller {
return; return;
} }
nav_set_selected('Calendar');
$sql_extra = permissions_sql($channel['channel_id'],get_observer_hash(),'event'); $sql_extra = permissions_sql($channel['channel_id'],get_observer_hash(),'event');
$first_day = get_pconfig(local_channel(),'system','cal_first_day'); $first_day = get_pconfig(local_channel(),'system','cal_first_day');

6
include/nav.php
View File

@ -440,10 +440,10 @@ function channel_apps($is_owner = false, $nickname = null) {
if($p['view_stream'] && $cal_link) { if($p['view_stream'] && $cal_link) {
$tabs[] = [ $tabs[] = [
'label' => t('Events'), 'label' => t('Calendar'),
'url' => z_root() . $cal_link, 'url' => z_root() . $cal_link,
'sel' => ((argv(0) == 'cal' || argv(0) == 'events') ? 'active' : ''), 'sel' => ((argv(0) == 'cal') ? 'active' : ''),
'title' => t('Events'), 'title' => t('Calendar'),
'id' => 'event-tab', 'id' => 'event-tab',
'icon' => 'calendar' 'icon' => 'calendar'
]; ];

5
view/theme/redbasic/css/style.css
View File

@ -161,10 +161,6 @@ nav {
filter:alpha(opacity=$nav_percent_min_opacity); filter:alpha(opacity=$nav_percent_min_opacity);
} }
#nav-app-link {
white-space: nowrap;
}
#powered-by { #powered-by {
font-size: 0.5rem; font-size: 0.5rem;
position: absolute; position: absolute;
@ -1258,6 +1254,7 @@ img.mail-conv-sender-photo {
#nav-app-link { #nav-app-link {
padding: 0 !important; padding: 0 !important;
line-height: 1.175; line-height: 1.175;
white-space: nowrap;
} }
.page-title { .page-title {