diff options
| author | moisseev <moiseev@mezonplus.ru> | 2023-03-23 17:13:03 +0300 |
|---|---|---|
| committer | moisseev <moiseev@mezonplus.ru> | 2023-03-23 17:13:03 +0300 |
| commit | 55c0c08a65a973116aa0328b9af2fd719d2ee1dc (patch) | |
| tree | bf1d4226a7dd424df7b3c5c8047a87d166d9132e /interface/index.html | |
| parent | 29c7aa13b59b3f670f932f64e68af467d1a65b91 (diff) | |
| download | rspamd-55c0c08a65a973116aa0328b9af2fd719d2ee1dc.tar.gz rspamd-55c0c08a65a973116aa0328b9af2fd719d2ee1dc.zip | |
[WebUI] Migrate to Bootstrap v5.2
Diffstat (limited to 'interface/index.html')
| -rw-r--r-- | interface/index.html | 421 |
1 files changed, 213 insertions, 208 deletions
diff --git a/interface/index.html b/interface/index.html index b8ccfa3f6..61ecc5b2e 100644 --- a/interface/index.html +++ b/interface/index.html @@ -29,107 +29,107 @@ <body> <nav class="navbar navbar-light bg-light navbar-expand-xl d-none" id="navBar"> - <div class="navbar-header navbar-brand p-0"> - <img src="./img/rspamd_logo_navbar.png" alt="Rspamd"> - </div> - <div class="collapse navbar-collapse order-3 order-xl-2"> - <form class="form-inline my-2 mr-auto"> - <select id="selSrv" class="form-control"></select> - </form> - </div> + <div class="container-fluid"> + <div class="navbar-header navbar-brand p-0"> + <img src="./img/rspamd_logo_navbar.png" alt="Rspamd"> + </div> + <div class="collapse navbar-collapse order-3 order-xl-2"> + <form class="my-2 me-auto"> + <select id="selSrv" class="form-select"></select> + </form> + </div> - <div class="collapse navbar-collapse order-4 order-xl-3 justify-content-center"> - <ul class="nav navbar-nav nav-pills nav-tabs-sticky" role="tablist"> - <li role="presentation" class="nav-item"><a id="status_nav" aria-controls="status" role="tab" href="#status" data-toggle="tab" class="nav-link">Status</a></li> + <div class="collapse navbar-collapse order-4 order-xl-3 justify-content-center"> + <ul class="nav navbar-nav nav-pills nav-tabs-sticky" id="tablist" role="tablist"> + <li role="presentation" class="nav-item"><a id="status_nav" aria-controls="status" role="tab" href="#status" data-bs-toggle="tab" class="nav-link">Status</a></li> - <li role="presentation" class="nav-item"><a id="throughput_nav" aria-controls="throughput" role="tab" href="#throughput" data-toggle="tab" class="nav-link">Throughput</a></li> + <li role="presentation" class="nav-item"><a id="throughput_nav" aria-controls="throughput" role="tab" href="#throughput" data-bs-toggle="tab" class="nav-link">Throughput</a></li> - <li role="presentation" class="nav-item"><a id="configuration_nav" aria-controls="configuration" role="tab" href="#configuration" data-toggle="tab" class="nav-link">Configuration</a></li> - <li role="presentation" class="nav-item"><a id="symbols_nav" aria-controls="symbols" role="tab" href="#symbols" data-toggle="tab" class="nav-link">Symbols</a></li> - <li role="presentation" class="nav-item"><a id="scan_nav" aria-controls="scan" role="tab" href="#scan" data-toggle="tab" class="nav-link">Scan<span class="ro-hide" style="display: none;">/Learn</span></a></li> - <li role="presentation" class="nav-item"><a id="selectors_nav" aria-controls="selectors" role="tab" href="#selectors" data-toggle="tab" class="nav-link ro-hide" style="display: none;">Test selectors</a></li> - <li role="presentation" class="nav-item"><a id="history_nav" aria-controls="history" role="tab" href="#history" data-toggle="tab" class="nav-link">History</a></li> - </ul> - </div> + <li role="presentation" class="nav-item"><a id="configuration_nav" aria-controls="configuration" role="tab" href="#configuration" data-bs-toggle="tab" class="nav-link">Configuration</a></li> + <li role="presentation" class="nav-item"><a id="symbols_nav" aria-controls="symbols" role="tab" href="#symbols" data-bs-toggle="tab" class="nav-link">Symbols</a></li> + <li role="presentation" class="nav-item"><a id="scan_nav" aria-controls="scan" role="tab" href="#scan" data-bs-toggle="tab" class="nav-link">Scan<span class="ro-hide" style="display: none;">/Learn</span></a></li> + <li role="presentation" class="nav-item"><a id="selectors_nav" aria-controls="selectors" role="tab" href="#selectors" data-bs-toggle="tab" class="nav-link ro-hide" style="display: none;">Test selectors</a></li> + <li role="presentation" class="nav-item"><a id="history_nav" aria-controls="history" role="tab" href="#history" data-bs-toggle="tab" class="nav-link">History</a></li> + </ul> + </div> - <div class="d-flex flex-row order-2 order-xl-4"> - <form class="form-inline ml-auto"> - <div class="btn-group"> - <button class="btn btn-outline-secondary" id="refresh" style="display: none;"><i class="fas fa-sync-alt"></i> Refresh</button> - <button class="btn btn-outline-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" id="autoRefresh" title="Auto-refresh time interval"> - <span id="countdown">--:--</span> - </button> - <div class="dropdown-menu"> - <a class="dropdown-item preset" href="#" data-value=null>Disable</a> - <div class="dropdown-divider preset" role="separator"></div> - <a class="dropdown-item preset active" href="#" data-value="10000">10 seconds</a> - <a class="dropdown-item preset" href="#" data-value="30000">30 seconds</a> - <div class="dropdown-divider preset" role="separator"></div> - <a class="dropdown-item preset" href="#" data-value="60000">1 minute</a> - <a class="dropdown-item preset" href="#" data-value="600000">10 minutes</a> - <a class="dropdown-item preset" href="#" data-value="1800000">30 minutes</a> - <div class="dropdown-divider preset" role="separator"></div> - <a class="dropdown-item preset" href="#" data-value="3600000">1 hour</a> - - <a class="dropdown-item history active" href="#" data-value=null>Disable</a> - <div class="dropdown-divider history" role="separator"></div> - <a class="dropdown-item history" href="#" data-value="10000">10 seconds</a> - <a class="dropdown-item history" href="#" data-value="30000">30 seconds</a> - <div class="dropdown-divider history" role="separator"></div> - <a class="dropdown-item history" href="#" data-value="60000">1 minute</a> - <a class="dropdown-item history" href="#" data-value="600000">10 minutes</a> - <a class="dropdown-item history" href="#" data-value="1800000">30 minutes</a> - <div class="dropdown-divider history" role="separator"></div> - <a class="dropdown-item history" href="#" data-value="3600000">1 hour</a> - - <a class="dropdown-item dynamic" href="#" data-value=null>Disable</a> - <div class="dropdown-divider dynamic" role="separator"></div> - <a class="dropdown-item dynamic active" href="#" id="dynamic-item" data-value="3600000">1 hour</a> + <div class="d-flex flex-row order-2 order-xl-4"> + <form class="ms-auto"> + <div class="btn-group"> + <button class="btn btn-outline-secondary" id="refresh" style="display: none;"><i class="fas fa-sync-alt"></i> Refresh</button> + <button class="btn btn-outline-secondary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" id="autoRefresh" title="Auto-refresh time interval"> + <span id="countdown">--:--</span> + </button> + <div class="dropdown-menu"> + <a class="dropdown-item preset" href="#" data-value=null>Disable</a> + <div class="dropdown-divider preset" role="separator"></div> + <a class="dropdown-item preset active" href="#" data-value="10000">10 seconds</a> + <a class="dropdown-item preset" href="#" data-value="30000">30 seconds</a> + <div class="dropdown-divider preset" role="separator"></div> + <a class="dropdown-item preset" href="#" data-value="60000">1 minute</a> + <a class="dropdown-item preset" href="#" data-value="600000">10 minutes</a> + <a class="dropdown-item preset" href="#" data-value="1800000">30 minutes</a> + <div class="dropdown-divider preset" role="separator"></div> + <a class="dropdown-item preset" href="#" data-value="3600000">1 hour</a> + + <a class="dropdown-item history active" href="#" data-value=null>Disable</a> + <div class="dropdown-divider history" role="separator"></div> + <a class="dropdown-item history" href="#" data-value="10000">10 seconds</a> + <a class="dropdown-item history" href="#" data-value="30000">30 seconds</a> + <div class="dropdown-divider history" role="separator"></div> + <a class="dropdown-item history" href="#" data-value="60000">1 minute</a> + <a class="dropdown-item history" href="#" data-value="600000">10 minutes</a> + <a class="dropdown-item history" href="#" data-value="1800000">30 minutes</a> + <div class="dropdown-divider history" role="separator"></div> + <a class="dropdown-item history" href="#" data-value="3600000">1 hour</a> + + <a class="dropdown-item dynamic" href="#" data-value=null>Disable</a> + <div class="dropdown-divider dynamic" role="separator"></div> + <a class="dropdown-item dynamic active" href="#" id="dynamic-item" data-value="3600000">1 hour</a> + </div> </div> - </div> - <button class="btn btn-outline-secondary ml-2" id="disconnect" title="Disconnect"><i class="fas fa-power-off"></i></button> - <button class="btn btn-outline-secondary ml-2" id="settings" title="WebUI settings"><i class="fas fa-cog"></i></button> - <div class="d-none"> - <div id="settings-popover"> - <div class="card"> - <div class="card-body"> - <h6 class="card-title font-weight-bolder">Date and time locale</h6> - <label class="ml-2"> - <input type="radio" class="mr-2" name="locale" value="browser" checked> - Use browser settings - </label> - <div class="input-group input-group-sm"> - <div class="input-group-prepend"> + <button class="btn btn-outline-secondary ms-2" id="disconnect" title="Disconnect"><i class="fas fa-power-off"></i></button> + <button class="btn btn-outline-secondary ms-2" id="settings" title="WebUI settings"><i class="fas fa-cog"></i></button> + <div class="d-none"> + <div id="settings-popover"> + <div class="card"> + <div class="card-body"> + <h6 class="card-title fw-bolder">Date and time locale</h6> + <label class="ms-2"> + <input type="radio" class="me-2" name="locale" value="browser" checked> + Use browser settings + </label> + <div class="input-group input-group-sm"> <div class="input-group-text"> <label class="my-auto"> - <input type="radio" class="mr-2" name="locale" value="custom"> + <input type="radio" class="me-2" name="locale" value="custom"> Custom </label> </div> + <input type="text" id="locale" placeholder="Enter locale" class="form-control" /> </div> - <input type="text" id="locale" placeholder="Enter locale" class="form-control" /> + <p class="mt-2 mb-0">Date: <span id="date-example"></span></p> </div> - <p class="mt-2 mb-0">Date: <span id="date-example"></span></p> </div> - </div> - <div class="card mt-1"> - <div class="card-body"> - <h6 class="card-title font-weight-bolder">HTTP requests timeout, ms</h6> - <div class="input-group input-group-sm was-validated"> - <input type="number" id="ajax-timeout" class="form-control" min="0" step="any" /> - <div class="input-group-append"> - <button id="ajax-timeout-restore" class="btn btn-secondary">Restore default</button> + <div class="card mt-1"> + <div class="card-body"> + <h6 class="card-title fw-bolder">HTTP requests timeout, ms</h6> + <div class="input-group input-group-sm was-validated"> + <input type="number" id="ajax-timeout" class="form-control" min="0" step="any" /> + <div class="input-group-sm"> + <button id="ajax-timeout-restore" class="btn btn-secondary">Restore default</button> + </div> </div> </div> </div> </div> </div> - </div> - </form> - <button class="navbar-toggler ml-2" type="button" data-toggle="collapse" data-target=".navbar-collapse"> - <span class="navbar-toggler-icon"></span> - </button> + </form> + <button class="navbar-toggler ms-2" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse"> + <span class="navbar-toggler-icon"></span> + </button> + </div> </div> </nav> @@ -142,11 +142,11 @@ <div id="preloader" class="container-fluid"> <div id="loading" class="position-absolute align-items-center my-3 text-primary blinking d-none"> <div class="spinner-border align-middle" role="status" aria-hidden="true"></div> - <strong class="ml-3">Loading...</strong> + <strong class="ms-3">Loading...</strong> </div> <script>document.getElementById("loading").classList.remove("d-none");</script> <div class="row position-absolute w-100 h-100 align-items-center text-center"> - <img class="img-fluid mh-100 mx-auto" src="./img/rspamd_logo_navbar.png" alt="Rspamd" /> + <img class="img-fluid w-auto mh-100 mx-auto" src="./img/rspamd_logo_navbar.png" alt="Rspamd" /> </div> </div> @@ -155,17 +155,17 @@ <div class="container-fluid"> <div class="tab-content"> - <div class="tab-pane active" id="status"> + <div class="tab-pane" id="status"> <div class="row"> - <div id="statWidgets" class="col-lg-12 stat-boxes font-weight-bold text-secondary" style="display: none;"> + <div id="statWidgets" class="col-lg-12 stat-boxes fw-bold text-secondary" style="display: none;"> </div> </div> <div class="row"> <div class="col-lg-6"> <div class="card bg-light shadow my-3"> <div class="card-header text-secondary py-2"> - <span class="icon mr-3"><i class="fas fa-server"></i></span> - <span class="h6 font-weight-bolder my-2">Servers</span> + <span class="icon me-3"><i class="fas fa-server"></i></span> + <span class="h6 fw-bolder my-2">Servers</span> </div> <div class="card-body p-0 table-responsive"> <table class="table status-table table-sm table-hover table-bordered text-nowrap mb-0" id="clusterTable"> @@ -188,8 +188,8 @@ </div> <div class="card bg-light shadow my-3"> <div class="card-header text-secondary py-2"> - <span class="icon mr-3"><i class="fas fa-dice"></i></span> - <span class="h6 font-weight-bolder my-2">Bayesian statistics</span> + <span class="icon me-3"><i class="fas fa-dice"></i></span> + <span class="h6 fw-bolder my-2">Bayesian statistics</span> </div> <div class="card-body p-0 table-responsive"> <table class="table status-table table-sm table-bordered text-nowrap mb-0" id="bayesTable"> @@ -209,8 +209,8 @@ </div> <div class="card bg-light shadow my-3"> <div class="card-header text-secondary py-2"> - <span class="icon mr-3"><i class="fas fa-hashtag"></i></span> - <span class="h6 font-weight-bolder my-2">Fuzzy hashes</span> + <span class="icon me-3"><i class="fas fa-hashtag"></i></span> + <span class="h6 fw-bolder my-2">Fuzzy hashes</span> </div> <div class="card-body p-0 table-responsive"> <table class="table status-table table-sm table-bordered text-nowrap mb-0" id="fuzzyTable"> @@ -230,12 +230,12 @@ <div class="col-lg-6"> <div class="card bg-light shadow my-3"> <div class="card-header text-secondary py-2"> - <span class="icon mr-3"><i class="fas fa-chart-pie"></i></span> - <span class="h6 font-weight-bolder my-2">Statistics</span> + <span class="icon me-3"><i class="fas fa-chart-pie"></i></span> + <span class="h6 fw-bolder my-2">Statistics</span> </div> <div class="card-body"> <div class="row"> - <div class="bg-white mx-auto" id="chart"></div> + <div class="bg-white w-auto mx-auto" id="chart"></div> </div> </div> </div> @@ -246,8 +246,8 @@ <div class="tab-pane" id="throughput"> <div class="card bg-light shadow my-3"> <div class="card-header text-secondary py-2"> - <span class="icon mr-3"><i class="fas fa-chart-area"></i></span> - <span class="h6 font-weight-bolder my-2">Throughput</span> + <span class="icon me-3"><i class="fas fa-chart-area"></i></span> + <span class="h6 fw-bolder my-2">Throughput</span> </div> <div class="card-body text-center"> <div class="d-inline-block bg-white"> @@ -257,7 +257,7 @@ <div id="summary-row" class="row"> <div class="col-fixed" id="rrd-pie"></div> <div class="col-fluid"> - <table id="rrd-table" class="table table-striped table-hover"></table> + <table id="rrd-table" class="table table-light table-striped table-hover"></table> <div id="rrd-table_toggle"></div> <div id="rrd-total">Total messages: <span id="rrd-total-value"></span></div> </div> @@ -267,29 +267,29 @@ <div class="card-footer pt-0 text-center"> <form id="graph_controls" action="#"> Dataset: - <select id="selData" class="form-control"> + <select id="selData" class="form-select"> <option value="day" selected>By day</option> <option value="week">By week</option> <option value="month">By month</option> <option value="year">By year</option> </select> Y-scale: - <select id="selYScale" class="form-control"> + <select id="selYScale" class="form-select"> <option value="lin" selected>Lin</option> <option value="log">Log</option> </select> Convert to: - <select id="selConvert" class="form-control"> + <select id="selConvert" class="form-select"> <option value="" selected>--</option> <option value="percentage">percentage</option> </select> Chart type: - <select id="selType" class="form-control"> + <select id="selType" class="form-select"> <option value="line" selected>Line</option> <option value="area">Stacked area</option> </select> <a title="“Curves” section of “d3-shape” library documentation" href="https://github.com/d3/d3-shape#curves" target="_blank">Interpolation mode</a>: - <select id="selInterpolate" class="form-control"> + <select id="selInterpolate" class="form-select"> <option value="curveLinear" selected>linear</option> <option value="curveStep">step</option> <option value="curveStepBefore">stepBefore</option> @@ -309,8 +309,8 @@ <div class="tab-pane" id="configuration"> <div class="card bg-light shadow my-3"> <div class="card-header text-secondary py-2"> - <span class="icon mr-3"><i class="fas fa-tasks"></i></span> - <span class="h6 font-weight-bolder my-2">Actions</span> + <span class="icon me-3"><i class="fas fa-tasks"></i></span> + <span class="h6 fw-bolder my-2">Actions</span> </div> <div class="card-body pb-2"> <form id="actionsForm"> @@ -326,19 +326,16 @@ </div> <div class="card bg-light shadow my-3"> <div class="card-header text-secondary py-2 d-flex"> - <span class="icon mr-3"><i class="fas fa-list"></i></span> - <span class="h6 font-weight-bolder my-2">Lists</span> - <div class="form-inline card-header-form input-group-sm align-self-center ml-auto mr-1"> + <span class="icon me-3"><i class="fas fa-list"></i></span> + <span class="h6 fw-bolder my-2">Lists</span> + <div class="input-group-sm align-self-center ms-auto me-1"> Editor: - <div id="btnGroupEditor" class="btn-group btn-group-toggle btn-group-xs ml-1" data-toggle="buttons"> - <label class="btn btn-outline-secondary form-check-label"> - <input type="radio" class="form-check-input" name="editorMode" autocomplete="off" value="basic"> - Basic - </label> - <label class="btn btn-outline-secondary form-check-label active"> - <input type="radio" class="form-check-input" name="editorMode" autocomplete="off" value="advanced" checked> - Advanced - </label> + <div id="btnGroupEditor" class="btn-group btn-group-xs ms-1"> + <input type="radio" class="btn-check" name="editorMode" id="editorModeBascic" autocomplete="off" value="basic"> + <label class="btn btn-outline-secondary" for="editorModeBascic">Basic</label> + + <input type="radio" class="btn-check" name="editorMode" id="editorModeAdvanced"autocomplete="off" value="advanced" checked> + <label class="btn btn-outline-secondary" for="editorModeAdvanced">Advanced</label> </div> </div> </div> @@ -352,9 +349,9 @@ <div class="tab-pane" id="symbols"> <div class="card bg-light shadow my-3"> <div class="card-header text-secondary py-1 d-flex"> - <span class="icon mr-3"><i class="fas fa-tasks"></i></span> - <span class="h6 font-weight-bolder my-2 ml-0">Symbols and rules</span> - <div class="align-self-center ml-auto mr-1"> + <span class="icon me-3"><i class="fas fa-tasks"></i></span> + <span class="h6 fw-bolder my-2 ms-0">Symbols and rules</span> + <div class="align-self-center ms-auto me-1"> <button class="btn btn-info btn-sm" id="updateSymbols"> <i class="fas fa-redo-alt"></i> Update </button> @@ -369,47 +366,61 @@ <div class="tab-pane" id="scan"> <div class="card bg-light shadow my-3"> <div class="card-header text-secondary py-2"> - <span class="icon mr-3"><i class="fas fa-envelope"></i></span> - <span class="h6 font-weight-bolder my-2">Scan suspected message</span> + <span class="icon me-3"><i class="fas fa-envelope"></i></span> + <span class="h6 fw-bolder my-2">Scan suspected message</span> </div> <div class="card-body"> <div class="row"> <form class="col-lg-12" id="scanForm"> - <div class="form-group mb-0"> - <label for="scanMsgSource">Message source:</label> + <div class="mb-0"> + <label class="form-label" for="scanMsgSource">Message source:</label> <textarea class="form-control" id="scanMsgSource" rows="10" placeholder="Paste raw message source"></textarea> </div> - <div class="collapse row mr-0 mt-3" id="scanOptions"> + <div class="collapse row mt-3" id="scanOptions"> <div class="col-lg-6"> - <div class="form-group row text-nowrap" title="Emulate IP address from which this message was received"> + <div class="row mb-3 text-nowrap" title="Emulate IP address from which this message was received"> <label for="scan-opt-ip" class="col-form-label col-sm-2">IP:</label> - <input name="scan-opt-ip" id="scan-opt-ip" class="form-control col-sm-10" type="text"/> + <div class="col-sm-10"> + <input name="scan-opt-ip" id="scan-opt-ip" class="form-control" type="text"/> + </div> </div> - <div class="form-group row text-nowrap" title="Emulate username of the authenticated SMTP client"> + <div class="row mb-3 text-nowrap" title="Emulate username of the authenticated SMTP client"> <label for="scan-opt-user" class="col-form-label col-sm-2">User:</label> - <input name="scan-opt-user" id="scan-opt-user" class="form-control col-sm-10" type="text"/> + <div class="col-sm-10"> + <input name="scan-opt-user" id="scan-opt-user" class="form-control" type="text"/> + </div> </div> - <div class="form-group row text-nowrap" title="Emulate SMTP 'MAIL FROM' command data"> + <div class="row mb-3 text-nowrap" title="Emulate SMTP 'MAIL FROM' command data"> <label for="scan-opt-from" class="col-form-label col-sm-2">From:</label> - <input name="scan-opt-from" id="scan-opt-from" class="form-control col-sm-10" type="text"/> + <div class="col-sm-10"> + <input name="scan-opt-from" id="scan-opt-from" class="form-control" type="text"/> + </div> </div> </div> <div class="col-lg-6"> - <div class="form-group row text-nowrap" title="Emulate SMTP 'RCPT TO' command data"> + <div class="row mb-3 text-nowrap" title="Emulate SMTP 'RCPT TO' command data"> <label for="scan-opt-rcpt" class="col-form-label col-sm-2">Rcpt:</label> - <input name="scan-opt-rcpt" id="scan-opt-rcpt" class="form-control col-sm-10" type="text"/> + <div class="col-sm-10"> + <input name="scan-opt-rcpt" id="scan-opt-rcpt" class="form-control" type="text"/> + </div> </div> - <div class="form-group row text-nowrap" title="Imitate SMTP 'HELO' passing from the MTA"> + <div class="row mb-3 text-nowrap" title="Imitate SMTP 'HELO' passing from the MTA"> <label for="scan-opt-helo" class="col-form-label col-sm-2">Helo:</label> - <input name="scan-opt-helo" id="scan-opt-helo" class="form-control col-sm-10" type="text"/> + <div class="col-sm-10"> + <input name="scan-opt-helo" id="scan-opt-helo" class="form-control" type="text"/> + </div> </div> - <div class="form-group row text-nowrap" title="Imitate resolved hostname passing from the MTA"> + <div class="row mb-3 text-nowrap" title="Imitate resolved hostname passing from the MTA"> <label for="scan-opt-hostname" class="col-form-label col-sm-2">Hostname:</label> - <input name="scan-opt-hostname" id="scan-opt-hostname" class="form-control col-sm-10" type="text"/> + <div class="col-sm-10"> + <input name="scan-opt-hostname" id="scan-opt-hostname" class="form-control" type="text"/> + </div> </div> - <div class="form-check row text-nowrap pl-0" title="Pass all filters"> + <div class="row text-nowrap ps-0" title="Pass all filters"> <label for="scan-opt-pass-all" class="form-check-label col-sm-2">Pass: all</label> - <input name="scan-opt-pass-all" id="scan-opt-pass-all" class="form-check-input-reverse" type="checkbox"/> + <div class="col-sm-10"> + <input name="scan-opt-pass-all" id="scan-opt-pass-all" class="form-check-input-reverse" type="checkbox"/> + </div> </div> </div> </div> @@ -418,19 +429,19 @@ </div> <div class="card-footer"> <button type="submit" class="btn btn-primary" data-upload="scan"><i class="fas fa-search"></i> Scan message</button> - <div class="form-inline float-right"> - <button class="btn btn-secondary d-inline-block" id="scanOptionsToggle" data-toggle="collapse" data-target="#scanOptions"><i class="fas fa-bars"></i> Options</button> - <button class="btn btn-secondary ml-2" id="scanClean"><i class="fas fa-trash-alt"></i> Clean form</button> + <div class="float-end"> + <button class="btn btn-secondary d-inline-block" id="scanOptionsToggle" data-bs-toggle="collapse" data-bs-target="#scanOptions"><i class="fas fa-bars"></i> Options</button> + <button class="btn btn-secondary ms-2" id="scanClean"><i class="fas fa-trash-alt"></i> Clean form</button> </div> </div> </div> <div class="card ro-hide" style="display: none;"> <div class="card-header text-secondary py-1 d-flex"> - <span class="icon mr-3"><i class="fas fa-graduation-cap"></i></span> - <span class="h6 font-weight-bolder my-2">Learn Rspamd</span> - <div id="learnServers" class="form-inline card-header-form input-group-sm align-self-center ml-auto mr-1"> + <span class="icon me-3"><i class="fas fa-graduation-cap"></i></span> + <span class="h6 fw-bolder my-2">Learn Rspamd</span> + <div id="learnServers" class="input-group-sm align-items-center text-nowrap ms-auto me-1"> <label for="selLearnServers">Learn servers:</label> - <select id="selLearnServers" class="form-control ml-1"> + <select id="selLearnServers" class="form-select ms-1"> <option value="random" selected>random</option> <option value="all">all</option> </select> @@ -441,12 +452,10 @@ <div class="col-lg-6"> <div class="card bg-light shadow card-body card p-2"> <p>Learn Bayesian classifier:</p> - <form class="form-inline"> - <div class="form-group"> - <div class="btn-group"> - <button class="btn btn-success" type="button" data-upload="ham" disabled><i class="fas fa-thumbs-up"></i> Upload HAM</button> - <button class="btn btn-danger" type="button" data-upload="spam" disabled><i class="fas fa-thumbs-down"></i> Upload SPAM</button> - </div> + <form> + <div class="btn-group"> + <button class="btn btn-success" type="button" data-upload="ham" disabled><i class="fas fa-thumbs-up"></i> Upload HAM</button> + <button class="btn btn-danger" type="button" data-upload="spam" disabled><i class="fas fa-thumbs-down"></i> Upload SPAM</button> </div> </form> </div> @@ -454,16 +463,16 @@ <div class="col-lg-6"> <div class="card bg-light shadow card-body card p-2"> <p>Learn Fuzzy storage:</p> - <form class="form-inline"> - <div class="form-group"> + <form class="d-flex"> + <div class="d-flex align-items-center"> <label for="fuzzyFlagText">Flag:</label> - <input name="fuzzyFlagText" id="fuzzyFlagText" class="form-control ml-1" type="number" value="1"/> + <input name="fuzzyFlagText" id="fuzzyFlagText" class="form-control ms-1" type="number" value="1"/> </div> - <div class="form-group ml-2"> + <div class="d-flex align-items-center ms-2"> <label for="fuzzyWeightText">Weight:</label> - <input name="fuzzyWeightText" id="fuzzyWeightText" class="form-control ml-1" type="number" value="1"/> + <input name="fuzzyWeightText" id="fuzzyWeightText" class="form-control ms-1" type="number" value="1"/> </div> - <button class="btn btn-warning ml-2" data-upload="fuzzy" disabled><i class="fas fa-upload"></i> Upload FUZZY</button> + <button class="btn btn-warning ms-2" data-upload="fuzzy" disabled><i class="fas fa-upload"></i> Upload FUZZY</button> </form> </div> </div> @@ -473,18 +482,18 @@ <div class="card bg-light shadow my-3"> <div class="card-header text-secondary py-1 d-flex"> - <span class="icon mr-3"><i class="fas fa-eye"></i></span> - <span class="h6 font-weight-bolder my-2 ml-0">Scan results history</span> - <div id="scanResult" class="form-inline card-header-form input-group-sm align-self-center ml-auto mr-1"> + <span class="icon me-3"><i class="fas fa-eye"></i></span> + <span class="h6 fw-bolder my-2 ms-0">Scan results history</span> + <div id="scanResult" class="d-flex input-group-sm align-items-center text-nowrap ms-auto me-1"> <label for="selSymOrder_scan">Symbols order:</label> - <select id="selSymOrder_scan" class="form-control ml-1"> + <select id="selSymOrder_scan" class="form-select ms-1"> <option value="magnitude" selected>Score magnitude</option> <option value="score">Score value</option> <option value="name">Name</option> </select> - <label for="scan_page_size" class="ml-2">Rows per page:</label> - <input id="scan_page_size" class="form-control ml-1" value="25" min="1" type="number"> - <button class="btn btn-secondary btn-sm ml-2" id="cleanScanHistory"> + <label for="scan_page_size" class="ms-2">Rows per page:</label> + <input id="scan_page_size" class="form-control ms-1" value="25" min="1" type="number"> + <button class="btn btn-secondary btn-sm ms-2" id="cleanScanHistory"> <i class="fas fa-trash-alt"></i> Clean history </button> </div> @@ -500,11 +509,11 @@ <div class="tab-pane" id="selectors"> <div class="card bg-light shadow my-3"> <div class="card-header text-secondary py-2"> - <span class="icon mr-3"><i class="fas fa-envelope"></i></span> - <span class="h6 font-weight-bolder my-2">Test Rspamd selectors</span> + <span class="icon me-3"><i class="fas fa-envelope"></i></span> + <span class="h6 fw-bolder my-2">Test Rspamd selectors</span> </div> - <div class="card-body py-0"> - <div class="row h-100" id="row-main"> + <div class="card-body p-0"> + <div class="row h-100 m-0" id="row-main"> <div class="col-lg-3 sidebar h-100" id="sidebar-left"> <div class="p-0 table-responsive mh-100 bg-white"> <table class="table table-sm small table-striped table-hover table-bordered mb-0" id="selectorsTable-extractors"> @@ -529,27 +538,27 @@ <div class="row pt-3"> <div class="col"> <div class="form-group"> - <label for="selectorsMsgArea">Message source:</label> + <label class="form-label" for="selectorsMsgArea">Message source:</label> <textarea class="form-control" id="selectorsMsgArea" rows="9" placeholder="Paste raw message source"></textarea> </div> - <button class="btn btn-secondary float-right" id="selectorsMsgClean"><i class="fas fa-trash-alt"></i> Clean form</button> + <button class="btn btn-secondary float-end" id="selectorsMsgClean"><i class="fas fa-trash-alt"></i> Clean form</button> </div> </div> <div class="row pt-3"> <div class="col"> <div class="form-group"> - <label for="selectorsSelArea">Selector(s):</label> + <label class="form-label" for="selectorsSelArea">Selector(s):</label> <textarea class="form-control" id="selectorsSelArea" rows="1" placeholder="extractor.transform(arg);extractor.transform(arg);..."></textarea> </div> <button type="submit" class="btn btn-primary" id="selectorsChkMsgBtn"><i class="fas fa-search"></i> Check message</button> - <button class="btn btn-secondary float-right" id="selectorsClean"><i class="fas fa-trash-alt"></i> Clean form</button> + <button class="btn btn-secondary float-end" id="selectorsClean"><i class="fas fa-trash-alt"></i> Clean form</button> </div> </div> <div class="row pt-3 flex-grow-1"> <div class="col d-flex flex-column"> <div class="form-group h-100 d-flex flex-column"> - <label for="selectorsResArea">Result:</label> - <textarea class="form-control flex-grow-1" id="selectorsResArea" readonly></textarea> + <label class="form-label" for="selectorsResArea">Result:</label> + <textarea class="form-control flex-grow-1" id="selectorsResArea" disabled readonly></textarea> </div> </div> </div> @@ -582,24 +591,24 @@ <div class="card bg-light shadow my-3"> <div class="card-header text-secondary py-1 d-flex"> - <span class="icon mr-3"><i class="fas fa-eye"></i></span> - <span class="h6 font-weight-bolder my-2 ml-0">History</span> + <span class="icon me-3"><i class="fas fa-eye"></i></span> + <span class="h6 fw-bolder my-2 ms-0">History</span> <a href="https://rspamd.com/doc/modules/history_redis.html" target="_blank" rel="noopener noreferrer" title="If you'd like to use the modern version of History, please enable History redis module." - id="legacy-history-badge" class="my-2 ml-2 badge badge-info" style="display: none;">Legacy version</a> - <div class="form-inline card-header-form input-group-sm align-self-center ml-auto mr-1"> + id="legacy-history-badge" class="my-2 ms-2 badge bg-info" style="display: none;">Legacy version</a> + <div class="d-flex input-group-sm align-items-center text-nowrap ms-auto me-1"> <label for="selSymOrder_history">Symbols order:</label> - <select id="selSymOrder_history" class="form-control ml-1"> + <select id="selSymOrder_history" class="form-select ms-1"> <option value="magnitude" selected>Score magnitude</option> <option value="score">Score value</option> <option value="name">Name</option> </select> - <label for="history_page_size" class="ml-2">Rows per page:</label> - <input id="history_page_size" class="form-control ml-1" value="25" min="1" type="number"> - <button class="btn btn-danger btn-sm ml-2 ro-hide" id="resetHistory"> + <label for="history_page_size" class="ms-2">Rows per page:</label> + <input id="history_page_size" class="form-control ms-1" value="25" min="1" type="number"> + <button class="btn btn-danger btn-sm ms-2 ro-hide" id="resetHistory"> <i class="fas fa-times-circle"></i> Reset </button> - <button class="btn btn-info btn-sm ml-2" id="updateHistory"> + <button class="btn btn-info btn-sm ms-2" id="updateHistory"> <i class="fas fa-redo-alt"></i> Update </button> </div> @@ -612,9 +621,9 @@ </div> <div class="card bg-light shadow my-3 ro-hide" id="errors-history"> <div class="card-header text-secondary py-1 d-flex"> - <span class="icon mr-3"><i class="fas fa-exclamation-triangle"></i></span> - <span class="h6 font-weight-bolder my-2 ml-0">Errors</span> - <div class="align-self-center ml-auto mr-1"> + <span class="icon me-3"><i class="fas fa-exclamation-triangle"></i></span> + <span class="h6 fw-bolder my-2 ms-0">Errors</span> + <div class="align-self-center ms-auto me-1"> <button class="btn btn-info btn-sm" id="updateErrors"> <i class="fas fa-redo-alt"></i> Update </button> @@ -634,11 +643,11 @@ <!-- Common modal --> <div id="modalDialog" class="modal fade text-center" data-backdrop="static" tabindex="-1" role="dialog"> - <div class="modal-dialog modal-xl d-inline-block mw-100 my-auto text-left"> + <div class="modal-dialog modal-xl d-inline-block mw-100 my-auto text-start"> <div class="modal-content shadow"> <div class="modal-header text-secondary py-2"> - <i class="fas my-auto"></i><h6 class="modal-title font-weight-bolder mx-3" id="modalTitle"></h6> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <i class="fas my-auto"></i><h6 class="modal-title fw-bolder mx-3" id="modalTitle"></h6> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> </div> <div class="modal-body" id="modalBody"></div> <div class="modal-footer"> @@ -646,7 +655,7 @@ <button class="btn btn-primary" id="modalSave">Save changes</button> <button class="btn btn-warning" id="modalSaveAll">Save on cluster</button> </div> - <button class="btn btn-secondary" data-dismiss="modal" aria-hidden="true" id="modalClose">Close</button> + <button class="btn btn-secondary" data-bs-dismiss="modal" aria-hidden="true" id="modalClose">Close</button> </div> </div> </div> @@ -657,26 +666,22 @@ <div class="modal-dialog modal-sm modal-dialog-centered"> <div class="modal-content shadow"> <div class="modal-header text-secondary py-2"> - <i class="fas fa-key my-auto"></i><h6 class="modal-title font-weight-bolder">Login to Rspamd</h6> + <i class="fas fa-key my-auto"></i><h6 class="modal-title fw-bolder">Login to Rspamd</h6> </div> <div class="modal-body" id="connectBody"> <form id="connectForm"> - <div class="form-group"> - <div class="input-group"> - <!-- In recent browser versions username is required to save credentials in a password manager. - Browser detects passwords by form.elements[n].type == "password" and then detects - the username field by searching backwards through form elements for the text field - immediately before the password fields. --> - <input value="Rspamd controller password" style="display: none;"/> - <input class="form-control" - type="password" - id="connectPassword" - placeholder="Password" - data-cip-id="connectPassword"> - <div class="input-group-append"> - <button type="submit" id="connectButton" class="btn btn-primary">Connect</button> - </div> - </div> + <div class="input-group"> + <!-- In recent browser versions username is required to save credentials in a password manager. + Browser detects passwords by form.elements[n].type == "password" and then detects + the username field by searching backwards through form elements for the text field + immediately before the password fields. --> + <input value="Rspamd controller password" style="display: none;"/> + <input class="form-control" + type="password" + id="connectPassword" + placeholder="Password" + data-cip-id="connectPassword"> + <button type="submit" id="connectButton" class="btn btn-primary">Connect</button> </div> </form> </div> |