diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-11-07 11:22:11 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2017-11-11 20:25:32 +0100 |
| commit | 8260817cf702382d27a7d5006eea2c172a09b798 (patch) | |
| tree | a95c17a49c8ea93d16a8f298a91ca70822ab69e6 | |
| parent | 47d15f3bf4ce105c00bd77a0c86db9bf6350560a (diff) | |
| download | volse-hubzilla-8260817cf702382d27a7d5006eea2c172a09b798.tar.gz volse-hubzilla-8260817cf702382d27a7d5006eea2c172a09b798.tar.bz2 volse-hubzilla-8260817cf702382d27a7d5006eea2c172a09b798.zip | |
rename channel app events to calendar and add nav_set_selected() to /cal
| -rw-r--r-- | Zotlabs/Module/Cal.php | 2 | ||||
| -rw-r--r-- | include/nav.php | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 5 |
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 f70e5cb3b..6b98a807d 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 15bc3c219..d67fc4379 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 { |