[Xfce4-commits] <moka:master> Restore menu bar.

[Nick Schermer]

Updating branch refs/heads/master
         to 0b88595b29b0d73b6ed70f1f38ffb69e6ff53a9a (commit)
       from c04c42ed788b42a26efede9860a40647d5439de3 (commit)

commit 0b88595b29b0d73b6ed70f1f38ffb69e6ff53a9a
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Oct 15 20:05:05 2011 +0200

    Restore menu bar.

 lib/views/layout.haml     |   31 +++++++++++++++++--------------
 lib/views/stylesheet.sass |   10 ++++++++++
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/lib/views/layout.haml b/lib/views/layout.haml
index c5784cb..13d889d 100644
--- a/lib/views/layout.haml
+++ b/lib/views/layout.haml
@@ -6,20 +6,23 @@
     %link{:rel => "stylesheet", :href => "/stylesheet.css", :media => "all", :type => "text/css"}/
   %body
     %h1 Xfce Release Manager
-    %ul
-      %li
-        %a{:href => "/"} Home
-      - if authentication_finished? and authentication_user
+    %div{:id => 'main-toolbar'}
+      %ul{:id => 'main-toolbar'}
         %li
-          %a{:href => "/maintainer/#{authentication_user.username}"} Profile
+          %a{:href => "/"} Home
+        - if authentication_finished? and authentication_user
+          %li
+            %a{:href => "/maintainer/#{authentication_user.username}"} Profile
+          %li
+            %a{:href => "/maintainer"} Maintainers
+          %li
+            %a{:href => "/project"} Projects
+          %li
+            %a{:href => "/logout"} Logout
+        - else
+          %li
+            %a{:href => "/login/request"} Request Account
         %li
-          %a{:href => "/maintainer"} Maintainers
-        %li
-          %a{:href => "/project"} Projects
-        %li
-          %a{:href => "/logout"} Logout
-      - else
-        %li
-          %a{:href => "/login/request"} Request Account
-
+          %a{:href => "http://archive.xfce.org"} Archive
+      %div{:id => 'main-toolbar-clear'}
     =yield
diff --git a/lib/views/stylesheet.sass b/lib/views/stylesheet.sass
index a06d24f..afa1933 100755
--- a/lib/views/stylesheet.sass
+++ b/lib/views/stylesheet.sass
@@ -42,6 +42,13 @@ a
   line-height: 2em
   padding-left: 1em
 
+  ul
+    list-style: none
+    margin: 0
+
+  li
+    float: left
+
   a
     color: rgb(255,255,255)
     padding:
@@ -54,6 +61,9 @@ a
       background:
         color: rgb(100,150,250)
 
+#main-toolbar-clear
+  clear: both
+
 h2
   margin:
     top: 1.5em