oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix browse files link for not installed domain plugins

Browse source
This commit is contained in:
Tamas Kocsis 2020-10-01 17:17:51 +02:00
parent 4b8dfc5114
commit dcbfb8afe0
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/Sidebar/SidebarPlugin.py
View file

@ -169,12 +169,11 @@ class UiWebsocketPlugin(object):
""")) """))
def sidebarRenderFileStats(self, body, site): def sidebarRenderFileStats(self, body, site):
site_address = site.content_manager.contents.get("content.json", {}).get("domain", site.address)
body.append(_(""" body.append(_("""
<li> <li>
<label> <label>
{_[Files]} {_[Files]}
<a href='/list/{site_address}' class='link-right link-outline'>{_[Browse files]}</a> <a href='/list/{site.address}' class='link-right link-outline' id="browse-files">{_[Browse files]}</a>
<small class="label-right"> <small class="label-right">
<a href='/ZeroNet-Internal/Zip?address={site.address}' id='link-zip' class='link-right' download='site.zip'>{_[Save as .zip]}</a> <a href='/ZeroNet-Internal/Zip?address={site.address}' id='link-zip' class='link-right' download='site.zip'>{_[Save as .zip]}</a>
</small> </small>

3
plugins/Sidebar/media/Sidebar.coffee
View file

@ -219,6 +219,9 @@ class Sidebar extends Class
@wrapper.notifications.add "privatekey", "done", "Saved private key removed", 5000 @wrapper.notifications.add "privatekey", "done", "Saved private key removed", 5000
return false return false
# Use requested address for browse files urls
@tag.find("#browse-files").attr("href", document.location.pathname.replace(/(\/.*?(\/|$)).*$/, "/list$1"))
animDrag: (e) => animDrag: (e) =>

5
plugins/Sidebar/media/all.js
View file

@ -359,7 +359,6 @@
}).call(this); }).call(this);
/* ---- Menu.coffee ---- */ /* ---- Menu.coffee ---- */
@ -851,7 +850,7 @@ window.initScrollable = function () {
return false; return false;
}; };
})(this)); })(this));
return this.tag.find("#privatekey-forget").off("click, touchend").on("click touchend", (function(_this) { this.tag.find("#privatekey-forget").off("click, touchend").on("click touchend", (function(_this) {
return function(e) { return function(e) {
_this.wrapper.displayConfirm("Remove saved private key for this site?", "Forget", function(res) { _this.wrapper.displayConfirm("Remove saved private key for this site?", "Forget", function(res) {
if (!res) { if (!res) {
@ -864,6 +863,7 @@ window.initScrollable = function () {
return false; return false;
}; };
})(this)); })(this));
return this.tag.find("#browse-files").attr("href", document.location.pathname.replace(/(\/.*?(\/|$)).*$/, "/list$1"));
}; };
Sidebar.prototype.animDrag = function(e) { Sidebar.prototype.animDrag = function(e) {
@ -1424,6 +1424,7 @@ window.initScrollable = function () {
}).call(this); }).call(this);
/* ---- morphdom.js ---- */ /* ---- morphdom.js ---- */