From 6b1fde7e9a450ae8e4835f7e8c2ba1f398e78c1f Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 21 May 2015 04:14:10 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'
---
interface/web/mail/templates/mail_user_filter_edit.htm | 53 +++++++++++++++++++++++++----------------------------
1 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/interface/web/mail/templates/mail_user_filter_edit.htm b/interface/web/mail/templates/mail_user_filter_edit.htm
index f7fb4c7..cb2d79a 100644
--- a/interface/web/mail/templates/mail_user_filter_edit.htm
+++ b/interface/web/mail/templates/mail_user_filter_edit.htm
@@ -1,38 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_user_filter">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="rulename" class="wf_preField">{tmpl_var name='rulename_txt'}</label>
- <input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" size="30" maxlength="255" class="textInput">
+
+ <div class="form-group">
+ <label for="rulename" class="col-sm-3 control-label">{tmpl_var name='rulename_txt'}</label>
+ <div class="col-sm-9"><input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" class="form-control"></div>
+ </div>
+ <div class="form-group">
+ <label for="source" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
+ <div class="col-sm-9" style="margin-bottom:10px"><select id="source" name="source" class="form-control">{tmpl_var name='source'}</select></div>
+ <div class="col-sm-3"></div><div class="col-sm-9" style="margin-bottom:10px"><select id="op" name="op" class="form-control">{tmpl_var name='op'}</select></div>
+ <div class="col-sm-3"></div><div class="col-sm-9"><input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" class="form-control"></div>
</div>
- <div class="ctrlHolder">
- <label for="source" class="wf_preField">{tmpl_var name='source_txt'}</label>
- <select id="source" name="source" class="textInput formLengthHalf">{tmpl_var name='source'}</select>
- <select id="op" name="op" class="textInput formLengthHalf">{tmpl_var name='op'}</select><br><br>
- <div><label></label><input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" size="30" maxlength="255" class="textInput"></div>
+ <div class="form-group">
+ <label for="action" class="col-sm-3 control-label">{tmpl_var name='action_txt'}</label>
+ <div class="col-sm-9" style="margin-bottom:10px"><select id="action" name="action" class="form-control">{tmpl_var name='action'}</select></div>
+ <div class="col-sm-3"></div><div class="col-sm-9"><input type="text" id="target" name="target" value="{tmpl_var name='target'}" class="form-control"></div>
</div>
- <div class="ctrlHolder">
- <label for="action" class="wf_preField">{tmpl_var name='action_txt'}</label>
- <select id="action" name="action" class="textInput formLengthHalf">{tmpl_var name='action'}</select><br><br>
- <div><label></label><input type="text" id="target" name="target" value="{tmpl_var name='target'}" size="30" maxlength="255" class="textInput formLengthHalf"></div>
+ <div class="form-group">
+ <label for="active" class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9"><span class="">{tmpl_var name='active'}</span></div>
</div>
- <div class="ctrlHolder">
- <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
- <span class="">{tmpl_var name='active'}</span>
- </div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input name="mailuser_id" type="hidden" value="{tmpl_var name='mailuser_id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_user_filter_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='mailuser_id'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <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="mail/mail_user_filter_edit.php">{tmpl_var name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='mailuser_id'}">{tmpl_var name='btn_cancel_txt'}</button>
+ </div></div>
\ No newline at end of file
--
Gitblit v1.9.1