HelloZeroNet
/
ZeroNet
mirror of https://github.com/HelloZeroNet/ZeroNet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rev3498, Go back to homepage and less inviting open site button on blocked site page

This commit is contained in:
shortcutme 2018-06-28 02:03:47 +02:00
parent 283231ac6e
commit bc227b5f56
No known key found for this signature in database
GPG Key ID: 5B63BAE6CB9613AE
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/ContentFilter/media/blocklisted.html
View File

@ -20,6 +20,10 @@
.button:active { position: relative; top: 1px; }
.button:focus { outline: none; }
.textbutton { color: #999; margin-top: 25px; display: inline-block; text-transform: none; font-family: Arial, Helvetica; text-decoration: none; padding: 5px 15px; }
.textbutton-main { background-color: #FFF; color: #333; border-radius: 5px; }
.textbutton:hover { text-decoration: underline; color: #333; transition: none !important; }
.textbutton:active { background-color: #fafbfc; }
</style>
<div class="content">
@ -29,7 +33,10 @@
<div id="reason">Too much image</div>
<div id="added">on 2015-01-25 12:32:11</div>
</div>
<div><a href="#Visit+Site" class="button button-submit" id="button">Remove from blocklist</a></div>
<div id="buttons">
<a href="/" class="textbutton textbutton-main" id="back">Back to homepage</a>
<a href="#Visit+Site" class="textbutton" id="visit">Remove from blocklist and visit the site</a>
</div>
</div>
<script type="text/javascript" src="js/ZeroFrame.js"></script>
@ -67,12 +74,12 @@ class Page extends ZeroFrame {
document.getElementById("added").innerText = "at " + date.toLocaleDateString() + " " + date.toLocaleTimeString()
if (block["include"]) {
document.getElementById("added").innerText += " from a shared blocklist"
document.getElementById("button").innerText = "Ignore blocking and visit the site"
document.getElementById("visit").innerText = "Ignore blocking and visit the site"
}
document.getElementById("details").style.transform = "scale(1) rotateX(0deg)"
document.getElementById("button").style.transform = "translateY(0)"
document.getElementById("button").style.opacity = "1"
document.getElementById("button").onclick = () => {
document.getElementById("visit").style.transform = "translateY(0)"
document.getElementById("visit").style.opacity = "1"
document.getElementById("visit").onclick = () => {
if (block["include"])
this.cmd("siteAdd", address, () => { this.cmd("wrapperReload") })
else

2
src/Config.py
View File

@ -10,7 +10,7 @@ class Config(object):
def __init__(self, argv):
self.version = "0.6.3"
self.rev = 3495
self.rev = 3498
self.argv = argv
self.action = None
self.config_file = "zeronet.conf"