Commit 646f9838 authored by Ad Schellevis's avatar Ad Schellevis

(ids) move installable rules to separate tab, make room for additional settings

parent ddca91c1
...@@ -421,6 +421,18 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -421,6 +421,18 @@ POSSIBILITY OF SUCH DAMAGE.
} }
}); });
$("#grid-rule-files-search").keydown(function (e) {
var searchString = $(this).val();
$("#grid-rule-files > tbody > tr").each(function(){
var itemName = $(this).children('td:eq(1)').html();
if (itemName.toLowerCase().indexOf(searchString.toLowerCase())>=0) {
$(this).show();
} else {
$(this).hide();
}
});
});
/** /**
* Change sid to action selector after DialogAlert show * Change sid to action selector after DialogAlert show
*/ */
...@@ -509,6 +521,7 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -509,6 +521,7 @@ POSSIBILITY OF SUCH DAMAGE.
<ul class="nav nav-tabs" data-tabs="tabs" id="maintabs"> <ul class="nav nav-tabs" data-tabs="tabs" id="maintabs">
<li class="active"><a data-toggle="tab" href="#settings" id="settings_tab">{{ lang._('Settings') }}</a></li> <li class="active"><a data-toggle="tab" href="#settings" id="settings_tab">{{ lang._('Settings') }}</a></li>
<li><a data-toggle="tab" href="#download_settings" id="download_settings_tab">{{ lang._('Download') }}</a></li>
<li><a data-toggle="tab" href="#rules" id="rule_tab">{{ lang._('Rules') }}</a></li> <li><a data-toggle="tab" href="#rules" id="rule_tab">{{ lang._('Rules') }}</a></li>
<li><a data-toggle="tab" href="#userrules" id="userrules_tab">{{ lang._('User defined') }}</a></li> <li><a data-toggle="tab" href="#userrules" id="userrules_tab">{{ lang._('User defined') }}</a></li>
<li><a data-toggle="tab" href="#alerts" id="alert_tab">{{ lang._('Alerts') }}</a></li> <li><a data-toggle="tab" href="#alerts" id="alert_tab">{{ lang._('Alerts') }}</a></li>
...@@ -517,12 +530,16 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -517,12 +530,16 @@ POSSIBILITY OF SUCH DAMAGE.
<div class="tab-content content-box tab-content"> <div class="tab-content content-box tab-content">
<div id="settings" class="tab-pane fade in active"> <div id="settings" class="tab-pane fade in active">
{{ partial("layout_partials/base_form",['fields':formGeneralSettings,'id':'frm_GeneralSettings'])}} {{ partial("layout_partials/base_form",['fields':formGeneralSettings,'id':'frm_GeneralSettings'])}}
<div class="col-md-12">
<hr/>
<button class="btn btn-primary" id="reconfigureAct" type="button"><b>{{ lang._('Apply') }}</b><i id="reconfigureAct_progress" class=""></i></button>
<br/>
<br/>
</div>
</div>
<div id="download_settings" class="tab-pane fade in">
<!-- add installable rule files --> <!-- add installable rule files -->
<table class="table table-striped table-condensed table-responsive"> <table class="table table-striped table-condensed table-responsive">
<colgroup>
<col class="col-md-3"/>
<col class="col-md-9"/>
</colgroup>
<tbody> <tbody>
<tr> <tr>
<td><div class="control-label"> <td><div class="control-label">
...@@ -534,11 +551,19 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -534,11 +551,19 @@ POSSIBILITY OF SUCH DAMAGE.
<table class="table table-condensed table-responsive"> <table class="table table-condensed table-responsive">
<tr> <tr>
<td> <td>
<div class="row">
<div class="col-xs-9">
<button data-toggle="tooltip" id="enableSelectedRuleSets" type="button" class="btn btn-xs btn-default btn-primary">{{ lang._('Enable selected') }}</span></button> <button data-toggle="tooltip" id="enableSelectedRuleSets" type="button" class="btn btn-xs btn-default btn-primary">{{ lang._('Enable selected') }}</span></button>
<button data-toggle="tooltip" id="disableSelectedRuleSets" type="button" class="btn btn-xs btn-default btn-primary">{{ lang._('Disable selected') }}</span></button> <button data-toggle="tooltip" id="disableSelectedRuleSets" type="button" class="btn btn-xs btn-default btn-primary">{{ lang._('Disable selected') }}</span></button>
</div>
<div class="col-xs-3" style="padding-top:0px;">
<input type="text" placeholder="{{ lang._('Search') }}" id="grid-rule-files-search" value=""/>
</div>
</div>
</td> </td>
</tr> </tr>
</table> </table>
<div style="max-height: 400px; width: 100%; margin: 0; overflow-y: auto;" id="grid-rule-files-container">
<table id="grid-rule-files" class="table table-condensed table-hover table-striped table-responsive" data-editDialog="DialogRuleset"> <table id="grid-rule-files" class="table table-condensed table-hover table-striped table-responsive" data-editDialog="DialogRuleset">
<thead> <thead>
<tr> <tr>
...@@ -552,13 +577,25 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -552,13 +577,25 @@ POSSIBILITY OF SUCH DAMAGE.
<tbody> <tbody>
</tbody> </tbody>
</table> </table>
</div>
</td> </td>
</tr> </tr>
<!--
<tr>
<td><div class="control-label">
<i class="fa fa-info-circle text-muted"></i>
<b>{{ lang._('Settings') }}</b>
</div>
</td>
<td>
</td>
</tr>
-->
</tbody> </tbody>
</table> </table>
<div class="col-md-12"> <div class="col-md-12">
<hr/> <hr/>
<button class="btn btn-primary" id="reconfigureAct" type="button"><b>{{ lang._('Apply') }}</b><i id="reconfigureAct_progress" class=""></i></button>
<button class="btn btn-primary" id="updateRulesAct" type="button"><b>{{ lang._('Download & Update Rules') }}</b><i id="updateRulesAct_progress" class=""></i></button> <button class="btn btn-primary" id="updateRulesAct" type="button"><b>{{ lang._('Download & Update Rules') }}</b><i id="updateRulesAct_progress" class=""></i></button>
<br/> <br/>
<i>{{ lang._('Please use "Download & Update Rules" to fetch your initial ruleset, automatic updating can be scheduled after the first download.') }} </i> <i>{{ lang._('Please use "Download & Update Rules" to fetch your initial ruleset, automatic updating can be scheduled after the first download.') }} </i>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment