Compare commits

..

No commits in common. "f1ae73b73788986d930c6081e131a2f7c573571d" and "7157757d4377caa872b5e2d5e5d5646d70c12af1" have entirely different histories.

4 changed files with 7 additions and 16 deletions

View File

@ -39,11 +39,6 @@ class ArchiveLinker(Linker):
def translate_page_title (self, page_title): def translate_page_title (self, page_title):
page_title = super().translate_page_title(page_title) page_title = super().translate_page_title(page_title)
fragment = ""
if "#" in page_title:
fragment = page_title[page_title.find("#"):]
page_title = page_title[:-len(fragment)]
directory_name = "" directory_name = ""
for name in self.directory_names: for name in self.directory_names:
@ -55,7 +50,7 @@ class ArchiveLinker(Linker):
for key, value in self.replacements.items(): for key, value in self.replacements.items():
page_title = page_title.replace(key, value) page_title = page_title.replace(key, value)
return "{}{}{}.html{}".format(directory_name, '/' if directory_name else '', page_title, fragment) return "{}{}{}.html".format(directory_name, '/' if directory_name else '', page_title)
def prepare_thread (thread): def prepare_thread (thread):
thread.subject = html.unescape(thread.subject) thread.subject = html.unescape(thread.subject)
@ -131,7 +126,6 @@ class ArchiveGenerator():
renderer.render_template_to_file("page", page_out, { renderer.render_template_to_file("page", page_out, {
"title": " - {}".format(page.title), "title": " - {}".format(page.title),
"pagename": page.title,
"page": page, "page": page,
"base": base, "base": base,
"text": rendered "text": rendered
@ -149,7 +143,6 @@ class ArchiveGenerator():
try: try:
renderer.render_template_to_file("category", category_out, { renderer.render_template_to_file("category", category_out, {
"title": " - {}".format(category), "title": " - {}".format(category),
"pagename": "Category:{}".format(category),
"category": category, "category": category,
"pages": pages "pages": pages
}) })

View File

@ -170,9 +170,8 @@ def render (wikitext, base="", linker=None):
render(node.tag) render(node.tag)
)) ))
elif node_type is Heading: elif node_type is Heading:
rendered.append('<h{} id="{}">{}</h{}>'.format( rendered.append("<h{}>{}</h{}>".format(
node.level, node.level,
reformat_page_title(node.title),
render(node.title, base, linker), render(node.title, base, linker),
node.level node.level
)) ))

View File

@ -1,6 +1,6 @@
{{>header}} {{>header}}
{{>wiki_notice}} {{>wiki_notice}}
<h2>{{pagename}}</h2> <h2>{{title}}</h2>
<ul> <ul>
{{#pages}} {{#pages}}
<li><a href="{{url}}">{{title}}</a></li> <li><a href="{{url}}">{{title}}</a></li>

View File

@ -1,6 +1,5 @@
<div class="notice"> <div class="notice">
<p>Glitch City Laboratories closed on 1 September 2020 (<a href="{{base}}../forums/board-2/thread-9114/page-0.html">announcement</a>). This is an <b>archived</b> copy of an article from Glitch City Laboratories wiki.</p> <p>Glitch City Laboratories closed on 1 September 2020 (<a href="{{base}}../forums/board-2/thread-9114/page-0.html">announcement</a>). This is an <b>archived</b> copy of an article from Glitch City Laboratories wiki.</p>
<p><b>A live version of this article is available at the <a href="https://glitchcity.wiki/">Glitch City Wiki</a> <a href="https://glitchcity.wiki/{{pagename}}">here</a>.</b></p>
<p>You can join <a href="https://discord.com/invite/EA7jxJ6">Glitch City Research Institute</a> to ask questions or discuss current developments.</p> <p>You can join <a href="https://discord.com/invite/EA7jxJ6">Glitch City Research Institute</a> to ask questions or discuss current developments.</p>
<p>You may also download the archive of the wiki in <a href="{{base}}../wiki.tar.gz">.tar.gz</a> or <a href="{{base}}../wiki.xml.gz">.xml.gz</a> formats.</p> <p>You may also download the archive of the wiki in <a href="{{base}}../wiki.tar.gz">.tar.gz</a> or <a href="{{base}}../wiki.xml.gz">.xml.gz</a> formats.</p>
</div> </div>