From 43548e507b1013a7a9f4365862670a6e90dce4af Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Wed, 30 Jul 2014 20:56:28 +0000 Subject: [PATCH] Display default welcome page on administration --- app/views/admin_panel/_signup_welcome_screen.html.erb | 2 +- app/views/home/welcome.html.erb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/admin_panel/_signup_welcome_screen.html.erb b/app/views/admin_panel/_signup_welcome_screen.html.erb index d01aa8d..702ef43 100644 --- a/app/views/admin_panel/_signup_welcome_screen.html.erb +++ b/app/views/admin_panel/_signup_welcome_screen.html.erb @@ -8,4 +8,4 @@ <%= _('If this content is left blank, the following page will be displayed to the user:') %>

-<%= render :file => 'home/welcome' %> +<%= render :file => 'home/welcome', :locals => {:default_message => true} %> diff --git a/app/views/home/welcome.html.erb b/app/views/home/welcome.html.erb index 81557b6..cf7df19 100644 --- a/app/views/home/welcome.html.erb +++ b/app/views/home/welcome.html.erb @@ -1,6 +1,8 @@ +<% default_message = defined?(default_message) ? default_message : false %> +

<%= _("Welcome to %s!") % environment.name %>

- <% if environment.has_custom_welcome_screen? %> + <% if environment.has_custom_welcome_screen? && !default_message %> <%= environment.settings[:signup_welcome_screen_body].html_safe %> <% else %>

<%= _("Thanks for signing up, we're thrilled to have you on our social network!") %>

-- libgit2 0.21.2