new user top bar

app/helpers/status_messages_helper.rb

@@ -3,7 +3,7 @@ module StatusMessagesHelper
   def my_latest_message
     message = @latest_status_message
     unless message.nil?
-      return message.message + "   -   " + how_long_ago(message)
+      return message.message#+ "   -   " + how_long_ago(message)
     else
       return "No message to display."
     end

app/views/dashboards/index.html.haml

@@ -1,9 +1,3 @@
-- if user_signed_in?
-  %h1#user_name
-    = link_to current_user.real_name, root_path
-    %span= title_for_page
-  %h3#latest_message
-    = my_latest_message
 = render "shared/publisher"
 %ul#stream
   - for post in @posts

app/views/layouts/application.html.haml

@@ -41,22 +41,28 @@
             = link_to "logout", destroy_user_session_path
           - else
             = link_to "login", new_user_session_path
+
     .container
-      = link_to "home", root_path
-      |
-      = link_to "photos", albums_path
-      |
-      = link_to "ostatus", ostatus_path
-      %br
-      %br
+      - if user_signed_in?
+        #user_name
+          = link_to(person_image_tag(current_user), root_path)
+          %h1
+            = link_to current_user.real_name, root_path
+            %span#latest_message
+              = my_latest_message
+
+          %ul.nav
+            %li= link_to "home", root_path
+            %li= link_to "photos", albums_path
+            %li= link_to "ostatus", ostatus_path
 
     .container
       .span-24.last
         .span-20.append-1.last
+
           = yield
+
         .span-3.last
-          = link_to(person_image_tag(current_user), root_path)
-          %br
           = link_to "Edit your profile", edit_user_path(current_user)
           %br
           %br

public/stylesheets/application.css

@@ -64,7 +64,7 @@ a {
 header {
   position: relative;
   margin: -2em;
-    margin-bottom: 1em;
+    margin-bottom: 60px;
   color: #555555;
   background-color: #2b2726;
   border-bottom: 3px solid #333333;
@@ -150,7 +150,7 @@ h1 {
     padding: 0.1em; }
 
 h3 {
-  position: relative;
+  position: relativex;
   font-size: 18px;
   font-weight: bold; }
 
@@ -160,20 +160,28 @@ form {
   margin-left: 0em; }
 
 #user_name {
-  display: inline;
-  margin-bottom: 1em;
-  font-size: 70px;
-  line-height: 100px; }
-  #user_name a {
+  margin-bottom: 3em; }
+  #user_name img {
+    margin-right: 10px;
+    display: inline-block;
+    float: left;
+    height: 40px; }
+  #user_name h1 {
+    margin-bottom: 7px;
+    line-height: 18px; }
+    #user_name h1 a {
       color: black; }
-  #user_name span {
-    line-height: 140px;
-    font-size: 30%;
-    color: #dddddd;
-    float: right; }
-
-#latest_message {
-  font-weight: normal; }
+  #user_name #latest_message {
+    font-weight: normal;
+    color: #999999; }
+  #user_name ul {
+    display: inline;
+    margin: 0;
+    padding: 0;
+    list-style: none; }
+    #user_name ul > li {
+      display: inline;
+      margin-right: 1em; }
 
 #stream div.comments {
   display: none; }
@@ -201,8 +209,7 @@ ul.comment_set {
         color: #333333;
         font-weight: bold; }
     ul.comment_set li.comment form {
-      margin-top: -5px;
-      padding-bottom: 8px; }
+      margin-top: -5px; }
 
 .profile_photo {
   float: left;
@@ -291,8 +298,7 @@ label {
   background-color: rgba(10, 81, 109, 0.05);
   border-bottom: 2px #999999 solid;
   color: #999999;
-  padding: 20px 1em;
-    padding-top: 10px; }
+  padding: 15px 1em; }
 
 #new_blog,
 #new_bookmark {

public/stylesheets/sass/application.sass

@@ -68,7 +68,7 @@ a
 header
   :position relative
   :margin -2em
-    :bottom 1em
+    :bottom 60px
   :color #555
   :background
     :color #2B2726
@@ -175,7 +175,7 @@ h1
     :padding 0.1em
 
 h3
-  :position relative
+  :position relativex
   :font
     :size 18px 
     :weight bold
@@ -188,24 +188,38 @@ form
 
   
 #user_name
-  :display inline
   :margin
-    :bottom 1em
-  :font
-    :size 70px
-  :line-height 100px
+    :bottom 3em
+  
+  img
+    :margin
+      :right 10px
+    :display inline-block
+    :float left
+    :height 40px
+
+  h1
+    :margin
+      :bottom 7px
+    :line-height 18px
     a
       :color #000
-  span
-    :line-height 140px
-    :font
-      :size 30%
-    :color #dddddd
-    :float right
 
   #latest_message
     :font
       :weight normal
+    :color #999
+
+  ul
+    :display inline
+    :margin 0
+    :padding 0
+    :list-style none
+
+    > li
+      :display inline
+      :margin
+        :right 1em
     
 
 #stream div.comments
@@ -244,9 +258,6 @@ ul.comment_set
     form
       :margin
         :top -5px
-      :padding
-        :bottom 8px
-        
 
 .profile_photo
   :float left
@@ -350,8 +361,7 @@ label
   :border
     :bottom 2px #999 solid
   :color #999
-  :padding 20px 1em
-    :top 10px
+  :padding 15px 1em
 
 #new_blog, 
 #new_bookmark