ActionItem114: Icon navegation bar

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@819 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem114: Icon navegation bar
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@819 3f533792-8f58-4932-b0fe-aaf55b0a4547
ValessioBrito
1 parent 2c1493ff
Showing 7 changed files with 42 additions and 35 deletions Show diff stats
app/helpers/application_helper.rb
app/views/layouts/application.rhtml
public/designs/templates/default/stylesheets/contentblocks.css
public/images/icons-bar/admin.png
public/images/icons-bar/login.png
public/images/icons-bar/logout2.png
public/stylesheets/menu.css
@@ -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 <a id=...
+	# O ID icon_accessibility tambem tem que aparcer e testei o link nao ta funcionado.
+        ( link_to content_tag('span', _('Admin')), { :controller => '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"),
        '</form>',
       observe_field('input_search', :function => "element.value=''", :on => :focus)
     ].join("\n") 
@@ -30,12 +30,12 @@
     <div id="wrap" class='category<%= category_color %>'>
       <div id='noosfero_bar' class='category<%= category_color %>'>
-       <div id='top_bar' class='category<%= category_color %>'>
         <div id='accessibility_menu'>
-          <a href='#content'><span><%= _('Go Content') %></span></a>
+          <a href='#content' id='icon_go_content'><span><%= _('Go Content') %></span></a>
          <%= shortcut_header_links %>
         </div><!-- accessibility_menu -->
-        <div id='path_category'>
+      <div id='top_bar' class='category<%= category_color %>'>
+       <div id='path_category'>
         <% if @category %>
             <%= @category.full_name %>
         <% else @category %>
@@ -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;
 /* 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(&#39;../images/icons-bar/logout.png&#39;);
 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(&#39;../images/icons-bar/accessibility.png&#39;);
   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 {
	@@ -77,6 +77,12 @@ clear: both;		@@ -77,6 +77,12 @@ clear: both;
77		77
78	/* Artigos */	78	/* Artigos */
79		79
		80	+div.recentdocumentsblock ul {
		81	+margin: 0px;
		82	+padding: 0px;
		83	+list-style: none;
		84	+}
		85	+
80	div.recentdocumentsblock div.block_content li a {	86	div.recentdocumentsblock div.block_content li a {
81	text-decoration: none;	87	text-decoration: none;
82	color: #545454;	88	color: #545454;