From c6cbdb3e3a30bd48ca67dbdb3f63f7542d65a54b Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 24 Aug 2016 22:42:03 +0200 Subject: [PATCH] Top bar now part of a .row --- app/views/layouts/_topbar.slim | 71 +++++++++++++++++----------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/app/views/layouts/_topbar.slim b/app/views/layouts/_topbar.slim index 8c6034a..7320dc2 100644 --- a/app/views/layouts/_topbar.slim +++ b/app/views/layouts/_topbar.slim @@ -1,38 +1,39 @@ -header +nav.top-bar .row - .top-bar - .top-bar-title - // TODO: Make the logo depend on the virtual host - img src="/images/logos/debian.svg" width="35" alt="Debian logo" - // TODO: Use proper distribution name - 'Debian Screenshots > + .top-bar-left + ul.menu + li.menu.sitename + a href='/' + // TODO: Make the logo depend on the virtual host + img src="/images/logos/debian.svg" width="35" alt="Debian logo" + // TODO: Use proper distribution name + ' Debian Screenshots > - .top-bar-right - ul.menu - li class=('active' if controller_name=='welcome' and action_name=='home') - a href="/" Home - li class=('active' if controller_name=='packages') - a href="/packages" Explore - //li.has-dropdown - //a href="#" Distributions - //ul.dropdown - //// TODO: Use proper distribution list - //li - //a href="#" Debian - //li - //a href="#" Ubuntu - li class=('active' if controller_name=='welcome' and action_name=='about') - a href="/about" About - li.divider - // TODO: Check correct classes in Zurb/Foundation for top bar! + .top-bar-right + ul.dropdown.menu data-dropdown-menu=true + li class=('active' if controller_name=='welcome' and action_name=='home') + a href="/" Home + li class=('active' if controller_name=='packages') + a href="/packages" Explore + //li.has-dropdown + //a href="#" Distributions + //ul.dropdown + //// TODO: Use proper distribution list + //li + //a href="#" Debian + //li + //a href="#" Ubuntu + li class=('active' if controller_name=='welcome' and action_name=='about') + a href="/about" About + // TODO: Check correct classes in Zurb/Foundation for top bar! + - if user_signed_in? + li + a href='#' Admin + ul.menu.vertical + li = link_to 'Moderate', moderate_path + li = link_to 'Logs', logs_path + li - if user_signed_in? - li.has-dropdown - a href='#' Admin - ul.dropdown - li = link_to 'Moderate', moderate_path - li = link_to 'Logs', logs_path - li.has-form - - if user_signed_in? - = link_to "#{current_user.email} (Logout)", destroy_user_session_path, :method => :delete - - else - = link_to 'Login', new_user_session_path + = link_to "#{current_user.email} (Logout)", destroy_user_session_path, :method => :delete + - else + = link_to 'Login', new_user_session_path