From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/client/templates/client_message.htm | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/interface/web/client/templates/client_message.htm b/interface/web/client/templates/client_message.htm
index 72432f8..7e1b1da 100644
--- a/interface/web/client/templates/client_message.htm
+++ b/interface/web/client/templates/client_message.htm
@@ -9,28 +9,27 @@
<div id="OKMsg"><p><tmpl_var name="okmsg"></p></div>
</tmpl_if>
<tmpl_if name="error">
- <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+ <div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
</tmpl_if>
<div class="form-group">
<label for="sender" class="col-sm-3 control-label">{tmpl_var name='sender_txt'}</label>
- <div class="col-sm-9"><input type="text" name="sender" id="sender" value="{tmpl_var name='sender'}" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="sender" id="sender" value="{tmpl_var name='sender'}" class="form-control" /></div></div>
<div class="form-group">
<label for="recipient" class="col-sm-3 control-label">{tmpl_var name='recipient_txt'}</label>
<div class="col-sm-9"><select name="recipient" id="recipient" class="form-control">
{tmpl_var name='recipient'}
- </select>
- </div></div>
+ </select></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'}" style="width:500px" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="subject" id="subject" value="{tmpl_var name='subject'}" class="form-control" /></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" rows='' cols='' style="width:500px">{tmpl_var name='message'}</textarea></div> {tmpl_var name="variables_txt"} {tmpl_var name="message_variables"}
+ <div class="col-sm-9"><textarea class="form-control" name="message" id="message" rows="10">{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>
<div class="clear"><div class="right">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_send_txt'}" onclick="submitForm('pageForm','client/client_message.php');">{tmpl_var name='btn_send_txt'}</button>
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_send_txt'}" data-submit-form="pageForm" data-form-action="client/client_message.php">{tmpl_var name='btn_send_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/client_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
\ No newline at end of file
--
Gitblit v1.9.1