more redbasic icon work

This commit is contained in:
friendica 2013-10-09 18:33:33 -07:00
parent a0160e9a6b
commit 1aa69604fc
3 changed files with 11 additions and 6 deletions

View file

@ -95,12 +95,16 @@ EOT;
);
}
if($observer)
if($observer) {
$nav['locked'] = true;
$nav['lock'] = array('logout','','lock',
sprintf( t('%s - click to logout'), $observer['xchan_addr']));
else
}
else {
$nav['locked'] = false;
$nav['lock'] = array('rmagic','','unlock',
t('Click to authenticate to your home hub'));
}
/**
* "Home" should also take you home from an authenticated remote profile connection
@ -141,11 +145,11 @@ EOT;
if(local_user()) {
$nav['network'] = array('network', t('Matrix'), "", t('Conversations from your matrix'));
$nav['network'] = array('network', t('Matrix'), "", t('Your matrix'));
$nav['network']['all']=array('notifications/network', t('See all matrix notifications'), "", "");
$nav['network']['mark'] = array('', t('Mark all matrix notifications seen'), '','');
$nav['home'] = array('channel/' . $channel['channel_address'], t('Channel Home'), "", t('Your posts and conversations'));
$nav['home'] = array('channel/' . $channel['channel_address'], t('Channel Home'), "", t('Channel home'));
$nav['home']['all']=array('notifications/channel', t('See all channel notifications'), "", "");
$nav['home']['mark'] = array('', t('Mark all channel notifications seen'), '','');

View file

@ -2033,6 +2033,7 @@ a.mail-list-link {
#nav-searchbar {
float: right;
margin-top: 2px;
margin-right: 10px;
}
#nav-search-spinner {

View file

@ -29,14 +29,14 @@
{{if $nav.lock}}
<li id="nav-rmagic-link" class="nav-menu-icon" >
<a class="icon {{$nav.lock.2}}" href="{{$nav.lock.0}}" title="{{$nav.lock.3}}" >{{$nav.lock.1}}</a>
<i class="{{if $nav.locked}}icon-lock{{else}}icon-unlock{{/if}} fakelink nav-icon" onclick="window.location.href='{{$nav.lock.0}}'; return false;" title="{{$nav.lock.3}}" ></i>
</li>
{{/if}}
{{if $nav.network}}
<li id="nav-network-link" class="nav-menu {{$sel.network}}">
<a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-globe nav-icon"></i></a>
<a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th nav-icon"></i></a>
<span id="net-update" class="nav-notify fakelink" rel="#nav-network-menu"></span>
<ul id="nav-network-menu" class="menu-popup notify-menus" rel="network">
<li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li>