diff --git a/scripts/leaflet.py b/scripts/leaflet.py index 0053a3d..3dd079a 100755 --- a/scripts/leaflet.py +++ b/scripts/leaflet.py @@ -56,7 +56,9 @@ class tiles_wrapper (object): else: # autotext is a link to the url showing the basename _, basename = os.path.split(self.url) - node['text'] = u"{1}".format(self.url, basename) + base, ext = os.path.splitext(basename) + ext = ext[1:] + node['text'] = u"

{1}".format(self.url, ext.upper()) node['url'] = self.url node['image'] = self.get_tile_path(0, 0, 0) return node diff --git a/scripts/mediawiki.py b/scripts/mediawiki.py index 97a4fb6..ebd41e8 100644 --- a/scripts/mediawiki.py +++ b/scripts/mediawiki.py @@ -180,7 +180,7 @@ def render_article (wiki, ref, basepath="tiles", depth=0, maxdepth=3, tilewidth= cells.extend(images) ret = recursiverender(cells, basename, tilewidth=tilewidth, tileheight=tileheight) - ret['text'] = u"""

{0}WIKI

""".format(title, ref) + ret['text'] = u"""

{0}

""".format(title, ref) if images: ret['image'] = images[0]['image'] return ret @@ -220,7 +220,7 @@ def render_category (wiki, cat, output="tiles", tilewidth=256, tileheight=256): pages.sort(key=lambda x: x.name) pagenodes = [render_article(wiki, x.name, tilewidth=tilewidth, tileheight=tileheight) for x in pages] for page, node in zip(pages, pagenodes): - node['text'] = u"""

{0}WIKI

""".format(page.name, wiki_title_to_url(wiki, page.name)) + node['text'] = u"""

{0}

""".format(page.name, wiki_title_to_url(wiki, page.name)) ret = gridrender(pagenodes, output+"/"+cat.name.replace(":", "_"), tilewidth=tilewidth, tileheight=tileheight) ret['text'] = u"""

{1}

""".format(wiki_title_to_url(wiki, cat.name), cat.name) return ret diff --git a/styles.css b/styles.css index 9bc3931..30b04e5 100644 --- a/styles.css +++ b/styles.css @@ -42,17 +42,18 @@ div.tile div.text { } div.tile div.text p { font-size: 12px; - /*color: #f2eee8;*/ - /*background: #dd2e47;*/ + color: #f2eee8; + background: #dd2e47; margin: 0; line-height: 12px; - padding-left: 10px; + /*padding-left: 10px;*/ /*hyphens: auto;*/ } div.tile div.text a { margin: 0; text-decoration: none; - color: #dd2e47; + color: #f2eee8; + /*color: black;*/ } div.tile div.text a:hover {} div.coords { @@ -65,14 +66,16 @@ div.coords { p.caption {} p.caption span.text { /*background: #444;*/ + padding-right: 8px; + display: block; } p.caption span.date { - padding-left: 8px; + padding-right: 8px; /*background: #444;*/ /*color: #AAA;*/ } p.caption a.url { - padding-left: 8px; + margin-left: 8px; /*color: #FF0;*/ } p.caption a.url:hover {