Download as
Browse Code »

Commit f1dd48d269affba0d6e3f91d90d77ebc7075edad

Authored by Daniela Feitosa
1 parent 12a28da7
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

Added info to better sharing in other networks 

* Changed title tag

(ActionItem2610)
Showing 2 changed files with 17 additions and 2 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @f1dd48d
@@ -889,12 +889,11 @@ module ApplicationHelper @@ -889,12 +889,11 @@ module ApplicationHelper
889 889
890 def page_title 890 def page_title
891 (@page ? @page.title + ' - ' : '') + 891 (@page ? @page.title + ' - ' : '') +
892 - (profile ? profile.short_name + ' - ' : '') +  
893 (@topic ? @topic.title + ' - ' : '') + 892 (@topic ? @topic.title + ' - ' : '') +
894 (@section ? @section.title + ' - ' : '') + 893 (@section ? @section.title + ' - ' : '') +
895 (@toc ? _('Online Manual') + ' - ' : '') + 894 (@toc ? _('Online Manual') + ' - ' : '') +
896 (@controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') + 895 (@controller.controller_name == 'chat' ? _('Chat') + ' - ' : '') +
897 - environment.name + 896 + (profile ? profile.short_name : environment.name) +
898 (@category ? " - #{@category.full_name}" : '') 897 (@category ? " - #{@category.full_name}" : '')
899 end 898 end
900 899
test/unit/application_helper_test.rb
  Diff comments   View file @f1dd48d
@@ -466,6 +466,22 @@ class ApplicationHelperTest < ActiveSupport::TestCase @@ -466,6 +466,22 @@ class ApplicationHelperTest < ActiveSupport::TestCase
466 assert_match(/Community nick/, page_title) 466 assert_match(/Community nick/, page_title)
467 end 467 end
468 468
  469 + should 'not display environment name if is a profile' do
  470 + stubs(:environment).returns(Environment.default)
  471 + @controller = ApplicationController.new
  472 +
  473 + c = fast_create(Community, :name => 'Community for tests', :nickname => 'Community nick', :identifier => 'test_comm')
  474 + stubs(:profile).returns(c)
  475 + assert_equal c.short_name, page_title
  476 + end
  477 +
  478 + should 'display only environment if no profile and page' do
  479 + stubs(:environment).returns(Environment.default)
  480 + @controller = ApplicationController.new
  481 +
  482 + assert_equal Environment.default.name, page_title
  483 + end
  484 +
469 should 'gravatar default parameter' do 485 should 'gravatar default parameter' do
470 profile = mock 486 profile = mock
471 profile.stubs(:theme).returns('some-theme') 487 profile.stubs(:theme).returns('some-theme')