Download as
Browse Code »

Commit 595fbb0b89312442450dd84b09465d25f998777c

Authored by Antonio Terceiro
1 parent d4933c60
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

ActionItem866: small enhancements 

   * Adding profile's name on EnterpriseHomepage name
   * fix: don't expand variables when editing header/footer

Conflicts:

	app/models/profile.rb

Original work by:

	Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
Showing 2 changed files with 8 additions and 0 deletions   Show diff stats
app/models/enterprise_homepage.rb
  Diff comments   View file @595fbb0
@@ -8,6 +8,10 @@ class EnterpriseHomepage &lt; Article @@ -8,6 +8,10 @@ class EnterpriseHomepage &lt; Article
8 _('Display the summary of profile.') 8 _('Display the summary of profile.')
9 end 9 end
10 10
  11 + def name
  12 + profile.nil? ? _('Homepage') : profile.name
  13 + end
  14 +
11 # FIXME isn't this too much including just to be able to generate some HTML? 15 # FIXME isn't this too much including just to be able to generate some HTML?
12 include ActionView::Helpers::TagHelper 16 include ActionView::Helpers::TagHelper
13 include ActionView::Helpers::UrlHelper 17 include ActionView::Helpers::UrlHelper
app/views/cms/_enterprise_homepage.rhtml 0 → 100644
  Diff comments   View file @595fbb0
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
  1 +<%= render :file => 'shared/tiny_mce' %>
  2 +
  3 +<%= labelled_form_field(_('Text'), text_area(:article, 'body', :cols => 40, :style => 'width:99%')) %>
  4 +