Clean up CSS and JavaScript files, change wiki layout a bit.
Change-Id: Ib47bf59db5e4e65ef58515b45d63bd7f1572c88b
diff --git a/src/main/resources/META-INF/resources/admin/admin.js b/src/main/resources/META-INF/resources/admin/admin.js
deleted file mode 100644
index a4ba1cd..0000000
--- a/src/main/resources/META-INF/resources/admin/admin.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import {AdminElement} from "./AdminElement.js";
-
diff --git a/src/main/resources/META-INF/resources/admin/index.html b/src/main/resources/META-INF/resources/admin/index.html
index f4db272..7e1aa0a 100644
--- a/src/main/resources/META-INF/resources/admin/index.html
+++ b/src/main/resources/META-INF/resources/admin/index.html
@@ -5,7 +5,7 @@
<meta charset="UTF-8">
<title>MulkCMS Admin</title>
- <script type="module" src="/admin/admin.js"></script>
+ <script type="module" src="/components.js"></script>
</head>
<body>
diff --git a/src/main/resources/META-INF/resources/common.css b/src/main/resources/META-INF/resources/common.css
new file mode 100644
index 0000000..4b07940
--- /dev/null
+++ b/src/main/resources/META-INF/resources/common.css
@@ -0,0 +1,12 @@
+/* Pure CSS */
+@import "web_modules/purecss/build/base.css";
+@import "web_modules/purecss/build/buttons.css";
+@import "web_modules/purecss/build/forms.css";
+@import "web_modules/purecss/build/menus.css";
+@import "web_modules/purecss/build/tables.css";
+
+/* Sanitize.css */
+@import "web_modules/sanitize.css/sanitize.css";
+@import "web_modules/sanitize.css/forms.css";
+@import "web_modules/sanitize.css/page.css";
+@import "web_modules/sanitize.css/typography.css";
diff --git a/src/main/resources/META-INF/resources/components.js b/src/main/resources/META-INF/resources/components.js
new file mode 100644
index 0000000..61d4657
--- /dev/null
+++ b/src/main/resources/META-INF/resources/components.js
@@ -0,0 +1,2 @@
+import {AdminElement} from "./admin/AdminElement.js";
+
diff --git a/src/main/resources/templates/benki/wiki/wikiPage.html b/src/main/resources/templates/benki/wiki/wikiPage.html
index caf587a..28903ba 100644
--- a/src/main/resources/templates/benki/wiki/wikiPage.html
+++ b/src/main/resources/templates/benki/wiki/wikiPage.html
@@ -2,19 +2,31 @@
<html>
<head>
<meta charset="UTF-8">
+
<title>{title} — Benki Wiki</title>
+
+ <link rel="stylesheet" type="text/css" href="/common.css" />
</head>
+
<body>
- <h1>{title}</h1>
+ <article id="wiki-page">
+ <header>
+ <h1>{title}</h1>
- <header>
- Last edit: <time datetime="{date.htmlFormat}">{date.humanFormat}</time> {author.name}
- </header>
+ <div class="">
+ Last edit: <time datetime="{date.htmlFormat}">{date.humanFormat}</time> by {author.name}
+ </div>
+ </header>
- <main>
- <article>
+ <main>
{content.raw}
- </article>
- </main>
+ </main>
+
+ <hr>
+
+ <footer>
+ <a href="/wiki/{title}/revisions">Page revisions</a>
+ </footer>
+ </article>
</body>
</html>