ActionItem111: added more links to the user_options bar

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

ActionItem111: added more links to the user_options bar
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@727 3f533792-8f58-4932-b0fe-aaf55b0a4547
MoisesMachado
1 parent 05b73d10
Showing 4 changed files with 46 additions and 11 deletions Show diff stats
app/controllers/public/home_controller.rb
app/helpers/application_helper.rb
app/views/layouts/application.rhtml
script/populate
@@ -2,6 +2,6 @@ class HomeController &lt; PublicController
   design :holder => 'environment'
   def index
-#    redirect_to homepage_path(:profile => 'anhetegua')
+    redirect_to homepage_path(:profile => 'noosfero') if Profile.find_by_identifier('noosfero')
   end
 end
@@ -115,14 +115,20 @@ module ApplicationHelper
   # FIXME: uncomment "My enterprises" links
   def user_links
     links = [
-       ( link_to_homepage(current_user.login) ),
-       ( link_to(_('My account'), { :controller => 'account' }) ),
+       ( link_to_homepage( _('My account') )),
        ( link_to_myprofile _('My Enterprises'), {:controller => 'membership_editor'} ),
        ( link_to(_('Admin'), { :controller => 'admin_panel' }) if current_user.person.is_admin?),
+       ( link_to_document (about_document), _('About')  if about_document ),
     ].join("\n")
     content_tag('span', links, :id => 'user_links')
   end
+  def about_document
+    Article.find_all_by_title('About').select do |a| 
+      a.full_path.split(/\//).shift == 'noosfero'
+    end[0]
+  end
+
   def header
     login_or_register_or_logout
   end
@@ -190,30 +196,58 @@ module ApplicationHelper
     ]
   end
+  def myprofile_links
+    links = [
+      [(link_to _('Change password'), {:controller => 'account', :action => 'change_password'}), 'edit_profile', profile]
+    ]
+  end
+
+  def about_links
+    links = [
+      [(link_to _('Report bug'), 'http://www.colivre.coop.br/Noosfero/BugItem')],
+    ]
+  end
+
+  def design_links
+    links = [
+      [(link_to _('Change template'), :controller => 'profile_editor', :action => 'design_editor_change_template')],
+      [(link_to _('Change block theme'), :controller => 'profile_editor', :action => 'design_editor_change_theme')],
+      [(link_to _('Change icon theme'), :controller => 'profile_editor', :action => 'design_editor_change_icon_theme')],
+    ]
+  end
-  #FIXME: find a way of accessing environment from here
   def user_options
-    profile = params[:profile]
+    profile = Profile.find_by_identifier(params[:profile])
     case params[:controller]
       when 'admin_panel'
         admin_links
       when 'membership_editor'
         membership_links
       when 'profile_editor'
-        if profile.kind_of?(Enterprise)
+        if profile.kind_of?(Enterprise) && params[:action] == 'index'
           enterprise_links
-        elsif profile.kind_of?(Person)
-          person_links
+        elsif profile.kind_of?(Person) && params[:action] == 'index'
+           myprofile_links
+        elsif params[:action] == 'design_editor'
+          design_links
         else
           []
         end
       when 'content_viewer'
-        person_links
+        if params[:profile] == 'noosfero' && params[:page][0] == 'about'
+          about_links
+        else
+          person_links
+        end
       else
         []
     end.map{|l| link_if_permitted(l[0], l[1], l[2]) }
   end
+  def accessibility_link
+    link_to _('Accessibility') 
+  end
+
   def footer
     # FIXME: add some information from the environment
     [
@@ -63,7 +63,8 @@
       <div id='noosfero_bar' class='category<%= category_color %>'>
        <div id='top_bar' class='category<%= category_color %>'>
         <div id='accessibility_menu'>
-          <a href='#content' title='Ir para o conteúdo'>Ir para conteúdo</a>
+	  <a href='#content' title='Ir para o conteúdo'>Ir para conteúdo</a>
+	  <%= accessibility_link  %>
 	  <a href='#'>Acessibilidade</a>
         </div><!-- accessibility_menu -->
 	<div id='path_category'>
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/environment'
-anhetegua = Profile.create!(:name => 'anhetegua', :identifier => 'anhetegua')
+anhetegua = Profile.create!(:name => 'noosfero', :identifier => 'noosfero')
 User.create!(:login => 'testprofile', :email => 'admin@localhost.localdomain', :password => 'test', :password_confirmation => 'test')
 User.create!(:login => 'user', :email => 'user@localhost.localdomain', :password => 'user', :password_confirmation => 'user')
	@@ -2,6 +2,6 @@ class HomeController < PublicController		@@ -2,6 +2,6 @@ class HomeController < PublicController
2		2
3	design :holder => 'environment'	3	design :holder => 'environment'
4	def index	4	def index
5	-# redirect_to homepage_path(:profile => 'anhetegua')	5	+ redirect_to homepage_path(:profile => 'noosfero') if Profile.find_by_identifier('noosfero')
6	end	6	end
7	end	7	end
1	#!/usr/bin/env ruby	1	#!/usr/bin/env ruby
2	require File.dirname(__FILE__) + '/../config/environment'	2	require File.dirname(__FILE__) + '/../config/environment'
3		3
4	-anhetegua = Profile.create!(:name => 'anhetegua', :identifier => 'anhetegua')	4	+anhetegua = Profile.create!(:name => 'noosfero', :identifier => 'noosfero')
5		5
6	User.create!(:login => 'testprofile', :email => 'admin@localhost.localdomain', :password => 'test', :password_confirmation => 'test')	6	User.create!(:login => 'testprofile', :email => 'admin@localhost.localdomain', :password => 'test', :password_confirmation => 'test')
7	User.create!(:login => 'user', :email => 'user@localhost.localdomain', :password => 'user', :password_confirmation => 'user')	7	User.create!(:login => 'user', :email => 'user@localhost.localdomain', :password => 'user', :password_confirmation => 'user')