Initiele opmaak blog posts.

diff --git a/html/navbar.html b/html/navbar.html
index e44fd941a29e0e855781aada6c9c4bae4323153c..787a91f6b13184a1b799bea3702e71a83f85c478 100644 (file)
--- a/html/navbar.html
+++ b/html/navbar.html
@@ -6,7 +6,7 @@
       <li class="nav-item">
        <a class="nav-link" href="http://photos.vanrenterghem.biz/">Photos</a></li>
       <li class="nav-item">
       <li class="nav-item">
        <a class="nav-link" href="http://photos.vanrenterghem.biz/">Photos</a></li>
       <li class="nav-item">

-       <a class="nav-link" href="/posts">Blog</a></li>
+       <a class="nav-link" href="/sitemap.html">Blog</a></li>

       <li class="nav-item">
        <a class="nav-link" href="http://git.vanrenterghem.biz/">Projects</a></li>
     </ul>
       <li class="nav-item">
        <a class="nav-link" href="http://git.vanrenterghem.biz/">Projects</a></li>
     </ul>

diff --git a/maak-website.el b/maak-website.el
index 4d37c188c7f7fe6af6a6a078274eb5d91c06ef91..1bb4897df7156725ce6da9d3cd00b151f34b85b8 100644 (file)
--- a/maak-website.el
+++ b/maak-website.el
@@ -5,12 +5,33 @@
                         (content "main" "content")
                         (postamble "footer" "postamble"))
       org-html-container-element "section")
                         (content "main" "content")
                         (postamble "footer" "postamble"))
       org-html-container-element "section")

