Merge branch 'master' of https://git.xpub.nl/XPUB/special-issue-11-wiki2html

4 years ago · ce9798e94a
parent ed660b71e7 c423548258
commit ce9798e94a
3 changed files with 32 additions and 10 deletions
--- 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')
@ -116,8 +127,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)
@ -132,7 +142,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)
@ -141,7 +151,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)


--- 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
+}
+
+.pagelink:hover .pagename{
+  visibility: visible;
+}
--- a/templates/about.html
+++ b/templates/about.html
@ -2,6 +2,7 @@
 <html lang="en">
 <head>
    <meta charset="utf-8">
+    <link rel="stylesheet" href="{{ staticpath }}/static/archive.css" />
    <link rel="stylesheet" href="{{ staticpath }}/static/about.css" />
    <script type="text/javascript" src="{{ staticpath }}/static/archive.js"></script>
    <link href='https://fonts.googleapis.com/css?family=Roboto+Mono' rel='stylesheet' type='text/css'>