diff --git a/dumpwiki.py b/dumpwiki.py
index 918be0b..3638ba4 100644
--- a/dumpwiki.py
+++ b/dumpwiki.py
@@ -1,6 +1,7 @@
import os, json, sys
from mwclient import Site
from jinja2 import Template
+from shutil import copy
import html5lib
from functions import Colors
import argparse
@@ -29,6 +30,16 @@ print(args)
site = Site(host=args.host, path=args.path)
wd = os.path.dirname(os.path.abspath(__file__)) # working directory
wd_name = os.path.split(wd)[-1] # name of dir running script
+
+# copy static/ to ../archive/static
+repo_static_path = './static'
+archive_static_path = os.path.join(args.output, repo_static_path)
+os.makedirs(archive_static_path, exist_ok=True) # create static/ dir in archive
+for static_file in os.listdir(path='./static'):
+ copy(src=os.path.join(repo_static_path, static_file),
+ dst=os.path.join(archive_static_path, static_file))
+
+
with open('login.txt', 'r') as login: # read login user & pwd
loginlines = login.read()
user, pwd = loginlines.split('\n')
@@ -130,8 +141,7 @@ def dumppage(p, template, rewrite_images=True):
htmlsrc = rewritelinks(htmlsrc)
if rewrite_images:
htmlsrc = rewriteimgs(htmlsrc)
- # TODO: ANdre structure of archive: from ./archive/0 to: ./archive ./0
- html = template.render(page=p, body=htmlsrc, staticpath=f'../{wd_name}')
+ html = template.render(page=p, body=htmlsrc, staticpath='.')
with open(os.path.join(args.output, filenameforpage(p)), 'w') as f:
f.write(html)
# print(html, file=f)
@@ -146,7 +156,7 @@ for cat in publish.members():
template = Template(templatefile.read())
except FileNotFoundError:
with open('templates/default.html') as templatefile:
- template = Template(templatefile.read())
+ template = Template(templatefile.read())
for p in cat.members():
print(p)
dumppage(p, template, rewrite_images=not args.skipimages)
@@ -155,7 +165,7 @@ for cat in publish.members():
else:
print("Dumping page {}".format(cat.page_title))
with open('templates/default.html') as templatefile:
- template = Template(templatefile.read())
+ template = Template(templatefile.read())
dumppage(cat, template, rewrite_images=not args.skipimages)
diff --git a/static/about.css b/static/about.css
index 5aa3c22..f52b1d4 100644
--- a/static/about.css
+++ b/static/about.css
@@ -1,26 +1,33 @@
body {
background-color: #F4EBE8;
-
+ font-family: Roboto Mono;
}
.projtextcont{
- display: block;
+display: block;
/*align-items: center;
justify-content: center*/
+ color:#371F10;
margin-left:200px;
- font-family: Roboto Mono;
+
}
.projtext{
- width: 50%;
- height: 50%;
+ width: 85%;
display: block;
}
h1{
display: block;
+ width:50%;
+}
+
+h2{
+ display: block;
+ width:70%;
+ text-align: justify;
}
.pagelink{
@@ -59,4 +66,8 @@ h1{
font-size: 13px;
background-color: white;
visibility: hidden;
-}s
\ No newline at end of file
+}
+
+.pagelink:hover .pagename{
+ visibility: visible;
+}
\ No newline at end of file
diff --git a/static/archive.css b/static/archive.css
index b3dea09..f2db950 100644
--- a/static/archive.css
+++ b/static/archive.css
@@ -1,6 +1,59 @@
body {
background-color: #aaa4a0;
- font-family: Arial, Helvetica, sans-serif;
+ color: #371F10;
+ font-family: Roboto Mono, monospace;
+}
+.pagelink{
+ position: fixed;
+ display: inline;
+ left:0px;
+/* width:20px;
+ height:20px;*/
+ padding: 0px 5px 0px 5px;
+ background-color: white;
+ z-index: 10;
+ font-size: 30px;
+ text-align: center;
+ border-top-style: solid;
+ border-right-style: solid;
+ border-bottom-style: solid;
+ /*border-style: solid;*/
+ border-width: 1px;
+ border-color: #371F10;
+
+}
+
+.pagelink:hover{
+ background-color: #0BEFEB;
+}
+.pagelink a{
+ text-decoration: none;
+}
+
+.pagelink .pagename{
+ display: inline;
+ position: absolute;
+ width: auto;
+ padding: 5px;
+ margin-left: 25px;
+ font-size: 13px;
+ background-color: white;
+ visibility: hidden;
+}
+
+.pagelink:hover .pagename{
+ visibility: visible;
+}
+
+h1 {
+ position: fixed;
+ right:0%;
+ top:5%;
+ text-align: right;
+ background-color: rgba(11,239,235,0.7);
+ padding: 3px 35px 3px 10px;
+ z-index: 10;
+ font-size: 28px;
}
a, a:visited{
diff --git a/static/orgs.css b/static/orgs.css
index 7e4b8e1..8110433 100644
--- a/static/orgs.css
+++ b/static/orgs.css
@@ -1,151 +1,115 @@
+
+#top {
+ padding-top: 20px;
+ padding-left: 50px;
+}
+
body {
background-color: #F4EBE8;
font-family: Roboto Mono;
- font-size:11.5px;
-
+ font-size:14px;
}
+/* Page title */
h1 {
position: fixed;
right:0%;
- top:3%;
+ top:5%;
text-align: right;
background-color: #0BEFEB;
- padding: 15px 85px 15px 30px;
- z-index: 10;
- color: #371F10;
- font-size: 28px;
- opacity: 0.7;
-}
-
-/*
-h1 {
- position: fixed;
- right:0%;
- top:3%;
- text-align: right;
- background-color: transparent;
- padding: 10px 30px 30px 20px;
+ padding: 3px 35px 3px 10px;
z-index: 10;
color: black;
font-size: 28px;
- border: 1px solid blue;
- border-right: none;
+ opacity: 0.7;
+ color: #371F10;
}
-*/
+/* Organizations list */
.collapsible{
padding-left: 70px;
- line-height: 0%;
+ line-height: 1;
color: #371F10;
}
.active, .collapsible:hover {
- color: red;
+ color: blue;
cursor: pointer;
}
.active, .collapsible:after {
padding-top: 10px;
- color: #054646;
padding-left: 85px;
+ color: #371F10;
+ font-weight: bold;
}
+/* Droped-down publication links */
.content {
max-height: 0;
overflow: hidden;
transition: max-height 0.2s ease-out;
padding-left: 50px;
- background-color: #86a2a2;
+ background-color: #371F10;
position: relative;
line-height: 30px;
margin-left: 85px;
+ color: white;
+ font-size: 14px;
}
-.up {
- position: fixed;
- font-weight: bolder;
- bottom: 0%;
- right: 15.1%;
- background-color: blue;
- z-index: 10;
- padding: 10px;
- border: none;
+.content a {
+ color:white;
+ text-decoration: none;
}
-.down {
- position: fixed;
- font-weight: bolder;
- bottom: 0%;
- right: 12.8%;
- background-color: blue;
- z-index: 10;
- padding: 10px;
- border: none;
+.content a:hover {
+ color: blue;
+ cursor: pointer;
}
-.top {
+/* Scroll column */
+.scrollcolumn {
position: fixed;
- font-weight: bolder;
- bottom: 0%;
- right: 17.3%;
- background-color: blue;
+ display: inline;
+ top:35%;
+ right:0%;
+ width: 60px;
+ outline: none;
z-index: 10;
- padding: 10px;
- border: none;
+ text-align: center;
}
-.bottom {
- position: fixed;
- font-weight: bolder;
- bottom: 0%;
- right: 10%;
- background-color: blue;
- z-index: 10;
- padding: 10px;
- border: none;
+/* Scroll buttons */
+.scrl {
+ background-color: white;
+ cursor: pointer;
+ border:none;
+ font-size: 15px;
+ margin-top: 10px;
+ height: 60px;
+ width: 60px;
}
-.indexlink {
- position: fixed;
- text-decoration: none;
- font-size: 40px;
- bottom: 0%;
- right: 0%;
- background-color: transparent;
- border: none;
- border-right-color: transparent;
- z-index: 10;
- padding: 0px 20px 10px 10px;
- border: none;
+.scrl:hover {
+ background-color: #0BEFEB;
}
-.timeline {
- position: fixed;
- font-size: 20px;
- bottom: 0%;
- right: 3%;
- background-color: transparent;
- border: none;
- border-right-color: transparent;
+/* Scroll button title */
+.scbt {
+ visibility: hidden;
+ width: 120px;
+ background-color: black;
+ color: #fff;
+ text-align: center;
+ border-radius: 6px;
+ padding: 5px 0;
+ font-size: 15px;
+ right: 50px;
z-index: 10;
- padding: 0px 30px 20px 10px;
- border: none;
-}
-
-.timeline a {
- text-decoration: none;
-}
-
-.indexlink a {
- text-decoration: none;
+ position: absolute;
}
-#top {
- padding-top: 42px;
-}
-
-.up:hover, .down:hover, .top:hover, .bottom:hover {
- cursor: pointer;
- color: white;
+.scrl:hover > .scbt {
+ visibility: visible;
}
\ No newline at end of file
diff --git a/static/stats.css b/static/stats.css
new file mode 100644
index 0000000..e69de29
diff --git a/static/timeline.css b/static/timeline.css
index de18c58..358b92d 100644
--- a/static/timeline.css
+++ b/static/timeline.css
@@ -1,4 +1,11 @@
-body{ width: max-content;}
+body{
+ width: max-content;
+ background-color: #F4EBE8;
+}
+
+h1 {
+ font-family: Roboto Mono;
+}
div#body{ width: max-content;}
@@ -13,16 +20,21 @@ div#body{ width: max-content;}
display: inline-block;
}
-.content {
- border-style: solid 1px black;
- background-color: red;
- color: #444;
- cursor: pointer;
- padding: 5px;
+.indexlink {
position: fixed;
- font-size: 15px;
- z-index: +1;
- font-family: Times New Roman;
+ font-size: 20px;
+ bottom: 0%;
+ right: 3%;
+ background-color: transparent;
+ border: none;
+ border-right-color: transparent;
+ z-index: 10;
+ padding: 0px 30px 20px 10px
+ border: none;
+}
+
+.indexlink a {
+ text-decoration: none;
}
.horizontal-scroll-wrapper {
@@ -36,58 +48,35 @@ display: inline-block;
.event {
text-align-last: auto;
- font-family: Arial;
+ font-family: Roboto Mono;
font-size: 10px;
-/* padding-top: 5vw; */
- padding-left: 5vw;
+ padding-left: 5vw;
display: inline-block;
- width:400px;
+ width:200px;
vertical-align: top;
}
+.pubpageinfo {
+
+ padding-top: 10px;
+ font-size: 10px;
+}
+
+.pubpageinfo:hover {
+ background-color: #0BEFEB;
+ padding: 10px;
+ font-size: 15px;
+}
+
.thumbborder {
-/* display: none;*/
+ box-shadow: 8px 8px 8px #C4BCB9;
width: 30%;
height: auto;
}
.thumbborder:hover {
+ box-shadow: 8px 8px 8px #0BEFEB;
width:100%;
transition:0.5s;
height: auto;
}
-
-.bar-chart {
-display: table;
-margin-top: 20px;
-}
-
-.row {
-display: table-row;
-}
-
-.row div {
-display: table-cell;
-width: 60px;
-height: 44px;
-border-right: 2px solid rgb(255, 255, 255);
-}
-
-.row .axis-y {
-width: 96px;
-border-right: 1px solid #000;
-vertical-align: top;
-}
-
-.axis-x div {
-border-top: 1px solid #000;
-}
-
-.axis-x .axis-y {
-border: none;
-}
-
-.axis-x div, .axis-y {
-text-align: center;
-font-weight: bold;
-}
\ No newline at end of file
diff --git a/static/title.css b/static/title.css
index 8f4e892..8a36c99 100644
--- a/static/title.css
+++ b/static/title.css
@@ -2,15 +2,16 @@ body {
background-color: #F4EBE8;
font-family: Roboto Mono;
}
+
.grid-container {
display: grid;
grid-template-columns: repeat(4, 1fr);
grid-gap: 10px;
position: absolute;
top: 25%;
- width: 82%;
- height: auto;
- right: 8%;
+ width: 82%;
+ height: auto;
+ right: 8%;
text-align: : center;
z-index: 5;
@@ -26,7 +27,6 @@ body {
position: relative;
max-width: 100%;
max-height: 100%;
-
}
@@ -53,12 +53,13 @@ h1 {
right:0%;
top:5%;
text-align: right;
- background-color: #0BEFEB;
+ background-color: rgba(11,239,235,0.7);
padding: 3px 35px 3px 10px;
z-index: 10;
color: black;
- font-size: 28px;
- opacity: 0.7;
+ font-size: 27px;
+ color: #371F10;
+ max-width: 90%;
}
h2{
@@ -66,18 +67,18 @@ h2{
right: 0%;
top: 15%;
text-align: left;
- background-color: #0BEFEB;
- /*color: black;*/
+ background-color: rgba(11,239,235,0.7);
padding: 3px 35px 3px 10px;
z-index: 10;
font-size: 20px;
opacity: 0.7;
+ color: #371F10;
}
.viewnav {
position: fixed;
- bottom:0%;
- left:0%;
+ bottom: 0%;
+ left: 0%;
background-color: transparent;
width: 10%;
z-index: 10;
@@ -86,7 +87,7 @@ h2{
.collapsible2 {
background-color: transparent;
- color: black;
+ color: red;
cursor: pointer;
padding: 0px;
width: 100%;
@@ -221,23 +222,10 @@ a.content:link {
color:white;
}
-/*.metadata_links {
- display: inline-block;
- width: 100%;
- position: absolute;
- right: 0%;
- padding: 10px;
- text-align: left;
- background-color: blue;
- font-size: 18px;
-
-}*/
-
.metadata_organization {
font-size: 14px;
}
-
.fbtn {
font-style: italic;
}
@@ -245,7 +233,7 @@ a.content:link {
.smw-template-furtherresults {
display: none;
}
-
+/*
.orglink {
position: fixed;
top: 30%;
@@ -266,7 +254,7 @@ a.content:link {
padding: 5px 0;
font-size: 15px;
- /* Position the tooltip */
+
position: absolute;
left: 50px;
z-index: 10;
@@ -296,7 +284,7 @@ a.content:link {
padding: 5px 0;
font-size: 15px;
- /* Position the tooltip */
+
position: absolute;
left: 50px;
z-index: 10;
@@ -326,7 +314,7 @@ a.content:link {
padding: 5px 0;
font-size: 15px;
- /* Position the tooltip */
+
position: absolute;
left: 50px;
z-index: 10;
@@ -336,3 +324,4 @@ a.content:link {
visibility: visible;
}
+*/
\ No newline at end of file
diff --git a/static/topicformat.css b/static/topicformat.css
index 001e902..060f0da 100644
--- a/static/topicformat.css
+++ b/static/topicformat.css
@@ -5,7 +5,6 @@ body {
padding-right: 120px;
}
-
.grid-container {
display: inline-grid;
grid-template-columns: repeat(8, 1fr);
@@ -28,7 +27,6 @@ body {
z-index: 5;
}
-
.img {
display: inline-block;
border-style: hidden hidden solid hidden;
@@ -38,7 +36,6 @@ body {
.title {
display:block;
- font-family: Roboto Mono, monospace;
font-size: large;
font-weight: 700;
}
@@ -48,7 +45,6 @@ body {
font-weight: normal;
}
-
.metatext {
display: inline-block;
width: 300px;
@@ -56,45 +52,22 @@ body {
border-style: hidden;
}
-
-.thumbborder {
- position: relative;
- max-width: 100%;
- max-height: 100%;
-
-}
-
-
/*links*/
a:link {
text-decoration: none;
- color: black;
}
a:visited {
text-decoration: none;
- color: black;
}
-/*
-.metatext:hover a {
- color: white;
-}
-*/
+
a:hover {
background-color: #0BEFEB;
opacity: 0.7;
color: white;
-
}
-/*
-.metatext:hover {
- background-color: #0BEFEB;
- color: white;
-
-}
-*/
h1 {
position: fixed;
right:0%;
@@ -104,7 +77,6 @@ h1 {
opacity: 0.5;
padding: 3px 30px 3px 10px;
z-index: 10;
- color: white;
font-size: 32px;
}
diff --git a/templates/about.html b/templates/about.html
index 1d22e9d..50f692c 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -2,6 +2,7 @@
+
diff --git a/templates/orgs.html b/templates/orgs.html
index c36f762..a8dec84 100644
--- a/templates/orgs.html
+++ b/templates/orgs.html
@@ -10,13 +10,15 @@
{{ page.name }}
- ▤ {{ page.name }}
-
-
-
-
-
+ ▤ {{ page.name }}
+
+
+
+
+
+
+
{{ body|safe }}