Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 0b2c4118a0894f722318ae4d861baddb8f66fd4d

 interface/web/mailuser/templates/mail_user_filter_edit.htm

@@ -10,16 +10,16 @@
                <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"><select id="source" name="source" class="form-control">{tmpl_var name='source'}</select></div>
                <div class="col-sm-9"><select id="op" name="op" class="form-control">{tmpl_var name='op'}</select></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="col-sm-3"><select id="source" name="source" class="form-control">{tmpl_var name='source'}</select></div>
                <div class="col-sm-3"><select id="op" name="op" class="form-control">{tmpl_var name='op'}</select></div>
                <div class="col-sm-3"><input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" class="form-control"></div></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"><select id="action" name="action" class="form-control">{tmpl_var name='action'}</select></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="col-sm-3"><select id="action" name="action" class="form-control">{tmpl_var name='action'}</select></div>
                <div class="col-sm-3"><input type="text" id="target" name="target" value="{tmpl_var name='target'}" class="form-control"></div></div>
            <div class="form-group">
                <label for="active" class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                <span class="">{tmpl_var name='active'}</span>
                <div class="col-sm-9"><div class="checkbox"><label>{tmpl_var name='active'}</label></div></div>
            </div>