From c8036845192a48b813a8e9b83fb3af6ded47c28d Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Wed, 11 Jun 2014 19:22:07 +0000
Subject: [PATCH] [template-welcome-page] Display default content on environment welcome page customization

---
 app/views/admin_panel/_signup_welcome_screen.html.erb | 10 ++++++++--
 1 file changed, 8 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 26bdb53..6c1cb7b 100644
--- a/app/views/admin_panel/_signup_welcome_screen.html.erb
+++ b/app/views/admin_panel/_signup_welcome_screen.html.erb
@@ -1,5 +1,11 @@
 <div class='description'>
-  <%= _('This text will be showed as a welcome message to users after signup') %><br/><br/>
+  <%= _('This text will be showed as a welcome message to users after signup.') %><br/><br/>
 </div>
-
 <%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
+
+<p>
+<div class='description'>
+  <%= _('If this content is left blank, the following page will be displayed to the user.') %><br/><br/>
+</div>
+<p>
+<%= render :file => 'home/welcome' %>
--
libgit2 0.21.2