From 4335e49381a766bc59b3ccd3df9c4981afab7603 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 22 Jul 2017 11:04:18 +0200 Subject: more nav_set_selected --- Zotlabs/Module/Bookmarks.php | 3 +++ Zotlabs/Module/Cdav.php | 2 ++ Zotlabs/Module/Chat.php | 6 ++++-- Zotlabs/Module/Invite.php | 4 +++- Zotlabs/Module/Lang.php | 1 + Zotlabs/Module/Mood.php | 8 ++++---- Zotlabs/Module/Poke.php | 4 +++- Zotlabs/Module/Probe.php | 4 +++- Zotlabs/Module/Rpost.php | 2 ++ Zotlabs/Module/Search.php | 2 +- Zotlabs/Module/Suggest.php | 2 ++ Zotlabs/Module/Webpages.php | 4 +++- view/theme/redbasic/css/style.css | 5 +++++ view/tpl/nav.tpl | 2 +- 14 files changed, 37 insertions(+), 12 deletions(-) diff --git a/Zotlabs/Module/Bookmarks.php b/Zotlabs/Module/Bookmarks.php index 682f8e76c..e62f5ce96 100644 --- a/Zotlabs/Module/Bookmarks.php +++ b/Zotlabs/Module/Bookmarks.php @@ -7,6 +7,9 @@ class Bookmarks extends \Zotlabs\Web\Controller { function init() { if(! local_channel()) return; + + nav_set_selected(t('View Bookmarks')); + $item_id = intval($_REQUEST['item']); $burl = trim($_REQUEST['burl']); diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php index b1d99620b..bc563ab43 100644 --- a/Zotlabs/Module/Cdav.php +++ b/Zotlabs/Module/Cdav.php @@ -765,6 +765,7 @@ class Cdav extends \Zotlabs\Web\Controller { } if(argv(1) === 'calendar') { + nav_set_selected(t('CalDAV')); $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo); $calendars = $caldavBackend->getCalendarsForUser($principalUri); } @@ -965,6 +966,7 @@ class Cdav extends \Zotlabs\Web\Controller { if(argv(1) === 'addressbook') { + nav_set_selected(t('CardDAV')); $carddavBackend = new \Sabre\CardDAV\Backend\PDO($pdo); $addressbooks = $carddavBackend->getAddressBooksForUser($principalUri); } diff --git a/Zotlabs/Module/Chat.php b/Zotlabs/Module/Chat.php index 23a3e65da..138ca1cb5 100644 --- a/Zotlabs/Module/Chat.php +++ b/Zotlabs/Module/Chat.php @@ -89,9 +89,11 @@ class Chat extends \Zotlabs\Web\Controller { function get() { - if(local_channel()) + if(local_channel()) { $channel = \App::get_channel(); - + nav_set_selected(t('My Chatrooms')); + } + $ob = \App::get_observer(); $observer = get_observer_hash(); if(! $observer) { diff --git a/Zotlabs/Module/Invite.php b/Zotlabs/Module/Invite.php index 927e7beae..bbd98150d 100644 --- a/Zotlabs/Module/Invite.php +++ b/Zotlabs/Module/Invite.php @@ -88,12 +88,14 @@ class Invite extends \Zotlabs\Web\Controller { } - function get() { + function get() { if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } + + nav_set_selected(t('Invite')); $tpl = get_markup_template('invite.tpl'); $invonly = false; diff --git a/Zotlabs/Module/Lang.php b/Zotlabs/Module/Lang.php index 69f10fe6d..84776c3ea 100644 --- a/Zotlabs/Module/Lang.php +++ b/Zotlabs/Module/Lang.php @@ -5,6 +5,7 @@ namespace Zotlabs\Module; class Lang extends \Zotlabs\Web\Controller { function get() { + nav_set_selected(t('Language')); return lang_selector(); } diff --git a/Zotlabs/Module/Mood.php b/Zotlabs/Module/Mood.php index eeb050040..85c8a3042 100644 --- a/Zotlabs/Module/Mood.php +++ b/Zotlabs/Module/Mood.php @@ -110,17 +110,17 @@ class Mood extends \Zotlabs\Web\Controller { - function get() { + function get() { if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } - + + nav_set_selected(t('Mood')); + $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0'); - - $verbs = get_mood_verbs(); $shortlist = array(); diff --git a/Zotlabs/Module/Poke.php b/Zotlabs/Module/Poke.php index ea50e821a..0bd1187c7 100644 --- a/Zotlabs/Module/Poke.php +++ b/Zotlabs/Module/Poke.php @@ -143,12 +143,14 @@ class Poke extends \Zotlabs\Web\Controller { - function get() { + function get() { if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } + + nav_set_selected(t('Poke')); $name = ''; $id = ''; diff --git a/Zotlabs/Module/Probe.php b/Zotlabs/Module/Probe.php index 7fc0e8ff5..859bed315 100644 --- a/Zotlabs/Module/Probe.php +++ b/Zotlabs/Module/Probe.php @@ -7,7 +7,9 @@ require_once('include/zot.php'); class Probe extends \Zotlabs\Web\Controller { function get() { - + + nav_set_selected(t('Remote Diagnostics')); + $o .= '

Probe Diagnostic

'; $o .= '
'; diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index 1349cd1c5..731eab82e 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -59,6 +59,8 @@ class Rpost extends \Zotlabs\Web\Controller { } return login(); } + + nav_set_selected(t('Post')); // If we have saved rpost session variables, but nothing in the current $_REQUEST, recover the saved variables diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php index 2b949ebc7..f95ae5e68 100644 --- a/Zotlabs/Module/Search.php +++ b/Zotlabs/Module/Search.php @@ -22,7 +22,7 @@ class Search extends \Zotlabs\Web\Controller { if($load) $_SESSION['loadtime'] = datetime_convert(); - nav_set_selected('search'); + nav_set_selected(t('Search')); require_once("include/bbcode.php"); require_once('include/security.php'); diff --git a/Zotlabs/Module/Suggest.php b/Zotlabs/Module/Suggest.php index 2a69145ed..c3f4a6d5a 100644 --- a/Zotlabs/Module/Suggest.php +++ b/Zotlabs/Module/Suggest.php @@ -28,6 +28,8 @@ class Suggest extends \Zotlabs\Web\Controller { notice( t('Permission denied.') . EOL); return; } + + nav_set_selected(t('Suggest Channels')); $_SESSION['return_url'] = z_root() . '/' . \App::$cmd; diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index d59fcdb9f..e449a790f 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -34,7 +34,9 @@ class Webpages extends \Zotlabs\Web\Controller { \App::$error = 404; return; } - + + nav_set_selected(t('Webpages')); + $which = argv(1); $_SESSION['return_url'] = \App::$query_string; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7f2ca4853..2c881049e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1380,6 +1380,11 @@ blockquote { background-color: $item_colour; } +.dropdown-item.active { + color: #fff; + background-color: #007bff; +} + .bg-dark { background-color: $nav_bg !important; } diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 93bbe187f..cb0e2af32 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,5 +1,5 @@ {{if $nav.login && !$userinfo}} -
+
{{$nav.loginmenu.1.1}} -- cgit v1.2.3 From f4a4d70149b74a73faf5e777350d76946eeefe93 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 22 Jul 2017 12:01:13 +0200 Subject: indicate the selected channel in the dropdown menu and minor css fixes --- view/css/mod_manage.css | 12 ------------ view/tpl/channel.tpl | 6 +++--- view/tpl/nav.tpl | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/view/css/mod_manage.css b/view/css/mod_manage.css index 077b6b838..b08c90b62 100644 --- a/view/css/mod_manage.css +++ b/view/css/mod_manage.css @@ -4,10 +4,6 @@ text-decoration: none; } -.new-notification { - color: #c60032; -} - .channel-photo-wrapper { display: table-cell; table-layout: fixed; @@ -24,11 +20,3 @@ vertical-align: top; padding-left: 10px; } - -.selected-channel { - color: green; -} - -#all-channels-end { - margin-bottom: 20px; -} diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index 1a84f1e66..63e09ec05 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -17,7 +17,7 @@

{{if $selected == $channel.channel_id}} - + {{/if}} {{if $channel.delegate}} @@ -37,11 +37,11 @@
{{if !$channel.delegate}}
- + {{if $channel.mail != 0}}{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}{{/if}}
- + {{if $channel.intros != 0}}{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}{{/if}}
{{/if}} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index cb0e2af32..288a15f2c 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -26,7 +26,7 @@ {{/if}} {{if $nav.channels}} {{foreach $nav.channels as $chan}} - {{$chan.channel_name}} + {{$chan.channel_name}} {{/foreach}} {{/if}} {{if $nav.profiles}} -- cgit v1.2.3 From 16067db718b0746892a5c81782ee72e21554b62c Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 22 Jul 2017 12:46:02 +0200 Subject: show the right conversation active and do not show any conversation active if we compose a new one --- Zotlabs/Widget/Conversations.php | 4 +++- view/tpl/mail_list.tpl | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Widget/Conversations.php b/Zotlabs/Widget/Conversations.php index 4fd754f66..56510750f 100644 --- a/Zotlabs/Widget/Conversations.php +++ b/Zotlabs/Widget/Conversations.php @@ -40,6 +40,8 @@ class Conversations { foreach($r as $rr) { + $selected = ((argc() == 3) ? intval(argv(2)) == intval($rr['id']) : $r[0]['id'] == $rr['id']); + $messages[] = array( 'mailbox' => $mailbox, 'id' => $rr['id'], @@ -54,7 +56,7 @@ class Conversations { 'body' => $rr['body'], 'date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], 'c'), 'seen' => $rr['seen'], - 'selected' => ((argc() == 2) ? (intval(argv(1)) == intval($rr['id'])) : ($r[0]['id'] == $rr['id'])) + 'selected' => ((argv(1) != 'new') ? $selected : '') ); } diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 827c7628f..65d8dcdb4 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,6 +1,6 @@
  • - {{$message.subject}}
    + {{$message.subject}}
    {{$message.from_name}} > {{$message.to_name}}
    {{$message.date}}     -- cgit v1.2.3 From 72ed290ccd63d8cc92d50ed8239159a2f3fa307a Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 22 Jul 2017 16:23:41 +0200 Subject: add text-dark class to cat tagsinput --- view/theme/redbasic/js/redbasic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 14b977b80..a4fee495c 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -55,7 +55,7 @@ $(document).ready(function() { }); $("input[data-role=cat-tagsinput]").tagsinput({ - tagClass: 'badge badge-pill badge-warning' + tagClass: 'badge badge-pill badge-warning text-dark' }); var doctitle = document.title; -- cgit v1.2.3 From 5cc8837fb6605d18f09693e4ca418b8a5d38f57b Mon Sep 17 00:00:00 2001 From: git-marijus Date: Tue, 25 Jul 2017 20:06:01 +0200 Subject: make local channel (not our own) nav menus appear similar to what we are used from remote channels --- include/nav.php | 17 +++++++++-------- view/tpl/nav.tpl | 11 +++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/nav.php b/include/nav.php index f6c8aa23f..4cb2e7fa6 100644 --- a/include/nav.php +++ b/include/nav.php @@ -42,7 +42,7 @@ EOT; $observer = App::get_observer(); require_once('include/conversation.php'); - $is_owner = (((local_channel()) && (App::$profile['profile_uid'] == local_channel())) ? true : false); + $is_owner = (((local_channel()) && ((App::$profile_uid == local_channel()) || (App::$profile_uid == 0))) ? true : false); $channel_apps[] = channel_apps($is_owner, App::$profile['channel_address']); $myident = (($channel) ? $channel['xchan_addr'] : ''); @@ -93,8 +93,6 @@ EOT; if(local_channel()) { - - if($chans && count($chans) > 1 && feature_enabled(local_channel(),'nav_channel_select')) $nav['channels'] = $chans; @@ -134,12 +132,12 @@ EOT; $homelink = (($observer) ? $observer['xchan_url'] : ''); } - if(! local_channel()) { + if(! $is_owner) { $nav['rusermenu'] = array( $homelink, t('Take me home'), 'logout', - t('Log me out of this site') + ((local_channel()) ? t('Logout') : t('Log me out of this site')) ); } @@ -170,7 +168,6 @@ EOT; if(local_channel()) { - $nav['network'] = array('network', t('Grid'), "", t('Your grid'),'network_nav_btn'); $nav['network']['all'] = [ 'network', t('View your network/grid'), '','' ]; $nav['network']['mark'] = array('', t('Mark all grid notifications seen'), '',''); @@ -221,7 +218,7 @@ EOT; $powered_by = ''; //app bin - if(local_channel()) { + if($is_owner) { if(get_pconfig(local_channel(), 'system','initial_import_system_apps') === false) { Zlib\Apps::import_system_apps(); set_pconfig(local_channel(), 'system','initial_import_system_apps', 1); @@ -245,7 +242,10 @@ EOT; $syslist = Zlib\Apps::app_order(local_channel(),$syslist); foreach($syslist as $app) { - $nav_apps[] = Zlib\Apps::app_render($app,'nav'); + if($is_owner) + $nav_apps[] = Zlib\Apps::app_render($app,'nav'); + elseif(! $is_owner && strpos($app['requires'], 'local_channel') === false) + $nav_apps[] = Zlib\Apps::app_render($app,'nav'); } $tpl = get_markup_template('nav.tpl'); @@ -259,6 +259,7 @@ EOT; '$emptynotifications' => t('Loading...'), '$userinfo' => $x['usermenu'], '$localuser' => local_channel(), + '$is_owner' => $is_owner, '$sel' => App::$nav_sel, '$powered_by' => $powered_by, '$help' => t('@name, #tag, ?doc, content'), diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 288a15f2c..c0b34bbe8 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -16,7 +16,7 @@ {{$userinfo.name}}
    • - {{if $localuser}} + {{if $is_owner}}
    {{foreach $nav.usermenu as $usermenu}} {{$usermenu.1}} @@ -45,14 +45,13 @@ {{$nav.logout.1}} {{/if}}
    - {{else}} - {{if $nav.rusermenu}} + {{/if}} + {{if ! $is_owner}} {{/if}} - {{/if}}

    {{/if}}
    @@ -204,7 +203,7 @@ {{if $channel_apps.0}}
    {{/if}} - {{if $localuser}} + {{if $is_owner}}
    {{$addapps}} {{$orderapps}} @@ -230,7 +229,7 @@ {{if $channel_apps.0}} {{/if}} - {{if $localuser}} + {{if $is_owner}}
    {{$addapps}} {{$orderapps}} -- cgit v1.2.3 From caf077cbf893cd02932194e1641c861ffcc2e339 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Tue, 25 Jul 2017 20:07:16 +0200 Subject: version 2.5.10 --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 061c14554..d5d2d9c6e 100755 --- a/boot.php +++ b/boot.php @@ -49,7 +49,7 @@ require_once('include/hubloc.php'); require_once('include/attach.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '2.5.9' ); +define ( 'STD_VERSION', '2.5.10' ); define ( 'ZOT_REVISION', '1.2' ); define ( 'DB_UPDATE_VERSION', 1192 ); -- cgit v1.2.3