Allow separate title and pagetitle. Use title for menu text.

2 files changed, 11 insertions, 6 deletions

diff --git a/default.template b/default.template
index a0ac53f..af5d701 100644
--- a/default.template
+++ b/default.template
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="generator" contents="lcmark">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
-    <title>$pagetitle$</title>
+    <title>$title$</title>
     <link rel="icon" type="image/png" href="$favicon$" />
     <style>
       html {font-family: sans-serif;}
diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua
index f85a521..5b38aa7 100755
--- a/notYetAnotherWiki.lua
+++ b/notYetAnotherWiki.lua
@@ -239,12 +239,17 @@ for name, file in pairs(Files) do
             if name == f then
                 metadata.menu = metadata.menu .. '<p>' .. f .. '</p>'
             else
-                local url = nil
-                if '' == path then url = Files[f].metadata.URL else url = Files[path .. '/' .. f].metadata.URL end
-                if nil ~= url then
-                    metadata.menu = metadata.menu .. '<p><a href="' .. url .. '">' .. f .. ' &#9757;</a></p>'
+                local title, url = nil, nil
+                if '' == path then
+                    title = Files[f].metadata.title
+                    url   = Files[f].metadata.URL
                 else
-                    metadata.menu = metadata.menu .. '<p><a href="' .. f .. '.HTML">' .. f .. '</a></p>'
+                    title = Files[path .. '/' .. f].metadata.title
+                    url   = Files[path .. '/' .. f].metadata.URL
+                end
+                if nil == title then title = f end
+                if nil ~= url then metadata.menu = metadata.menu .. '<p><a href="' .. url .. '">'      .. title .. ' &#9757;</a></p>'
+                else               metadata.menu = metadata.menu .. '<p><a href="' .. f   .. '.HTML">' .. title .. '</a></p>'
                 end
             end
         end