New Addon version 1.2

+ Badges counts only per url (for this feature we need the new "tabs"
permission)
+ New Interface. Special thanks to @grahamperrin and @Thorin-Oakenpants.
(#21)
+ Files in folder ordered
- Remove siteBlockedAlert.html page. We're show now nothing.
+ Revised texts for Rules-Status
+ Add File for version number
This commit is contained in:
Kevin Röbert
2017-12-16 23:50:50 +01:00
parent de2758cf6c
commit 0f68d65e9a
29 changed files with 225 additions and 150 deletions

79
html/log.html Normal file
View File

@@ -0,0 +1,79 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Log from ClearURLs</title>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="../css/bootstrap.min.css">
<link rel="stylesheet" href="../css/dataTables.bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../css/core.css">
<style>
td {
word-wrap: break-word;
max-width: 200px;
}
</style>
</head>
<body>
<nav class="navbar navbar-inverse">
<div class="container">
<div class="navbar-header">
<span class="navbar-brand">
<span class="pull-left"><img src="../img/icon38.png"
width="30" height="30" alt=""></span>
<span style="color: #FF7800;" class="pull-right">
ClearURLs
</span><br />
<span class="label label-warning pull-left small-version"
id="version"></span>
</span>
</div>
</div>
</nav>
<div class="row">
<div class="col-md-10 col-md-offset-1">
<p class="text-center">
<button type="button" id="reset_log_btn"
class="btn btn-danger" title="Reset the global log">Reset</button>
</p>
<div class="table-responsive">
<table class="table table-striped table-bordered"
width="100%" id="logTable" cellspacing="0">
<thead>
<tr>
<th data-orderable="false">
Before processing
</th>
<th data-orderable="false">
After processing
</th>
<th data-orderable="false">
Rule
</th>
<th data-orderable="true">
Time
</th>
</tr>
</thead>
<tbody id="tbody">
</tbody>
</table>
</div>
</div>
</div>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="../external_js/jquery-3.2.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="../core_js/log.js"></script>
<script src="../core_js/write_version.js"></script>
</body>
</html>

134
html/popup.html Normal file
View File

@@ -0,0 +1,134 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>ClearURLs</title>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<!-- Bootstrap CSS -->
<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">
</head>
<body>
<div class="container-fluid"
style="background: url('../img/img-noise-361x370.png');background-size: auto;">
<div class="row">
<nav class="col-sm-1 navbar navbar-inverse">
<div class="container">
<div class="navbar-header">
<span class="navbar-brand">
<span class="pull-left"><img src="../img/icon38.png"
width="30" height="30" alt=""></span>
<span style="color: #FF7800;" class="pull-right">
ClearURLs
</span><br />
<span class="label label-warning pull-left small-version"
id="version"></span>
</span>
</div>
</div>
</nav>
</div>
<div class="row">
<div class="col-sm-1">
<h5><b>Configs</b></h5>
<label class="switch">
<input type="checkbox" id="globalStatus">
<span class="slider round"></span>
<label>Filters</label>
</label>
<br>
<label class="switch">
<input type="checkbox" id="logging">
<span class="slider round"></span>
<label title="The log is saved only locally. We advise against this feature if you do not need it.">
Logging
</label>
</label>
<br>
<label class="switch">
<input type="checkbox" id="tabcounter">
<span class="slider round"></span>
<label>Badges</label>
</label>
<div class="clearfix"></div>
<br />
</div>
</div>
<div class="row">
<div class="col-sm-1">
<h5><b>Statistics</b></h5>
<div class="progress">
<div class="progress-bar progress-bar-danger progress-bar-striped"
role="progressbar" style="width: 0%" id="progress_blocked"></div>
<div class="progress-bar progress-bar-info progress-bar-striped"
role="progressbar" style="width: 100%" id="progress_non_blocked"></div>
</div>
<div>
<span class="pull-left">Elements</span>
<span class="pull-right text-info"
id="statistics_total_elements"></span>
<div class="clearfix"></div>
</div>
<div>
<span class="pull-left">Blocked</span>
<span class="pull-right text-danger"
id="statistics_value"></span>
<div class="clearfix"></div>
</div>
<div>
<span class="pull-left">Percentage</span>
<span class="pull-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"
title="Reset the global statistics">Reset</button>
<div class="clearfix"></div>
<br />
</div>
</div>
</div>
<div class="row">
<div class="col-sm-1">
<h5><b>Rules-Status</b></h5>
<a href="https://github.com/KevinRoebert/ClearUrls/commits/master/data/data.json"
id="hashStatus" class="btn btn-primary btn-xs pull-right"></a>
<div class="clearfix"></div>
<br />
</div>
</div>
<br />
<div class="row">
<div class="col-sm-1">
<div class="text-center">
<a type="button" id="loggingPage" target="_blank"
class="btn btn-default btn-sm btn-block"
title="Open the log">Log</a>
</div>
</div>
</div>
<br />
</div>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="../external_js/jquery-3.2.1.min.js"></script>
<script src="../external_js/bootstrap.min.js"></script>
<script src="../core_js/popup_new.js"></script>
<script src="../core_js/write_version.js"></script>
</body>
</html>

View File

@@ -0,0 +1,57 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>This site or element was blocked by ClearURLs Add-on</title>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="../css/bootstrap.min.css">
<style>
body {
background-color: #333;
color: white;
text-shadow: 0 1px 3px rgba(0,0,0,.5);
}
h1 {
color: #f72d04;
}
.content {
position: absolute;
top: 40%;
left: 50%;
transform: translate(-50%,-50%);
}
</style>
</head>
<body>
<div class="container content">
<div class="row">
<div class="col-sm-10 col-sm-offset-1">
<h1 class="text-center">This site or element was blocked by <b>ClearURLs</b> Add-on</h1>
<p class="text-center">
This site or element was blocked by <b>ClearURLs</b> Add-on, because we identify this site as an
advertising and/or tracking service.
<br>
To visit this site, you must temporarily deactivate the Add-on.
</p>
</div>
</div>
</div>
<footer class="navbar-fixed-bottom">
<div class="navbar-inverse text-center">
<small class="text-muted">Version 1.1.2.5</small>
</div>
</footer>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="../external_js/jquery-3.2.1.min.js"></script>
<script src="../external_js/bootstrap.min.js"></script>
</body>
</html>