diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-07-29 16:23:47 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-07-29 16:23:47 +0200 |
| commit | d12e2cbfe913529fbca0cc75c4f157ae42db616d (patch) | |
| tree | 819f9f0e777a1335ecfee19f88354e4eddf9a70a | |
| parent | 23d6339a4152759d8dcf68afc6e7dea652336d8c (diff) | |
| download | volse-hubzilla-d12e2cbfe913529fbca0cc75c4f157ae42db616d.tar.gz volse-hubzilla-d12e2cbfe913529fbca0cc75c4f157ae42db616d.tar.bz2 volse-hubzilla-d12e2cbfe913529fbca0cc75c4f157ae42db616d.zip | |
Fix nav template and add missing strings
| -rw-r--r-- | include/nav.php | 20 | ||||
| -rw-r--r-- | view/nav.tpl | 23 |
2 files changed, 34 insertions, 9 deletions
diff --git a/include/nav.php b/include/nav.php index caed9453a..bb1a5b2d8 100644 --- a/include/nav.php +++ b/include/nav.php @@ -37,8 +37,26 @@ function nav(&$a) { * Display login or logout */ + $nav['usermenu']=array(); + $userinfo = null; + if(local_user()) { $nav['logout'] = Array('logout',t('Logout'), "", t('End this session')); + + // user menu + $nav['usermenu'][] = Array('profile/' . $a->user['nickname'], t('Status'), "", t('Your posts and conversations')); + $nav['usermenu'][] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); + $nav['usermenu'][] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); + $nav['usermenu'][] = Array('events/', t('Events'), "", t('Your events')); + $nav['usermenu'][] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); + + // user info + $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); + $userinfo = array( + 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"), + 'name' => $a->user['username'], + ); + } else { $nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'selected':''), t('Sign in')); @@ -137,6 +155,8 @@ function nav(&$a) { '$sitelocation' => $sitelocation, '$nav' => $nav, '$banner' => $banner, + '$emptynotifications' => t('Nothing new here'), + '$userinfo' => $userinfo, )); call_hooks('page_header', $a->page['nav']); diff --git a/view/nav.tpl b/view/nav.tpl index 5a8a904a6..f83ddf7f1 100644 --- a/view/nav.tpl +++ b/view/nav.tpl @@ -2,17 +2,22 @@ {# $langselector #} <div id="site-location">$sitelocation</div> + <div id="banner">$banner</div> </header> <nav> <ul> - <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="http://localhost/~fabio/friendika/photo/52728a08b979618a787e43664bfbae98-6.jpg" alt="User"></a> - <ul id="nav-user-menu" class="menu-popup"> - <li><a href="profile">Profile</a></li> - <li><a href="photos">Photos</a></li> - {{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }} - {{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }} - </ul> - </li> + {{ if $userinfo }} + <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a> + <ul id="nav-user-menu" class="menu-popup"> + {{ for $nav.usermenu as $usermenu }} + <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li> + {{ endfor }} + + {{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }} + {{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }} + </ul> + </li> + {{ endif }} {{ if $nav.community }} <li id="nav-community-link" class="nav-menu"> @@ -37,7 +42,7 @@ <li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a> <span id="notify-update" class="nav-notify"></span> <ul id="nav-notifications-menu" class="menu-popup"> - <li class="empty">Nothing new here</li> + <li class="empty">$emptynotifications</li> </ul> </li> {{ endif }} |