Overview main page: image as links (wip)

dumpwiki.py

@@ -67,7 +67,7 @@ def filenameforlink(href):
     return href
 
 
-def rewriteimglinks(tree):
+def rewriteimglinks(tree, page):
     #on Overview_main_page
     # add link to publication on <a><img>
 
@@ -76,15 +76,18 @@ def rewriteimglinks(tree):
     for a in tree.findall(".//a[@class='image']"):  # select img wrapping a
         href = a.attrib.get('href')
         if a.findall(".//img"):  # ensure a has child: img
+            if page.name == 'Overview main page':
                 img = a.find(".//img")
                 img_src = img.attrib['src']
-            a.attrib['href'] = img_src  # 'javascript:void(0);'  # disable href
-            a.attrib['target'] = "_blank"
+                a.attrib['href'] = img_src
+            else:
+                a.attrib['href'] = 'javascript:void(0);'  # disable href
+
             print(a)
             print(ET.tostring(a, method="html", encoding="unicode"))
     return tree
 
-def rewritelinks (html):
+def rewritelinks(html):
     t = html5lib.parseFragment(html, treebuilder = "etree", namespaceHTMLElements = False)
     for a in t.findall(".//*[@href]"):
         linkclass = a.attrib.get("class", "")
@@ -100,7 +103,7 @@ def rewritelinks (html):
     return html
 
 
-def rewriteimgs(html):
+def rewriteimgs(html, page):
     t = html5lib.parseFragment(html, treebuilder = "etree", namespaceHTMLElements = False)
 
     # replace images url with local image in ../images
@@ -131,7 +134,7 @@ def rewriteimgs(html):
         img.attrib['width'] = ""
         img.attrib['height'] = ""
 
-    t = rewriteimglinks(tree=t)
+    t = rewriteimglinks(tree=t, page=page)
 
     html = ET.tostring(t, method="html", encoding="unicode")
     return html
@@ -140,7 +143,7 @@ def dumppage(p, template, rewrite_images=True):
     htmlsrc = site.parse(page=p.name)['text']['*']
     htmlsrc = rewritelinks(htmlsrc)
     if rewrite_images:
-        htmlsrc = rewriteimgs(htmlsrc)
+        htmlsrc = rewriteimgs(html=htmlsrc, page=p)
     html = template.render(page=p, body=htmlsrc, staticpath='.')
     with open(os.path.join(args.output, filenameforpage(p)), 'w') as f:
         f.write(html)

static/archive.css

@@ -65,3 +65,5 @@ a:hover {
 	text-decoration: none;
   	color: blue;
 }
+
+a.image {cursor: default!important;} /* KEEP THIS: it is important to avoid images to seeming like links */

static/index.css

@@ -293,3 +293,5 @@ margin-left: 40px;
   height: 2px;
   background-color: #0BEFEB;
 }
+
+a.image {cursor: pointer!important;} /* KEEP THIS: show imgs as link in Overview */