Download as
Browse Code »

Commit 595fbb0b89312442450dd84b09465d25f998777c

Authored by Antonio Terceiro
1 parent d4933c60
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

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 8 _('Display the summary of profile.')
9 9 end
10 10  
  11 + def name
  12 + profile.nil? ? _('Homepage') : profile.name
  13 + end
  14 +
11 15 # FIXME isn't this too much including just to be able to generate some HTML?
12 16 include ActionView::Helpers::TagHelper
13 17 include ActionView::Helpers::UrlHelper
... ...
app/views/cms/_enterprise_homepage.rhtml 0 → 100644
  Diff comments   View file @595fbb0
... ... @@ -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 +
... ...