Merge branch 'development' into 96-remove-universal-cors

Conflicts: app.js
mozilla · Mar 23, 2012 · 2191b52 · 2191b52
2 parents 5962dfc + 5ec7c1a
commit 2191b52
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/app.js b/app.js
@@ -21,7 +21,6 @@ app.register('hogan.js', hoganadapter.init(hogan))
 // statements without getting undefined errors and without having to use typeof
 // checks.
 app.helpers({
-  user: null,
   login: true,
   title: 'Backpack',
   error: [],
@@ -30,6 +29,12 @@ app.helpers({
   reverse: router.reverse,
 });
 
+app.dynamicHelpers({
+  user: function(req, res){
+    return req.user || null;
+  }
+});
+
 // Middleware. See `middleware.js`
 app.use(express.static(path.join(__dirname, "static")));
 app.use(express.static(path.join(configuration.get('var_dir'), "badges")));
@@ -102,4 +107,4 @@ if (!module.parent) {
   start_server(app);
 } else {
   module.exports = app;
-}
+}
diff --git a/static/css/style.css b/static/css/style.css
@@ -59,6 +59,13 @@ form.baker #assertion {
 .navbar .container {
   max-width: 940px;
 }
+.navbar .user {
+  padding: 10px 10px 11px;
+  line-height: 19px;
+  color: #999999;
+  text-decoration: none;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
 .modal {
   display: none;
 }
@@ -432,17 +439,17 @@ table.information {
 }
 .portfolio .title {
   display: block;
-  margin-bottom:18px;
-  font-size:30px;
-  line-height:36px;
+  margin-bottom: 18px;
+  font-size: 30px;
+  line-height: 36px;
   height: 36px;
   width: 600px;
 }
 .portfolio .subtitle {
   display: block;
   width: 600px;
-  font-size:24px;
-  line-height:36px;
+  font-size: 24px;
+  line-height: 36px;
   height: 36px;
 }
 .portfolio .preamble {

diff --git a/views/layout.hogan.js b/views/layout.hogan.js
@@ -21,9 +21,14 @@
           <a href="http://www.mozilla.org/" id="tabzilla">a mozilla.org joint</a> 
           <ul class="nav">
             <li><a href="{{#reverse}}backpack.manage{{/reverse}}">Home</a></li>
-            <li><a href="{{#reverse}}backpack.signout{{/reverse}}">Sign Out</a></li>
             <li><a href="{{#reverse}}backpack.manage{{/reverse}}{{^tooltips}}?tooltips{{/tooltips}}">Help: {{#tooltips}}Off{{/tooltips}}{{^tooltips}}On{{/tooltips}}</a></li>
           </ul>
+          {{#user}}
+            <ul class="nav pull-right">
+              <li class="user">{{attributes.email}}</li>
+              <li><a href="{{#reverse}}backpack.signout{{/reverse}}">Sign Out</a></li>
+            </ul>
+          {{/user}}
         </div>
       </div>
     </div>