Download as
Browse Code »

Commit 8c2a15631a0af09273e2061376dd0111243990a1

Authored by Moises Machado
Committed by Antonio Terceiro
1 parent 747e360f
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

ActionItem907: put name of profile and title of article on page title

Showing 2 changed files with 26 additions and 6 deletions   Show diff stats
app/views/layouts/application.rhtml
  Diff comments   View file @8c2a156
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>"> 2 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>">
3 <head> 3 <head>
4 - <title>  
5 - <%= @environment.name() %>  
6 - <%- if @category -%>  
7 - &rarr; <%= @category.full_name -%>  
8 - <%- end -%>  
9 - </title> 4 + <title><%=
  5 + (@page ? @page.name + ' - ' : '') +
  6 + (@profile ? @profile.name + ' - ' : '') +
  7 + @environment.name +
  8 + (@category ? "&rarr; #{@category.full_name}" : '')
  9 + %></title>
10 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 10 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
11 <meta name="description" content="FIXME: Descriptions of Noosfero" /> 11 <meta name="description" content="FIXME: Descriptions of Noosfero" />
12 <meta name="keywords" content="Noosfero, Community, Open Source" /> 12 <meta name="keywords" content="Noosfero, Community, Open Source" />
test/functional/application_controller_test.rb
  Diff comments   View file @8c2a156
@@ -388,4 +388,24 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase @@ -388,4 +388,24 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
388 assert_no_tag :tag => 'a', :content => /Category 2/ 388 assert_no_tag :tag => 'a', :content => /Category 2/
389 end 389 end
390 390
  391 + should 'show name of article as title of page' do
  392 + p = create_user('test_user').person
  393 + a = p.articles.create!(:name => 'test article')
  394 +
  395 + @controller.instance_variable_set('@profile', p)
  396 + @controller.instance_variable_set('@page', a)
  397 +
  398 + get :index
  399 + assert_tag 'title', :content => 'test article - ' + p.name + ' - ' + p.environment.name
  400 + end
  401 +
  402 + should 'diplay name of profile in the title' do
  403 + p = create_user('test_user').person
  404 + p.name = 'Some Test User'
  405 + p.save!
  406 + @controller.instance_variable_set('@profile', p)
  407 +
  408 + get :index, :profile => p.identifier
  409 + assert_tag 'title', :content => p.name + ' - ' + p.environment.name
  410 + end
391 end 411 end