From 4369b3864ea277abbe3b5122be26a4b68d145d7e Mon Sep 17 00:00:00 2001 From: ValessioBrito Date: Tue, 23 Oct 2007 22:43:27 +0000 Subject: [PATCH] ActionItem114: Icon navegation bar --- app/helpers/application_helper.rb | 14 ++++++++------ app/views/layouts/application.rhtml | 6 +++--- public/designs/templates/default/stylesheets/contentblocks.css | 6 ++++++ public/images/icons-bar/admin.png | Bin 0 -> 1393 bytes public/images/icons-bar/login.png | Bin 604 -> 0 bytes public/images/icons-bar/logout2.png | Bin 0 -> 956 bytes public/stylesheets/menu.css | 51 +++++++++++++++++++++++++-------------------------- 7 files changed, 42 insertions(+), 35 deletions(-) create mode 100644 public/images/icons-bar/admin.png create mode 100644 public/images/icons-bar/logout2.png diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 092b3fe..60fe3b6 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -131,13 +131,15 @@ module ApplicationHelper def shortcut_header_links if logged_in? [ accessibility_link, - ( link_to_homepage( content_tag('span', _('My account')) ) ), - ( link_to( _('Admin'), { :controller => 'admin_panel' }) if current_user.person.is_admin?), - ( link_to content_tag('span', _('Logout')), :controller => 'account', :action => 'logout', :method => 'post'), + ( link_to_homepage( content_tag('span', _('My account'), { :id => 'icon_go_home'} )) ), + # MUDAR, O ID acima deve ser no Link 'admin_panel' }, :id => 'icon_admin' if current_user.person.is_admin?), + ( link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout', :method => 'post'}, :id => 'icon_logout'), ] else [ accessibility_link, - ( link_to content_tag('span', _('Login')), :controller => 'account', :action => 'login'), + ( link_to content_tag('span', _('Login')), { :controller => 'account', :action => 'login' }, :id => 'icon_login' ), ] end.join(" ") end @@ -266,13 +268,13 @@ module ApplicationHelper doc = Article.find_all_by_slug(_('accessibility')).select do |a| a.full_path.split(/\//).shift == 'noosfero' end[0] - link_to_document doc, _('Accessibility') if doc + link_to_document doc, _('Accessibility'), :id => 'icon_accessibility' if doc end def search_box [form_tag( :controller => 'search', :action => 'index'), - text_field_tag( 'query', _(' '), :id => "input_search"), submit_tag(_('Search'), :id => 'button_search'), + text_field_tag( 'query', _(' '), :id => "input_search"), '', observe_field('input_search', :function => "element.value=''", :on => :focus) ].join("\n") diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index 1e049df..ce612c8 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -30,12 +30,12 @@
-
- <%= _('Go Content') %> + <%= _('Go Content') %> <%= shortcut_header_links %>
-
+
+
<% if @category %> <%= @category.full_name %> <% else @category %> diff --git a/public/designs/templates/default/stylesheets/contentblocks.css b/public/designs/templates/default/stylesheets/contentblocks.css index 38b9e7d..d17180a 100644 --- a/public/designs/templates/default/stylesheets/contentblocks.css +++ b/public/designs/templates/default/stylesheets/contentblocks.css @@ -77,6 +77,12 @@ clear: both; /* Artigos */ +div.recentdocumentsblock ul { +margin: 0px; +padding: 0px; +list-style: none; +} + div.recentdocumentsblock div.block_content li a { text-decoration: none; color: #545454; diff --git a/public/images/icons-bar/admin.png b/public/images/icons-bar/admin.png new file mode 100644 index 0000000..f362e72 Binary files /dev/null and b/public/images/icons-bar/admin.png differ diff --git a/public/images/icons-bar/login.png b/public/images/icons-bar/login.png index d2fadbd..f2023e8 100644 Binary files a/public/images/icons-bar/login.png and b/public/images/icons-bar/login.png differ diff --git a/public/images/icons-bar/logout2.png b/public/images/icons-bar/logout2.png new file mode 100644 index 0000000..473e7bc Binary files /dev/null and b/public/images/icons-bar/logout2.png differ diff --git a/public/stylesheets/menu.css b/public/stylesheets/menu.css index f793001..468d667 100644 --- a/public/stylesheets/menu.css +++ b/public/stylesheets/menu.css @@ -1,6 +1,7 @@ /* Geral Bar */ #noosfero_bar { position: fixed; + width: 100%; height: 26px; background: url("../images/bg_bgmenu.png") repeat-x; padding: 0px; @@ -49,31 +50,22 @@ color: #ffffff; /* Menu Itens Accessibility */ #accessibility_menu { - float: right; - margin-right: 5px; + position: absolute; + right: 10px; + width: 200px; text-align: right; font-family: Verdana, Arial, Serif-sans; font-size: 9px; color: #dfdfdf; font-weight: normal; + z-index: 999; } -/* Images Icons Mini-BAR +/* Images Icons Mini-BAR */ #accessibility_menu span { display: none; } -#accessibility_menu a { -display: block; -float: right; -padding: 0px !important; -margin: 0px !important; -width: 24px !important; -height: 24px !important; -background-position: top left !important; -background-repeat: no-repeat !important; -} - #accessibility_menu a#icon_go_content { background-image: url('../images/icons-bar/go-content.png'); } @@ -90,17 +82,24 @@ background-image: url('../images/icons-bar/logout.png'); background-image: url('../images/icons-bar/login.png'); } +#accessibility_menu a#icon_admin { +background-image: url('../images/icons-bar/admin.png'); +} + #accessibility_menu a#icon_accessibility { background-image: url('../images/icons-bar/accessibility.png'); } -*/ #accessibility_menu a { - padding-left: 9px; - margin-left: 5px; - background: url("../images/ico_enterlink.gif") no-repeat; - background-position: 0px 6px; - color: #dfdfdf; + padding: 0px; + margin: 0px; + margin-right: 5px; + display: block; + float: right; + width: 24px; + height: 24px; + background-position: 0px 0px; + background-repeat: no-repeat; text-decoration: none; } @@ -121,13 +120,13 @@ background-image: url('../images/icons-bar/accessibility.png'); height: 40px; vertical-align: middle; line-height: 40px; - z-index: 996; + z-index: 995; } #navigation_bar ul { padding: 0px !important; margin: 0px !important; - z-index: 997; + z-index: 996; } #navigation_bar ul li { @@ -159,7 +158,7 @@ padding: 0px; width: 100%; left: 0px; display: none; -z-index: 998; +z-index: 997; } #navigation_bar ul li ul li { @@ -181,10 +180,10 @@ position: absolute; right: 0px; margin: 0px; width: 200px; -height: 33px; +height: 30px; padding-top: 5px; -padding-left: 15px; -z-index: 999; +padding-left: 10px; +z-index: 998; } #input_search { -- libgit2 0.21.2