Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 03:35:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add location info to the navbar

Browse source
This commit is contained in:
Mario Vavti 2017-11-07 10:43:13 +01:00
parent d16bbfb224
commit 549866c090
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/nav.php
View file

@ -27,6 +27,8 @@ function nav($template = 'default') {
</script>
EOT;
$is_owner = (((local_channel()) && ((App::$profile_uid == local_channel()) || (App::$profile_uid == 0))) ? true : false);
if(local_channel()) {
$channel = App::get_channel();
$observer = App::get_observer();
@ -39,17 +41,17 @@ EOT;
intval(get_account_id())
);
}
$sitelocation = (($is_owner) ? '' : App::$profile['reddress']);
}
elseif(remote_channel())
elseif(remote_channel()) {
$observer = App::get_observer();
$sitelocation = ((App::$profile['reddress']) ? App::$profile['reddress'] : '@' . App::get_hostname());
}
require_once('include/conversation.php');
$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'] : '');
$sitelocation = (($myident) ? $myident : App::get_hostname());
/**
*

12
view/tpl/navbar_default.tpl
View file

@ -17,8 +17,8 @@
</div>
{{/if}}
{{if $userinfo}}
<div class="dropdown usermenu">
<div class="fakelink" data-toggle="dropdown">
<div class="dropdown">
<div class="fakelink usermenu" data-toggle="dropdown">
<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
<i class="fa fa-caret-down"></i>
</div>
@ -60,7 +60,13 @@
{{/if}}
</div>
<div class="navbar-nav mr-auto">
<div><a id="nav-app-link" href="{{$url}}" class="nav-link">{{$sel.name}}</a></div>
<a id="nav-app-link" href="{{$url}}" class="nav-link" style="padding: .175rem;{{if $sitelocation}} line-height: 1; height:2.35rem;{{/if}}">
{{$sel.name}}
{{if $sitelocation}}
<br>
<small class="text-muted">{{$sitelocation}}</small>
{{/if}}
</a>
</div>
{{/if}}
<div class="navbar-toggler-right">