Download as
Browse Code »

Commit a237136fb9a06833f8ded3c224261776fa027199

Authored by Rodrigo Souto
1 parent 3dc53d33
Exists in master and in 27 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, temp_ratings, tests, tests_fixies

[template-welcome-page] Let template name to be completed on the welcome page partial

Showing 3 changed files with 5 additions and 5 deletions   Show diff stats
app/views/home/welcome.html.erb
  Diff comments   View file @a237136
@@ -16,5 +16,5 @@ @@ -16,5 +16,5 @@
16 <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p> 16 <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
17 <p><%= _("Start exploring and have fun!") %></p> 17 <p><%= _("Start exploring and have fun!") %></p>
18 <% end %> 18 <% end %>
19 - <%= render :partial => 'shared/template_welcome_page', :locals => {:template => @person_template, :header => _("What can I do as a %s?") % @person_template.name}%> 19 + <%= render :partial => 'shared/template_welcome_page', :locals => {:template => @person_template, :header => _("What can I do as a %s?")} %>
20 </div> 20 </div>
app/views/memberships/welcome.html.erb
  Diff comments   View file @a237136
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 <p><%= __("Your community (%s) was successfully created.") % @community.name %></p> 2 <p><%= __("Your community (%s) was successfully created.") % @community.name %></p>
3 <p><%= link_to __('You can manage your community now.'), @community.admin_url %></p> 3 <p><%= link_to __('You can manage your community now.'), @community.admin_url %></p>
4 4
5 -<%= render :partial => 'shared/template_welcome_page', :locals => {:template => @community.template, :header => _("What can I do with a community?")} %> 5 +<%= render :partial => 'shared/template_welcome_page', :locals => {:template => @community.template, :header => _("What can I do with a %s?")} %>
6 6
7 -<% button_bar do%> 7 +<% button_bar do %>
8 <%= button :back, _('Back'), @back_to %> 8 <%= button :back, _('Back'), @back_to %>
9 <% end %> 9 <% end %>
app/views/shared/_template_welcome_page.html.erb
  Diff comments   View file @a237136
1 -<% if template.welcome_page_content.present? %>  
2 - <h1><%= header %></h1> 1 +<% if template && template.welcome_page_content.present? %>
  2 + <h1><%= header % template.name %></h1>
3 <%= template.welcome_page_content.html_safe %> 3 <%= template.welcome_page_content.html_safe %>
4 <% end %> 4 <% end %>