aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-11-07 11:22:11 +0100
committerMario Vavti <mario@mariovavti.com>2017-11-07 11:22:11 +0100
commit47fbdda40951be5109c739f63331e2bb95ebd64a (patch)
treeef425faa148dd59d83d77e4ea2fdefee6d889324
parent1bb6dfc9a03550063d5b25fd804e586d45eb61fa (diff)
downloadvolse-hubzilla-47fbdda40951be5109c739f63331e2bb95ebd64a.tar.gz
volse-hubzilla-47fbdda40951be5109c739f63331e2bb95ebd64a.tar.bz2
volse-hubzilla-47fbdda40951be5109c739f63331e2bb95ebd64a.zip
rename channel app events to calendar and add nav_set_selected() to /cal
-rw-r--r--Zotlabs/Module/Cal.php2
-rw-r--r--include/nav.php6
-rw-r--r--view/theme/redbasic/css/style.css5
3 files changed, 6 insertions, 7 deletions
diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php
index 41676ce02..c8403e979 100644
--- a/Zotlabs/Module/Cal.php
+++ b/Zotlabs/Module/Cal.php
@@ -69,6 +69,8 @@ class Cal extends \Zotlabs\Web\Controller {
notice( t('Permissions denied.') . EOL);
return;
}
+
+ nav_set_selected('Calendar');
$sql_extra = permissions_sql($channel['channel_id'],get_observer_hash(),'event');
diff --git a/include/nav.php b/include/nav.php
index 42c42e881..9df50c9fe 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -440,10 +440,10 @@ function channel_apps($is_owner = false, $nickname = null) {
if($p['view_stream'] && $cal_link) {
$tabs[] = [
- 'label' => t('Events'),
+ 'label' => t('Calendar'),
'url' => z_root() . $cal_link,
- 'sel' => ((argv(0) == 'cal' || argv(0) == 'events') ? 'active' : ''),
- 'title' => t('Events'),
+ 'sel' => ((argv(0) == 'cal') ? 'active' : ''),
+ 'title' => t('Calendar'),
'id' => 'event-tab',
'icon' => 'calendar'
];
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index fd155c71a..1b991ce17 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -161,10 +161,6 @@ nav {
filter:alpha(opacity=$nav_percent_min_opacity);
}
-#nav-app-link {
- white-space: nowrap;
-}
-
#powered-by {
font-size: 0.5rem;
position: absolute;
@@ -1258,6 +1254,7 @@ img.mail-conv-sender-photo {
#nav-app-link {
padding: 0 !important;
line-height: 1.175;
+ white-space: nowrap;
}
.page-title {