refactored site structure and publishing alist

1 files changed, 23 insertions, 24 deletions

diff --git a/lisp/org-publish-project-alist.el b/lisp/org-publish-project-alist.el
index 0310ce0..c65f8f0 100644
--- a/lisp/org-publish-project-alist.el
+++ b/lisp/org-publish-project-alist.el
@@ -13,32 +13,31 @@ org-html-publish-to-html, otherwise use org-pubish-attachment."
       (org-html-publish-to-html plist filename pub-dir)
     (org-publish-attachment plist filename pub-dir)))
 
+(setq org-publish-use-timestamps-flag nil)
+
 (let ((root "~/Documents/orgsite/") (generated "generated/"))
   (setq org-publish-project-alist
-        `(("blog"
-           :base-directory ,(concat root "blog")
-           :publishing-directory ,(concat root generated "blog")
-           :base-extension any
-           :exclude ".*~"
-           :publishing-function org-html-publish-or-copy
-           :html-head-extra "<link rel=\"stylesheet\"type=\"text/css\" href=\"../static/global.css\">"
+        (nconc
+         `(("fi"
+            :base-directory ,(concat root "fi")
+            :publishing-directory ,(concat root generated "fi")
+            :base-extension any
+            :exclude ".*~"
+            :recursive t
+            :publishing-function org-html-publish-or-copy
+                       :html-head-extra "<link rel=\"stylesheet\"type=\"text/css\" href=\"../../static/global.css\">"
            :html-postamble nil
+           :html-preamble "<header>
+<a id=\"skiptocontent\" href=\"#content\">Siirry pääsisältöön</a>
+<a href=\"/fi/\">FI</a> · <a href=\"/en/\">EN</a>
+</header>"
            :with-toc nil
            :section-numbers nil
-           :language "fi")
-
-
-          ; TODO Refactor
-          ("static"
-           :base-directory ,(concat root "static")
-           :publishing-directory ,(concat root generated "static")
-           :base-extension any
-           :publishing-function org-publish-attachment)
-          ("img"
-           :base-directory ,(concat root "img")
-           :publishing-directory ,(concat root generated "img")
-           :base-extension any
-           :publishing-function org-publish-attachment)
-          
-          
-          )))
+           :language "fi"))
+         (seq-map (lambda (ident)
+                    `(,ident
+                      :base-directory ,(concat root ident)
+                      :publishing-directory ,(concat root generated ident)
+                      :base-extension any
+                      :publishing-function org-publish-attachment))
+                  '("static" "img")))))