Download as
Browse Code »

Commit 2a250870f05e18d46d3ae13e9e8b017fd54e978f

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

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,6 +5,7 @@
5 <%= meta_tags_for_article(@page) %> 5 <%= meta_tags_for_article(@page) %>
6 <!--<meta http-equiv="refresh" content="1"/>--> 6 <!--<meta http-equiv="refresh" content="1"/>-->
7 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 7 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  8 + <meta name="description" content="<%= @environment.name %>" />
8 <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/imgs/favicon.ico' %>" type="image/x-icon" /> 9 <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/imgs/favicon.ico' %>" type="image/x-icon" />
9 <%= noosfero_javascript %> 10 <%= noosfero_javascript %>
10 <%= import_blocks_stylesheets %> 11 <%= import_blocks_stylesheets %>
app/views/layouts/application.rhtml
  Diff comments   View file @2a25087
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <head> 3 <head>
4 <title><%= page_title %></title> 4 <title><%= page_title %></title>
5 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 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 <meta name="keywords" content="Noosfero, Community, Open Source" /> 7 <meta name="keywords" content="Noosfero, Community, Open Source" />
8 <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/images/favicon.ico' %>" type="image/x-icon" /> 8 <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/images/favicon.ico' %>" type="image/x-icon" />
9 <!-- ok --><%= meta_tags_for_article(@page) %> 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,4 +427,9 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
427 assert_equal false, @controller.avoid_ssl 427 assert_equal false, @controller.avoid_ssl
428 end 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 end 435 end