+(setq org-html-head-include-default-style nil)
+;(setq org-html-htmlize-output-type 'css) ; default: 'inline-css

 
 (defun website-header (info)
   (with-temp-buffer
     (insert-file-contents "~/websites/stage.vanrenterghem.biz/html/navbar.html")
     (buffer-string)))
 
 
 (defun website-header (info)
   (with-temp-buffer
     (insert-file-contents "~/websites/stage.vanrenterghem.biz/html/navbar.html")
     (buffer-string)))
 

+(defun post-header (exp-plist)
+  (with-temp-buffer
+    (insert (format "<nav aria-label=\"breadcrumb\">
+              <ol class=\"breadcrumb\">
+               <li class=\"breadcrumb-item\"><a href=\"/\">Home</a></li>
+               <li class=\"breadcrumb-item\"><a href=\"/sitemap.html\">Blog</a></li>
+               <li class=\"breadcrumb-item active\" aria-current=\"page\">%s</li>
+              </ol>
+            </nav>"
+           (or (org-export-data (plist-get exp-plist ':title) exp-plist)
+               "none")))
+    (goto-char (point-min))
+    (insert-file-contents "~/websites/stage.vanrenterghem.biz/html/post-header.html")
+    ;(goto-char (point-max))
+    ;(insert (format "<p>Tags: %s</p>"
+       ;           (or (org-export-data (plist-get exp-plist :filetags) exp-plist)
+       ;       "none")))
+    (buffer-string)))
+

 (defun website-footer (info)
   (with-temp-buffer
     (insert-file-contents "~/websites/stage.vanrenterghem.biz/html/footer.html")
 (defun website-footer (info)
   (with-temp-buffer
     (insert-file-contents "~/websites/stage.vanrenterghem.biz/html/footer.html")


@@ -31,23 +52,44 @@ PROJECT is the current project."
        (t entry)))
 
 (setq org-publish-project-alist
        (t entry)))
 
 (setq org-publish-project-alist

-      '(("orgfiles"
+      '(("pages"

          :base-directory "~/websites/stage.vanrenterghem.biz/source/"
          :base-extension "org"
          :publishing-directory "~/websites/stage.vanrenterghem.biz/target"
          :publishing-function org-html-publish-to-html
          :base-directory "~/websites/stage.vanrenterghem.biz/source/"
          :base-extension "org"
          :publishing-directory "~/websites/stage.vanrenterghem.biz/target"
          :publishing-function org-html-publish-to-html

-         :exclude "assets*" ;; regexp

          :headline-levels 3
          :section-numbers nil
          :with-toc nil
         :html-head-include-default-style nil
          :html-head "<link href=\"/assets/styles/bootstrap-5.3.0/css/bootstrap.min.css\" rel=\"stylesheet\" />"
          :html-preamble t
          :headline-levels 3
          :section-numbers nil
          :with-toc nil
         :html-head-include-default-style nil
          :html-head "<link href=\"/assets/styles/bootstrap-5.3.0/css/bootstrap.min.css\" rel=\"stylesheet\" />"
          :html-preamble t

+        :html-preamble website-header
+        :html-postamble website-footer
+        )
+
+       ("posts"
+         :base-directory "~/websites/stage.vanrenterghem.biz/source/posts/"
+         :base-extension "org"
+         :publishing-directory "~/websites/stage.vanrenterghem.biz/target"
+         :publishing-function org-html-publish-to-html
+         :exclude "assets*\\|sitemap.org\\|index.org" ;; regexp
+        :html-content-class "container content inlinepage card h-entry"
+         :headline-levels 3
+         :section-numbers nil
+         :with-toc nil
+        :with-title nil
+        :html-head-include-default-style nil
+         :html-head "<link href=\"/assets/styles/bootstrap-5.3.0/css/bootstrap.min.css\" rel=\"stylesheet\" />\n
+        <link href=\"/assets/styles/org-htmlize.css\" rel=\"stylesheet\" />"
+         :html-preamble t
+        :html-divs ((preamble "header" "preamble")
+            (content "article" "inlinepage card h-entry")
+            (postamble "footer" "postamble"))

         :recursive t
         :auto-sitemap t
         :recursive t
         :auto-sitemap t

-        ;:sitemap-filename "~/websites/stage.vanrenterghem.biz/source/posts/sitemap.org"
-        :html-preamble website-header
+        :html-preamble post-header

         :html-postamble website-footer
         :html-postamble website-footer

+        :sitemap-sort-folders ignore-errors

         :sitemap-format-entry my-org-publish-sitemap-default-entry
         :sitemap-sort-files anti-chronologically
         )
         :sitemap-format-entry my-org-publish-sitemap-default-entry
         :sitemap-sort-files anti-chronologically
         )


@@ -59,4 +101,4 @@ PROJECT is the current project."
          :publishing-directory "~/websites/stage.vanrenterghem.biz/target/assets/"
          :publishing-function org-publish-attachment)
 
          :publishing-directory "~/websites/stage.vanrenterghem.biz/target/assets/"
          :publishing-function org-publish-attachment)
 

-        ("website" :components ("orgfiles" "assets"))))
+        ("website" :components ("posts" "pages" "assets"))))

diff --git a/source/index.org b/source/index.org
index bca58332928d79093ecef169bdeeb44cfcbd6742..b7a8bcb1deeadac5f76da5b204f5cf94e4c86785 100644 (file)
--- a/source/index.org
+++ b/source/index.org
@@ -16,11 +16,11 @@ Life occassionally takes me places, mostly close to home but regularly a bit fur
 
 I host [[http://git.vanrenterghem.biz][my own git server]], containing code samples that might be useful as a reference to some. This site's source is stored in there as well.
 
 
 I host [[http://git.vanrenterghem.biz][my own git server]], containing code samples that might be useful as a reference to some. This site's source is stored in there as well.
 

-I [[./posts/index.html][blog]] irregularly about free software, R stats (mostly data visualisation) and occassionaly even about economics or politics.
+I [[file:sitemap.org][blog]] irregularly about free software, R stats (mostly data visualisation) and occassionaly even about economics or politics.

 
 ** Latest posts
 
 
 ** Latest posts
 

-#+INCLUDE: "sitemap.org" :lines "5-14"
+#+INCLUDE: "sitemap.org" :lines "4-14"

 
 #+BEGIN_EXPORT html
 </div>
 
 #+BEGIN_EXPORT html
 </div>