Merge branch 'stable-3.1' into 'stable-3.1'

Stable 3.1



See merge request !536

Author: Till Brehm

interface/web/client/templates/message_template.htm

@@ -18,13 +18,13 @@ <h1><tmpl_var name="list_head_txt"></h1>
         <div class="col-sm-9"><input type="text" name="template_name" id="template_name" value="{tmpl_var name='template_name'}" class="form-control" /></div></div>
       <div class="form-group">
       	<label for="subject" class="col-sm-3 control-label">{tmpl_var name='subject_txt'}</label>
-        <div class="col-sm-9"><input type="text" name="subject" id="subject" value="{tmpl_var name='subject'}" class="form-control" /></div>
-		<div class="col-sm-3 col-text"></div><div class="col-sm-9 col-text">{tmpl_var name='variables_txt'}: {tmpl_var name="message_variables"} <br />{tmpl_var name='variables_description_txt'}</div>
+        <div class="col-sm-9"><input type="text" name="subject" id="subject" value="{tmpl_var name='subject'}" class="form-control" />
+		{tmpl_var name='variables_txt'}: {tmpl_var name="message_variables"} <br />{tmpl_var name='variables_description_txt'}</div>
 			</div>
       <div class="form-group">
       	<label for="message" class="col-sm-3 control-label">{tmpl_var name='message_txt'}</label>
-        <div class="col-sm-9"><textarea class="form-control" name="message" id="message" style="height:300px">{tmpl_var name='message'}</textarea></div>
-		<div class="col-sm-3 col-text"></div><div class="col-sm-9 col-text">{tmpl_var name='variables_txt'}: {tmpl_var name="message_variables"} <br />{tmpl_var name='variables_description_txt'}</div>
+        <div class="col-sm-9"><textarea class="form-control" name="message" id="message" style="height:300px">{tmpl_var name='message'}</textarea>
+		{tmpl_var name='variables_txt'}: {tmpl_var name="message_variables"} <br />{tmpl_var name='variables_description_txt'}</div>
       </div>
 	  <div class="clear"><div class="right">
       <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="client/message_template_edit.php">{tmpl_var name='btn_save_txt'}</button>
@@ -36,5 +36,3 @@ <h1><tmpl_var name="list_head_txt"></h1>
 
 
   </div>
-  
-</div>