Download as
Browse Code »

Commit bd013b8f69df9f861be29007222e7eb55fb18857

Authored by MoisesMachado
1 parent 9ffa9135
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem111: changed some links in the inteface 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@714 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 22 additions and 3 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @bd013b8
@@ -146,6 +146,25 @@ module ApplicationHelper @@ -146,6 +146,25 @@ module ApplicationHelper
146 content_tag('span', (link_to _('Logout'), { :controller => 'account', :action => 'logout'}, :method => 'post'), :id => 'logout_box') 146 content_tag('span', (link_to _('Logout'), { :controller => 'account', :action => 'logout'}, :method => 'post'), :id => 'logout_box')
147 end 147 end
148 148
  149 + def account_links
  150 +
  151 +
  152 + end
  153 +
  154 + def admin_links
  155 + end
  156 +
  157 + def user_options
  158 + case params[:controller]
  159 + when 'account'
  160 + account_links
  161 + when 'admin'
  162 + admin_links
  163 + else
  164 + nil
  165 + end
  166 + end
  167 +
149 def footer 168 def footer
150 # FIXME: add some information from the environment 169 # FIXME: add some information from the environment
151 [ 170 [
app/views/shared/categories_menu.rhtml
  Diff comments   View file @bd013b8
1 <ul> 1 <ul>
2 - <li id='category' class="active">  
3 - Noosfero 2 + <li id='category' <%= 'class="active"' unless @category %> >
  3 + <%= Noosfero::PROJECT.capitalize %>
4 <ul> 4 <ul>
5 - <li><%= link_to Noosfero::PROJECT, :controller => 'home' %> <%= header %></li> 5 + <li><%= link_to _('Home'), :controller => 'home' %> <%= header %></li>
6 </ul> 6 </ul>
7 </li> 7 </li>
8 <% @environment.display_categories.each do |item| %> 8 <% @environment.display_categories.each do |item| %>