Changeset 4eeed6a2da34092e5eb880e4ce010dd3a3cc9aa7

Timestamp:

12/24/11 00:48:31 (5 months ago)

Author:

Xemle <xemle@phtagr.org>

Children:

eef9918730bae1b54e09d333f0ab462bbf2ab293

Parents:

85cfa522ac1546dd201b563c46a55f14ca508f4f

git-author:

Xemle <xemle@phtagr.org> / 2011-12-23T18:29:13Z+0100

git-committer:

Xemle <xemle@phtagr.org> / 2011-12-24T00:48:31Z+0100

Message:

Add username to top nav

Files:

• app_controller.php (modified) (1 diff)
• views/helpers/menu.php (modified) (2 diffs)
• webroot/css/default/_layout.sass (modified) (1 diff)

app_controller.php

@@ -69 +69 @@
       }
     } else {
+      $user = $this->getUser();
+      $this->Menu->addItem(sprintf(__('Howdy, %s!', true), $user['User']['username']), false);
       $this->Menu->addItem(__('Logout', true), array('controller' => 'users', 'action' => 'logout'));
       $this->Menu->addItem(__('Dashboard', true), array('controller' => 'options'));

views/helpers/menu.php

@@ -88 +88 @@
       }
 
-      if ($item['link'] == 'false' && $item['type'] == false)
+      if ($item['link'] == 'false' && $item['type'] == false) {
         $item['type'] == 'text';
+      }
 
       $out .= "<li";
@@ -172 +173 @@
         $linkOptions['class'] = 'active';
       } 
-      if (!$item['url']) {
+      if (!isset($item['url'])) {
         $item['url'] = array('controller' => $item['controller'], 'action' => $item['action'], 'admin' => $item['admin']);
       }
-      $item = $this->Html->link($item['title'], $item['url'], $linkOptions);
+      if ($item['url'] === false) {
+        $item = $item['title'];
+      } else {
+        $item = $this->Html->link($item['title'], $item['url'], $linkOptions);
+      }
+      Logger::debug($item);
       $items[] = $this->Html->tag('li', $item . $submenu, $attrs);
     }

webroot/css/default/_layout.sass

@@ -36 +36 @@
       > li
         float: left
-        padding: 5px
+        padding: 5px 2px
         > a
+          padding: 5px 7px
           color: darken(white, 50%)
           +text-shadow(black, 1px, 0px, 0)
-        &:hover
-          +border-radius(5px)
-          background-color: darken($headerBackgroundColor, 25%)
-          border-color: darken($headerBackgroundColor, 35%)
-          > a
+          &:hover
+            +border-radius(5px)
+            background-color: darken($headerBackgroundColor, 25%)
+            border-color: darken($headerBackgroundColor, 35%)
             color: white