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

Merge pull request #2485 from geekless/sidebar-no-content-json

Browse source 
Allow opening the sidebar while content.json is not loaded
This commit is contained in:
ZeroNet 2020-07-20 18:00:09 +02:00 committed by GitHub
commit 9022a1098a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/Sidebar/SidebarPlugin.py
View file

@ -117,7 +117,7 @@ class UiWebsocketPlugin(object):
peer_ips = [peer.key for peer in site.getConnectablePeers(20, allow_private=False)] peer_ips = [peer.key for peer in site.getConnectablePeers(20, allow_private=False)]
peer_ips.sort(key=lambda peer_ip: ".onion:" in peer_ip) peer_ips.sort(key=lambda peer_ip: ".onion:" in peer_ip)
copy_link = "http://127.0.0.1:43110/%s/?zeronet_peers=%s" % ( copy_link = "http://127.0.0.1:43110/%s/?zeronet_peers=%s" % (
site.content_manager.contents["content.json"].get("domain", site.address), site.content_manager.contents.get("content.json", {}).get("domain", site.address),
",".join(peer_ips) ",".join(peer_ips)
) )

2
plugins/Sidebar/media/Sidebar.css
View file

@ -18,7 +18,7 @@
.sidebar .link-right:active { background-color: #444 } .sidebar .link-right:active { background-color: #444 }
/* SIDEBAR */ /* SIDEBAR */
.sidebar-container { width: 100%; height: 100%; overflow: hidden; position: fixed; } .sidebar-container { width: 100%; height: 100%; overflow: hidden; position: fixed; z-index: 2; }
.sidebar { background-color: #212121; position: fixed; backface-visibility: hidden; right: -1200px; height: 100%; width: 1200px; } /*box-shadow: inset 0px 0px 10px #000*/ .sidebar { background-color: #212121; position: fixed; backface-visibility: hidden; right: -1200px; height: 100%; width: 1200px; } /*box-shadow: inset 0px 0px 10px #000*/
.sidebar .content { margin: 30px; font-family: "Segoe UI Light", "Segoe UI", "Helvetica Neue"; color: white; width: 375px; height: 300px; font-weight: 200; transition: all 1s; opacity: 0 } .sidebar .content { margin: 30px; font-family: "Segoe UI Light", "Segoe UI", "Helvetica Neue"; color: white; width: 375px; height: 300px; font-weight: 200; transition: all 1s; opacity: 0 }
.sidebar-container.loaded .content { opacity: 1; transform: none } .sidebar-container.loaded .content { opacity: 1; transform: none }

2
plugins/Sidebar/media/all.css
View file

@ -130,7 +130,7 @@
.sidebar .link-right:active { background-color: #444 } .sidebar .link-right:active { background-color: #444 }
/* SIDEBAR */ /* SIDEBAR */
.sidebar-container { width: 100%; height: 100%; overflow: hidden; position: fixed; } .sidebar-container { width: 100%; height: 100%; overflow: hidden; position: fixed; z-index: 2; }
.sidebar { background-color: #212121; position: fixed; -webkit-backface-visibility: hidden; -moz-backface-visibility: hidden; -o-backface-visibility: hidden; -ms-backface-visibility: hidden; backface-visibility: hidden ; right: -1200px; height: 100%; width: 1200px; } /*box-shadow: inset 0px 0px 10px #000*/ .sidebar { background-color: #212121; position: fixed; -webkit-backface-visibility: hidden; -moz-backface-visibility: hidden; -o-backface-visibility: hidden; -ms-backface-visibility: hidden; backface-visibility: hidden ; right: -1200px; height: 100%; width: 1200px; } /*box-shadow: inset 0px 0px 10px #000*/
.sidebar .content { margin: 30px; font-family: "Segoe UI Light", "Segoe UI", "Helvetica Neue"; color: white; width: 375px; height: 300px; font-weight: 200; -webkit-transition: all 1s; -moz-transition: all 1s; -o-transition: all 1s; -ms-transition: all 1s; transition: all 1s ; opacity: 0 } .sidebar .content { margin: 30px; font-family: "Segoe UI Light", "Segoe UI", "Helvetica Neue"; color: white; width: 375px; height: 300px; font-weight: 200; -webkit-transition: all 1s; -moz-transition: all 1s; -o-transition: all 1s; -ms-transition: all 1s; transition: all 1s ; opacity: 0 }
.sidebar-container.loaded .content { opacity: 1; -webkit-transform: none ; -moz-transform: none ; -o-transform: none ; -ms-transform: none ; transform: none } .sidebar-container.loaded .content { opacity: 1; -webkit-transform: none ; -moz-transform: none ; -o-transform: none ; -ms-transform: none ; transform: none }