mirror of
https://gitlab.com/KevinRoebert/ClearUrls
synced 2025-12-16 06:05:37 +07:00
Version 1.10.0
- Updated to Bootstrap 4.3.1 - Updated to jQuery 3.4.1 - Updated to DataTables 1.10.20 - Deleted unnecessary Bootstrap Dialog lib - Replaced [pick-a-color](https://github.com/lauren/pick-a-color) with [bootstrap-colorpicker 3.2.0](https://github.com/itsjavi/bootstrap-colorpicker) - Added [popper.js 1.16.0](https://github.com/popperjs/popper.js/tree/v1.16.0) - Fixed [#333](https://gitlab.com/KevinRoebert/ClearUrls/issues/333) - Fixed [#332](https://gitlab.com/KevinRoebert/ClearUrls/issues/332) - Fixed [#307](https://gitlab.com/KevinRoebert/ClearUrls/issues/307) - Maybe [#315](https://gitlab.com/KevinRoebert/ClearUrls/issues/315) fixed
This commit is contained in:
Kevin Röbert
@@ -39,22 +39,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<nav class="navbar navbar-inverse">
|
||||
<nav class="navbar-margin navbar navbar-dark bg-dark">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
<span class="navbar-brand">
|
||||
<span class="pull-left"><img src="../img/clearurls.svg"
|
||||
<span class="float-left"><img src="../img/clearurls.svg"
|
||||
width="30" height="30" alt=""></span>
|
||||
<span style="color: #FF7800;" class="pull-right" id="page_title"></span><br />
|
||||
<span class="label label-warning pull-left small-version"
|
||||
<span style="color: #FF7800;" class="float-right" id="page_title"></span><br />
|
||||
<span class="badge badge-warning float-left small-version"
|
||||
id="version"></span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-4 col-md-offset-4 text-center">
|
||||
<div class="col-lg-4 offset-lg-4 text-center">
|
||||
<h4 id="cleaning_tool_description"></h4>
|
||||
|
||||
<br />
|
||||
@@ -79,7 +77,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
<!-- Optional JavaScript -->
|
||||
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
|
||||
<script src="../browser-polyfill.js"></script>
|
||||
<script src="../external_js/jquery-3.2.1.min.js"></script>
|
||||
<script src="../external_js/jquery-3.4.1.min.js"></script>
|
||||
<script src="../external_js/bootstrap.min.js"></script>
|
||||
<script src="../core_js/cleaning_tool.js"></script>
|
||||
<script src="../core_js/write_version.js"></script>
|
||||
|
||||
@@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
<!-- Bootstrap CSS -->
|
||||
<link rel="stylesheet" href="../css/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="../css/dataTables.bootstrap.min.css">
|
||||
<link rel="stylesheet" href="../css/dataTables.min.css">
|
||||
<link rel="stylesheet" type="text/css" href="../css/core.css">
|
||||
<style>
|
||||
td {
|
||||
@@ -57,22 +57,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<nav class="navbar navbar-inverse">
|
||||
<nav class="navbar-margin navbar navbar-dark bg-dark">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
<span class="navbar-brand">
|
||||
<span class="pull-left"><img src="../img/clearurls.svg"
|
||||
<span class="float-left"><img src="../img/clearurls.svg"
|
||||
width="30" height="30" alt=""></span>
|
||||
<span style="color: #FF7800;" class="pull-right" id="page_title"></span><br />
|
||||
<span class="label label-warning pull-left small-version"
|
||||
<span style="color: #FF7800;" class="float-right" id="page_title"></span><br />
|
||||
<span class="badge badge-warning float-left small-version"
|
||||
id="version"></span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-10 col-md-offset-1">
|
||||
<div class="col-lg-10 offset-lg-1">
|
||||
<p class="text-center">
|
||||
<button type="button" id="reset_log_btn"
|
||||
class="btn btn-danger" title="Reset the global log">
|
||||
@@ -80,13 +78,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
<button type="button" id="export_log_btn"
|
||||
class="btn btn-success" title="Export the global log">
|
||||
<i class="glyphicon glyphicon-save"></i>
|
||||
<i class="fas fa-download"></i>
|
||||
<span id="export_log_btn_text"></span>
|
||||
</button>
|
||||
|
||||
<span id="import_log_btn"
|
||||
class="btn btn-success fileinput-button" title="Import the global log">
|
||||
<i class="glyphicon glyphicon-open"></i>
|
||||
<i class="fas fa-upload"></i>
|
||||
<span id="import_log_btn_text"></span>
|
||||
<input type="file" name="file" id="importLog"/>
|
||||
</span>
|
||||
@@ -114,10 +112,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
<!-- Optional JavaScript -->
|
||||
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
|
||||
<script src="../browser-polyfill.js"></script>
|
||||
<script src="../external_js/jquery-3.2.1.min.js"></script>
|
||||
<script src="../external_js/jquery-3.4.1.min.js"></script>
|
||||
<script src="../external_js/bootstrap.min.js"></script>
|
||||
<script src="../external_js/jquery.dataTables.min.js"></script>
|
||||
<script src="../external_js/dataTables.bootstrap.min.js"></script>
|
||||
<script src="../external_js/dataTables.min.js"></script>
|
||||
<script src="../external_js/fontawesome/all.min.js"></script>
|
||||
<script src="../core_js/log.js"></script>
|
||||
<script src="../core_js/write_version.js"></script>
|
||||
</body>
|
||||
|
||||
@@ -27,40 +27,39 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
<!-- Bootstrap CSS -->
|
||||
<link rel="stylesheet" href="../css/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="../css/bootstrap-dialog.min.css">
|
||||
<link rel="stylesheet" type="text/css" href="../css/switchButtons.css">
|
||||
<link rel="stylesheet" type="text/css" href="../css/core.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="body-popup">
|
||||
<div class="container-fluid"
|
||||
style="background: url('../img/img-noise-361x370.png');background-size: auto;">
|
||||
style="background: url('../img/img-noise-361x370.png');background-size: auto;min-width: 200px;">
|
||||
<div class="row">
|
||||
<nav class="col-sm-1 navbar navbar-inverse">
|
||||
<nav class="col-sm-1 navbar-margin navbar navbar-dark bg-dark">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
<span class="navbar-brand">
|
||||
<span class="pull-left"><img src="../img/clearurls.svg"
|
||||
<span class="float-left"><img src="../img/clearurls.svg"
|
||||
width="30" height="30" alt=""></span>
|
||||
<span style="color: #FF7800;" class="pull-right">
|
||||
<span style="color: #FF7800;" class="float-right brand">
|
||||
ClearURLs
|
||||
</span><br />
|
||||
<span class="label label-warning pull-left small-version"
|
||||
<span class="badge badge-warning float-left small-version"
|
||||
id="version"></span>
|
||||
<a id="donate" target="_blank" href="https://www.paypal.me/KevinRoebert">
|
||||
<span class="pull-right glyphicon glyphicon-heart"></span>
|
||||
</a>
|
||||
</span>
|
||||
</span>
|
||||
<a id="donate" target="_blank" href="https://www.paypal.me/KevinRoebert">
|
||||
<i class="float-right fas fa-hand-holding-usd"></i>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</div>
|
||||
<div id="dialog"></div>
|
||||
<div class="row" id="config_section">
|
||||
|
||||
<div class="row" id="references_section">
|
||||
<div class="col-sm-1 text-center">
|
||||
<a id="cleaning_tools" target="_blank"><span class="glyphicon glyphicon-wrench" style="font-size: 1.5em; margin-right: 1em;"></span></a>
|
||||
<a id="settings" target="_blank"><span class="glyphicon glyphicon-cog" style="font-size: 1.5em"></span></a>
|
||||
<a id="cleaning_tools" target="_blank"><span class="fas fa-tools" style="font-size: 1.5em; margin-right: 1em;"></span></a>
|
||||
<a id="settings" target="_blank"><span class="fas fa-cog" style="font-size: 1.5em"></span></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row" id="config_section">
|
||||
<div class="col-sm-1">
|
||||
<h5><b id="configs_head"></b></h5>
|
||||
<label class="switch">
|
||||
@@ -96,36 +95,36 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
<h5><b id="statistics_head"></b></h5>
|
||||
|
||||
<div class="progress">
|
||||
<div class="progress-bar progress-bar-danger progress-bar-striped"
|
||||
<div class="progress-bar bg-danger progress-bar-striped"
|
||||
role="progressbar" style="width: 0%" id="progress_blocked"></div>
|
||||
<div class="progress-bar progress-bar-info progress-bar-striped"
|
||||
<div class="progress-bar bg-info progress-bar-striped"
|
||||
role="progressbar" style="width: 100%" id="progress_non_blocked"></div>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
<div>
|
||||
<span class="pull-left" id="statistics_elements"></span>
|
||||
<span class="pull-right text-info"
|
||||
<span class="float-left" id="statistics_elements"></span>
|
||||
<span class="float-right text-info"
|
||||
id="statistics_total_elements"></span>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<span class="pull-left" id="statistics_blocked"></span>
|
||||
<span class="pull-right text-danger"
|
||||
<span class="float-left" id="statistics_blocked"></span>
|
||||
<span class="float-right text-danger"
|
||||
id="statistics_value"></span>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<span class="pull-left" id="statistics_percentage"></span>
|
||||
<span class="pull-right text-success"
|
||||
<span class="float-left" id="statistics_percentage"></span>
|
||||
<span class="float-right text-success"
|
||||
id="statistics_value_global_percentage"></span>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
<br />
|
||||
<div class="text-center">
|
||||
<button type="button" id="reset_counter_btn"
|
||||
class="btn btn-danger btn-xs">
|
||||
class="btn btn-danger btn-sm text-wrap">
|
||||
</button>
|
||||
<div class="clearfix"></div>
|
||||
<br />
|
||||
@@ -138,7 +137,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
<h5><b id="rules_status_head"></b></h5>
|
||||
<div class="text-center">
|
||||
<a href="https://gitlab.com/KevinRoebert/ClearUrls/commits/master/data/data.min.json"
|
||||
id="hashStatus" class="btn btn-primary btn-xs" target="_blank"></a>
|
||||
id="hashStatus" class="btn btn-primary btn-sm text-wrap" target="_blank"></a>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
<br />
|
||||
@@ -148,8 +147,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
<div class="row" id="log_section">
|
||||
<div class="col-sm-1">
|
||||
<div class="text-center">
|
||||
<a type="button" id="loggingPage" target="_blank"
|
||||
class="btn btn-default btn-sm btn-block"></a>
|
||||
<a id="loggingPage" target="_blank"
|
||||
class="btn btn-default btn-sm btn-block text-wrap"></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -159,9 +158,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
<!-- Optional JavaScript -->
|
||||
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
|
||||
<script type="application/javascript" src="../browser-polyfill.js"></script>
|
||||
<script src="../external_js/jquery-3.2.1.min.js"></script>
|
||||
<script src="../external_js/jquery-3.4.1.min.js"></script>
|
||||
<script src="../external_js/bootstrap.min.js"></script>
|
||||
<script src="../external_js/bootstrap-dialog.min.js"></script>
|
||||
<script src="../external_js/fontawesome/all.min.js"></script>
|
||||
<script src="../core_js/popup.js"></script>
|
||||
<script src="../core_js/write_version.js"></script>
|
||||
</body>
|
||||
|
||||
@@ -31,7 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
<link rel="stylesheet" href="../css/bootstrap.min.css">
|
||||
<link rel="stylesheet" type="text/css" href="../css/switchButtons.css">
|
||||
<link rel="stylesheet" type="text/css" href="../css/core.css">
|
||||
<link rel="stylesheet" href="../css/pick-a-color-1.2.3.min.css">
|
||||
<link rel="stylesheet" href="../css/bootstrap-colorpicker.min.css">
|
||||
<style>
|
||||
td {
|
||||
word-wrap: break-word;
|
||||
@@ -58,44 +58,45 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<nav class="navbar navbar-inverse">
|
||||
<nav class="navbar-margin navbar navbar-dark bg-dark">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
<span class="navbar-brand">
|
||||
<span class="pull-left"><img src="../img/clearurls.svg"
|
||||
<div class="navbar-brand">
|
||||
<span class="float-left"><img src="../img/clearurls.svg"
|
||||
width="30" height="30" alt=""></span>
|
||||
<span style="color: #FF7800;" class="pull-right" id="page_title"></span><br />
|
||||
<span class="label label-warning pull-left small-version"
|
||||
<span style="color: #FF7800;" class="float-right" id="page_title"></span><br/>
|
||||
<span class="badge badge-warning float-left small-version"
|
||||
id="version"></span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-4 col-md-offset-4">
|
||||
<div class="col-lg-4 offset-lg-4">
|
||||
<p class="text-center">
|
||||
<button type="button" id="reset_settings_btn"
|
||||
class="btn btn-danger" title="Reset everything settings"></button>
|
||||
|
||||
<button type="button" id="export_settings_btn"
|
||||
class="btn btn-success" title="Export the settings">
|
||||
<i class="glyphicon glyphicon-save"></i>
|
||||
<i class="fas fa-download"></i>
|
||||
<span id="export_settings_btn_text"></span>
|
||||
</button>
|
||||
|
||||
<span id="import_settings_btn"
|
||||
class="btn btn-success fileinput-button" title="Import the settings">
|
||||
<i class="glyphicon glyphicon-open"></i>
|
||||
<i class="fas fa-upload"></i>
|
||||
<span id="import_settings_btn_text"></span>
|
||||
<input type="file" name="file" id="importSettings"/>
|
||||
</span>
|
||||
</p>
|
||||
<br />
|
||||
<p>
|
||||
<label id="badged_color_label"></label><br />
|
||||
<input type="text" id="badged_color" value="" name="badged_color" class="pick-a-color form-control">
|
||||
</p>
|
||||
<label id="badged_color_label"></label><br />
|
||||
<div id="badged-color-picker" class="input-group">
|
||||
<input type="text" class="form-control input-lg" value="" name="badged_color" id="badged_color">
|
||||
<span class="input-group-append">
|
||||
<span class="input-group-text colorpicker-input-addon"><i></i></span>
|
||||
</span>
|
||||
</div>
|
||||
<br />
|
||||
<p>
|
||||
<label id="rule_url_label"></label><br />
|
||||
@@ -166,10 +167,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
<!-- Optional JavaScript -->
|
||||
<script src="../browser-polyfill.js"></script>
|
||||
<script src="../external_js/jquery-3.2.1.min.js"></script>
|
||||
<script src="../external_js/jquery-3.4.1.min.js"></script>
|
||||
<script src="../external_js/popper.min.js"></script>
|
||||
<script src="../external_js/bootstrap.min.js"></script>
|
||||
<script src="../external_js/tinycolor-0.9.15.min.js"></script>
|
||||
<script src="../external_js/pick-a-color-1.2.3.min.js"></script>
|
||||
<script src="../external_js/bootstrap-colorpicker.min.js"></script>
|
||||
<script src="../external_js/fontawesome/all.min.js"></script>
|
||||
<script src="../core_js/settings.js"></script>
|
||||
<script src="../core_js/write_version.js"></script>
|
||||
</body>
|
||||
|
||||
@@ -52,7 +52,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
<body>
|
||||
<div class="container content">
|
||||
<div class="row">
|
||||
<div class="col-sm-10 col-sm-offset-1">
|
||||
<div class="col-md-10 offset-md-1">
|
||||
<h1 class="text-center" id="title"></h1>
|
||||
<p class="text-center" id="body"></p>
|
||||
<p class="text-center">
|
||||
@@ -62,16 +62,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer class="navbar-fixed-bottom">
|
||||
<div class="navbar-inverse text-center">
|
||||
<small class="text-muted">v.<span id="version"></span></small>
|
||||
</div>
|
||||
<footer class="navbar navbar-dark bg-dark fixed-bottom">
|
||||
<small class="text-muted">ClearURLs v.<span id="version"></span></small>
|
||||
</footer>
|
||||
|
||||
<!-- Optional JavaScript -->
|
||||
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
|
||||
<script src="../browser-polyfill.js"></script>
|
||||
<script src="../external_js/jquery-3.2.1.min.js"></script>
|
||||
<script src="../external_js/jquery-3.4.1.min.js"></script>
|
||||
<script src="../external_js/bootstrap.min.js"></script>
|
||||
<script src="../core_js/siteBlockedAlert.js"></script>
|
||||
<script src="../core_js/write_version.js"></script>
|
||||
|
||||
Reference in New Issue
Block a user