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

move profile tabs to app-tray

Browse Source
This commit is contained in:
Mario Vavti 2017-03-20 17:24:48 +01:00
parent cfdf1def2a
commit ca14ab3d55
12 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Module/Bookmarks.php
View File

@ -68,7 +68,8 @@ class Bookmarks extends \Zotlabs\Web\Controller {
$channel = \App::get_channel(); $channel = \App::get_channel();
$o = profile_tabs($a,true,$channel['channel_address']); //$o = profile_tabs($a,true,$channel['channel_address']);
$o = '';
$o .= '<div class="generic-content-wrapper-styled">'; $o .= '<div class="generic-content-wrapper-styled">';

3
Zotlabs/Module/Cal.php
View File

@ -86,7 +86,8 @@ class Cal extends \Zotlabs\Web\Controller {
$o = ''; $o = '';
$tabs = profile_tabs($a, True, $channel['channel_address']); //$tabs = profile_tabs($a, True, $channel['channel_address']);
$tabs = '';
$mode = 'view'; $mode = 'view';
$y = 0; $y = 0;

2
Zotlabs/Module/Channel.php
View File

@ -121,7 +121,7 @@ class Channel extends \Zotlabs\Web\Controller {
$static = channel_manual_conv_update(\App::$profile['profile_uid']); $static = channel_manual_conv_update(\App::$profile['profile_uid']);
$o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']); //$o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']);
$o .= common_friends_visitor_widget(\App::$profile['profile_uid']); $o .= common_friends_visitor_widget(\App::$profile['profile_uid']);

3
Zotlabs/Module/Chat.php
View File

@ -210,7 +210,8 @@ class Chat extends \Zotlabs\Web\Controller {
require_once('include/conversation.php'); require_once('include/conversation.php');
$o = profile_tabs($a,((local_channel() && local_channel() == \App::$profile['profile_uid']) ? true : false),\App::$profile['channel_address']); //$o = profile_tabs($a,((local_channel() && local_channel() == \App::$profile['profile_uid']) ? true : false),\App::$profile['channel_address']);
$o = '';
if(! feature_enabled(\App::$profile['profile_uid'],'ajaxchat')) { if(! feature_enabled(\App::$profile['profile_uid'],'ajaxchat')) {
notice( t('Feature disabled.') . EOL); notice( t('Feature disabled.') . EOL);

2
Zotlabs/Module/Photos.php
View File

@ -579,7 +579,7 @@ class Photos extends \Zotlabs\Web\Controller {
// tabs // tabs
$_is_owner = (local_channel() && (local_channel() == $owner_uid)); $_is_owner = (local_channel() && (local_channel() == $owner_uid));
$o .= profile_tabs($a,$_is_owner, \App::$data['channel']['channel_address']); //$o .= profile_tabs($a,$_is_owner, \App::$data['channel']['channel_address']);
/** /**
* Display upload form * Display upload form

2
Zotlabs/Module/Profile.php
View File

@ -101,7 +101,7 @@ class Profile extends \Zotlabs\Web\Controller {
return; return;
} }
$o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']); //$o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']);
\App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string) . '" title="oembed" />' . "\r\n"; \App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string) . '" title="oembed" />' . "\r\n";

3
Zotlabs/Module/Sharedwithme.php
View File

@ -92,7 +92,8 @@ class Sharedwithme extends \Zotlabs\Web\Controller {
} }
$o = profile_tabs($a, $is_owner, $channel['channel_address']); //$o = profile_tabs($a, $is_owner, $channel['channel_address']);
$o = '';
$o .= replace_macros(get_markup_template('sharedwithme.tpl'), array( $o .= replace_macros(get_markup_template('sharedwithme.tpl'), array(
'$header' => t('Files: shared with me'), '$header' => t('Files: shared with me'),

3
Zotlabs/Module/Webpages.php
View File

@ -142,7 +142,8 @@ class Webpages extends \Zotlabs\Web\Controller {
$is_owner = ($uid && $uid == $owner); $is_owner = ($uid && $uid == $owner);
$o = profile_tabs($a, $is_owner, \App::$profile['channel_address']); //$o = profile_tabs($a, $is_owner, \App::$profile['channel_address']);
$o = '';
$x = array( $x = array(
'webpage' => ITEM_TYPE_WEBPAGE, 'webpage' => ITEM_TYPE_WEBPAGE,

3
Zotlabs/Module/Wiki.php
View File

@ -107,7 +107,8 @@ class Wiki extends \Zotlabs\Web\Controller {
} }
$is_owner = ((local_channel()) && (local_channel() == \App::$profile['profile_uid']) ? true : false); $is_owner = ((local_channel()) && (local_channel() == \App::$profile['profile_uid']) ? true : false);
$o = profile_tabs($a, $is_owner, \App::$profile['channel_address']); //$o = profile_tabs($a, $is_owner, \App::$profile['channel_address']);
$o = '';
// Download a wiki // Download a wiki
/* /*

3
Zotlabs/Storage/Browser.php
View File

@ -84,7 +84,8 @@ class Browser extends DAV\Browser\Plugin {
require_once('include/conversation.php'); require_once('include/conversation.php');
require_once('include/text.php'); require_once('include/text.php');
if ($this->auth->owner_nick) { if ($this->auth->owner_nick) {
$html = profile_tabs(get_app(), (($is_owner) ? true : false), $this->auth->owner_nick); //$html = profile_tabs(get_app(), (($is_owner) ? true : false), $this->auth->owner_nick);
$html = '';
} }
$files = $this->server->getPropertiesForPath($path, array( $files = $this->server->getPropertiesForPath($path, array(

2
include/conversation.php
View File

@ -1917,7 +1917,7 @@ function profile_tabs($a, $is_owner = false, $nickname = null){
$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs); $arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
call_hooks('profile_tabs', $arr); call_hooks('profile_tabs', $arr);
$tpl = get_markup_template('common_tabs.tpl'); $tpl = get_markup_template('profile_tabs.tpl');
return replace_macros($tpl,array('$tabs' => $arr['tabs'])); return replace_macros($tpl,array('$tabs' => $arr['tabs']));
} }

5
include/nav.php
View File

@ -36,7 +36,10 @@ EOT;
} }
elseif(remote_channel()) elseif(remote_channel())
$observer = App::get_observer(); $observer = App::get_observer();
require_once('include/conversation.php');
$is_owner = (((local_channel()) && (\App::$profile['profile_uid'] == local_channel())) ? true : false);
$navapps[] = profile_tabs($a, $is_owner, \App::$profile['channel_address']);
$myident = (($channel) ? $channel['xchan_addr'] : ''); $myident = (($channel) ? $channel['xchan_addr'] : '');