Commit 019145251e3d16da65a4f91e7bb09a5716757aa6

Authored by Daniela Feitosa
1 parent ec6a7795

signup_welcome_screen: fixed warnings of incorrect html

Also removed needless "p" and "br" elements
app/views/admin_panel/_signup_welcome_screen.html.erb
1 <div class='description'> 1 <div class='description'>
2 - <%= _('If you enable this feature on the "Features" section of the Administration Panel, this text will be shown as a welcome message to users after signup.') %><br/><br/> 2 + <%= _('If you enable this feature on the "Features" section of the Administration Panel, this text will be shown as a welcome message to users after signup.') %>
3 </div> 3 </div>
4 <%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %> 4 <%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
5 5
6 -<p>  
7 <div class='description'> 6 <div class='description'>
8 - <%= _('If this content is left blank, the following page will be displayed to the user:') %><br/><br/> 7 + <%= _('If this content is left blank, the following page will be displayed to the user:') %>
9 </div> 8 </div>
10 -<p> 9 +
11 <%= render :file => 'home/welcome', :locals => {:default_message => true} %> 10 <%= render :file => 'home/welcome', :locals => {:default_message => true} %>
public/stylesheets/application.css
@@ -2835,7 +2835,8 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation @@ -2835,7 +2835,8 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
2835 .controller-admin_panel .description { 2835 .controller-admin_panel .description {
2836 background-color: #E6E6E6; 2836 background-color: #E6E6E6;
2837 border: 1px solid #CCC; 2837 border: 1px solid #CCC;
2838 - padding: 5px; 2838 + padding: 10px 5px;
  2839 + margin-top: 10px;
2839 } 2840 }
2840 2841
2841 /* ==> public/stylesheets/controller_catalog.css <== */ 2842 /* ==> public/stylesheets/controller_catalog.css <== */