Merge remote-tracking branch 'origin/master'

Weblate
2 parents ec62abf8 09d678bf
Showing 1 changed file with 2 additions and 2 deletions Show diff stats
app/views/profile/send_mail.html.erb
@@ -9,8 +9,8 @@
 <div class="template-selection">
   <% if @email_templates.present? %>
     <%= labelled_form_field(_('Select a template:'), select_tag(:template, options_from_collection_for_select(@email_templates, :id, :name), :include_blank => true, 'data-url' => url_for(:controller => 'email_templates', :action => 'show_parsed'))) %>
-  </div>
-<% end %>
+  <% end %>
+</div>
  
 <%= form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
...	...	@@ -9,8 +9,8 @@
9	9	<div class="template-selection">
10	10	<% if @email_templates.present? %>
11	11	<%= labelled_form_field(_('Select a template:'), select_tag(:template, options_from_collection_for_select(@email_templates, :id, :name), :include_blank => true, 'data-url' => url_for(:controller => 'email_templates', :action => 'show_parsed'))) %>
12		- </div>
13		-<% end %>
	12	+ <% end %>
	13	+</div>
14	14
15	15	<%= form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do \|f\| %>
16	16
...	...