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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs 2017-07-25 16:02:41 -07:00
commit 08f15a6fc6
21 changed files with 61 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Module/Bookmarks.php
View File

@ -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']);

2
Zotlabs/Module/Cdav.php
View File

@ -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);
}

4
Zotlabs/Module/Chat.php
View File

@ -89,8 +89,10 @@ 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();

2
Zotlabs/Module/Invite.php
View File

@ -95,6 +95,8 @@ class Invite extends \Zotlabs\Web\Controller {
return;
}
nav_set_selected(t('Invite'));
$tpl = get_markup_template('invite.tpl');
$invonly = false;

1
Zotlabs/Module/Lang.php
View File

@ -5,6 +5,7 @@ namespace Zotlabs\Module;
class Lang extends \Zotlabs\Web\Controller {
function get() {
nav_set_selected(t('Language'));
return lang_selector();
}

4
Zotlabs/Module/Mood.php
View File

@ -117,10 +117,10 @@ class Mood extends \Zotlabs\Web\Controller {
return;
}
nav_set_selected(t('Mood'));
$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
$verbs = get_mood_verbs();
$shortlist = array();

2
Zotlabs/Module/Poke.php
View File

@ -150,6 +150,8 @@ class Poke extends \Zotlabs\Web\Controller {
return;
}
nav_set_selected(t('Poke'));
$name = '';
$id = '';

2
Zotlabs/Module/Probe.php
View File

@ -8,6 +8,8 @@ class Probe extends \Zotlabs\Web\Controller {
function get() {
nav_set_selected(t('Remote Diagnostics'));
$o .= '<h3>Probe Diagnostic</h3>';
$o .= '<form action="probe" method="get">';

2
Zotlabs/Module/Rpost.php
View File

@ -60,6 +60,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
if((! array_key_exists('body',$_REQUEST)) && (array_key_exists('rpost',$_SESSION))) {

2
Zotlabs/Module/Search.php
View File

@ -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');

2
Zotlabs/Module/Suggest.php
View File

@ -29,6 +29,8 @@ class Suggest extends \Zotlabs\Web\Controller {
return;
}
nav_set_selected(t('Suggest Channels'));
$_SESSION['return_url'] = z_root() . '/' . \App::$cmd;
$r = suggestion_query(local_channel(),get_observer_hash());

2
Zotlabs/Module/Webpages.php
View File

@ -35,6 +35,8 @@ class Webpages extends \Zotlabs\Web\Controller {
return;
}
nav_set_selected(t('Webpages'));
$which = argv(1);
$_SESSION['return_url'] = \App::$query_string;

4
Zotlabs/Widget/Conversations.php
View File

@ -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 : '')
);
}

2
boot.php
View File

@ -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.3' );
define ( 'DB_UPDATE_VERSION', 1192 );

15
include/nav.php
View File

@ -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,6 +242,9 @@ EOT;
$syslist = Zlib\Apps::app_order(local_channel(),$syslist);
foreach($syslist as $app) {
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');
}
@ -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'),

12
view/css/mod_manage.css
View File

@ -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;
}

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

@ -1380,6 +1380,11 @@ blockquote {
background-color: $item_colour;
}
.dropdown-item.active {
color: #fff;
background-color: #007bff;
}
.bg-dark {
background-color: $nav_bg !important;
}

2
view/theme/redbasic/js/redbasic.js
View File

@ -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;

6
view/tpl/channel.tpl
View File

@ -17,7 +17,7 @@
</div>
<h3>
{{if $selected == $channel.channel_id}}
<i class="selected-channel fa fa-circle" title="{{$msg_selected}}"></i>
<i class="fa fa-circle text-success" title="{{$msg_selected}}"></i>
{{/if}}
{{if $channel.delegate}}
<i class="fa fa-arrow-circle-right" title="{{$delegated_desc}}"></i>
@ -37,11 +37,11 @@
<div class="channel-notifications-wrapper">
{{if !$channel.delegate}}
<div class="channel-notification">
<i class="fa fa-envelope{{if $channel.mail != 0}} new-notification{{/if}}"></i>
<i class="fa fa-fw fa-envelope{{if $channel.mail != 0}} text-danger{{/if}}"></i>
{{if $channel.mail != 0}}<a href="manage/{{$channel.channel_id}}/mail/combined">{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}</a>{{/if}}
</div>
<div class="channel-notification">
<i class="fa fa-user{{if $channel.intros != 0}} new-notification{{/if}}"></i>
<i class="fa fa-fw fa-user{{if $channel.intros != 0}} text-danger{{/if}}"></i>
{{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}}
</div>
{{/if}}

2
view/tpl/mail_list.tpl
View File

@ -1,6 +1,6 @@
<li class="nav-item">
<a href="mail/{{$message.mailbox}}/{{$message.id}}" class="nav-link{{if $message.selected}} active{{/if}}">
<span class="{{if $message.seen}}seen{{else}}unseen{{/if}}">{{$message.subject}}</span><br>
<span class="{{if ! $message.seen || $message.selected}}font-weight-bold{{/if}}">{{$message.subject}}</span><br>
<span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br>
<span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span>
</a>

15
view/tpl/nav.tpl
View File

@ -1,5 +1,5 @@
{{if $nav.login && !$userinfo}}
<div class="d-md-none p-1">
<div class="d-md-none pt-1 pb-1">
<a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login">
{{$nav.loginmenu.1.1}}
</a>
@ -16,7 +16,7 @@
<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
<i class="fa fa-caret-down"></i>
</div>
{{if $localuser}}
{{if $is_owner}}
<div class="dropdown-menu">
{{foreach $nav.usermenu as $usermenu}}
<a class="dropdown-item{{if $usermenu.2}} active{{/if}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
@ -26,7 +26,7 @@
{{/if}}
{{if $nav.channels}}
{{foreach $nav.channels as $chan}}
<a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a>
<a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem"><i class="fa fa-circle{{if $localuser == $chan.channel_id}} text-success{{else}} invisible{{/if}}"></i> {{$chan.channel_name}}</a>
{{/foreach}}
{{/if}}
{{if $nav.profiles}}
@ -45,14 +45,13 @@
<a class="dropdown-item" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a>
{{/if}}
</div>
{{else}}
{{if $nav.rusermenu}}
{{/if}}
{{if ! $is_owner}}
<div class="dropdown-menu" role="menu" aria-labelledby="avatar">
<a class="dropdown-item" href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a>
<a class="dropdown-item" href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a>
</div>
{{/if}}
{{/if}}
</div>
{{/if}}
<div class="navbar-toggler-right">
@ -204,7 +203,7 @@
{{if $channel_apps.0}}
</div>
{{/if}}
{{if $localuser}}
{{if $is_owner}}
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
<a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
@ -230,7 +229,7 @@
{{if $channel_apps.0}}
</div>
{{/if}}
{{if $localuser}}
{{if $is_owner}}
<div class="dropdown-divider"></div>
<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
<a class="nav-link" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>