Merged revisions 3845-3876 and 3879-3918 from stable branch.

hellkat

2013-03-26 cc65688b3da3e16729a1f73dd50fd975bd1ff741

 interface/web/mail/templates/mail_user_filter_edit.htm

@@ -12,13 +12,13 @@
            <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>
                <input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" size="30" maxlength="255"  class="textInput">
                <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>
            <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>
                <input type="text" id="target" name="target" value="{tmpl_var name='target'}" size="30" maxlength="255"  class="textInput formLengthHalf">
                <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>
            <div class="ctrlHolder">
                <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>