Download as
Browse Code »

Commit 6d6827592f89558139879cb606f7a7d4d2f1916a

Authored by AntonioTerceiro
1 parent 652d181c
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem70: correctly displaying the current category's color in the top bar 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@544 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 13 additions and 5 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @6d68275
@@ -186,4 +186,12 @@ module ApplicationHelper @@ -186,4 +186,12 @@ module ApplicationHelper
186 end 186 end
187 end 187 end
188 188
  189 + def category_color
  190 + if @category.nil?
  191 + ""
  192 + else
  193 + @category.top_ancestor.display_color
  194 + end
  195 + end
  196 +
189 end 197 end
app/views/layouts/application.rhtml
  Diff comments   View file @6d68275
@@ -26,8 +26,8 @@ @@ -26,8 +26,8 @@
26 26
27 <%= image_tag 'loading.gif', :id => 'spinner', :style => "display:none; float:right;", :alt => _('Image for Loading...') %> 27 <%= image_tag 'loading.gif', :id => 'spinner', :style => "display:none; float:right;", :alt => _('Image for Loading...') %>
28 28
29 - <div id="wrap" class='category1'>  
30 - <div id='noosfero_bar' class='category1'> 29 + <div id="wrap" class='category<%= category_color %>'>
  30 + <div id='noosfero_bar' class='category<%= category_color %>'>
31 <div id='accessibility_menu'> 31 <div id='accessibility_menu'>
32 <a href='#'>Acessibilidade</a> 32 <a href='#'>Acessibilidade</a>
33 <a href='#'>Central de Buscas</a> 33 <a href='#'>Central de Buscas</a>
@@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@
52 <div id="header"> 52 <div id="header">
53 <%= header %> 53 <%= header %>
54 </div> 54 </div>
  55 +
55 </div><!-- id="noosfero_bar" --> 56 </div><!-- id="noosfero_bar" -->
56 57
57 58
public/artwork/newbar/menu.html
  Diff comments   View file @6d68275
@@ -8,8 +8,8 @@ @@ -8,8 +8,8 @@
8 </head> 8 </head>
9 <body> 9 <body>
10 10
11 - <div id="wrap" class='category1'>  
12 - <div id='noosfero_bar' class='category1'> 11 + <div id="wrap" class='category2'>
  12 + <div id='noosfero_bar' class='category2'>
13 <div id='accessibility_menu'> 13 <div id='accessibility_menu'>
14 <a href='#'>Acessibilidade</a> 14 <a href='#'>Acessibilidade</a>
15 <a href='#'>Central de Buscas</a> 15 <a href='#'>Central de Buscas</a>
public/stylesheets/menu.css
  Diff comments   View file @6d68275
@@ -230,7 +230,6 @@ clear: both; @@ -230,7 +230,6 @@ clear: both;
230 230
231 #header { 231 #header {
232 clear: left; 232 clear: left;
233 - background: #204a87;  
234 padding: 3px; 233 padding: 3px;
235 text-align: left; 234 text-align: left;
236 margin-left: -290px; 235 margin-left: -290px;