aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-10-09 18:33:33 -0700
committerfriendica <info@friendica.com>2013-10-09 18:33:33 -0700
commit1aa69604fc9aaf87eacccabf73ba4d3600c8dcd5 (patch)
tree63cab286d3b43f2c88ed183533ef75fabd62b143
parenta0160e9a6ba30993a98beb1cc14b68409ef1a592 (diff)
downloadvolse-hubzilla-1aa69604fc9aaf87eacccabf73ba4d3600c8dcd5.tar.gz
volse-hubzilla-1aa69604fc9aaf87eacccabf73ba4d3600c8dcd5.tar.bz2
volse-hubzilla-1aa69604fc9aaf87eacccabf73ba4d3600c8dcd5.zip
more redbasic icon work
-rw-r--r--include/nav.php12
-rw-r--r--view/theme/redbasic/css/style.css1
-rwxr-xr-xview/tpl/nav.tpl4
3 files changed, 11 insertions, 6 deletions
diff --git a/include/nav.php b/include/nav.php
index f1e47b576..a16d8d078 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -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'), '','');
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 1de3a71d3..9d0a86e34 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2033,6 +2033,7 @@ a.mail-list-link {
#nav-searchbar {
float: right;
margin-top: 2px;
+ margin-right: 10px;
}
#nav-search-spinner {
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 01ba6620a..f27afed09 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -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>