Download as
Browse Code »

Commit 2a250870f05e18d46d3ae13e9e8b017fd54e978f

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent 21196194
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

ActionItem1170: adding environment name as description

Showing 3 changed files with 7 additions and 1 deletions   Show diff stats
app/views/layouts/application-ng.rhtml
  Diff comments   View file @2a25087
... ... @@ -5,6 +5,7 @@
5 5 <%= meta_tags_for_article(@page) %>
6 6 <!--<meta http-equiv="refresh" content="1"/>-->
7 7 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  8 + <meta name="description" content="<%= @environment.name %>" />
8 9 <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/imgs/favicon.ico' %>" type="image/x-icon" />
9 10 <%= noosfero_javascript %>
10 11 <%= import_blocks_stylesheets %>
... ...
app/views/layouts/application.rhtml
  Diff comments   View file @2a25087
... ... @@ -3,7 +3,7 @@
3 3 <head>
4 4 <title><%= page_title %></title>
5 5 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6   - <meta name="description" content="FIXME: Descriptions of Noosfero" />
  6 + <meta name="description" content="<%= @environment.name %>" />
7 7 <meta name="keywords" content="Noosfero, Community, Open Source" />
8 8 <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/images/favicon.ico' %>" type="image/x-icon" />
9 9 <!-- ok --><%= meta_tags_for_article(@page) %>
... ...
test/functional/application_controller_test.rb
  Diff comments   View file @2a25087
... ... @@ -427,4 +427,9 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
427 427 assert_equal false, @controller.avoid_ssl
428 428 end
429 429  
  430 + should 'diplay name of environment in description' do
  431 + get :index
  432 + assert_tag :tag => 'meta', :attributes => { :name => 'description', :content => assigns(:environment).name }
  433 + end
  434 +
430 435 end
... ...