]> git.vanrenterghem.biz Git - www2.vanrenterghem.biz.git/commitdiff
projects / www2.vanrenterghem.biz.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f414714)
Verbeter opmaak posts index pagina.
authorFrederik Vanrenterghem <frederik@vanrenterghem.biz>
Thu, 28 Dec 2023 02:16:50 +0000 (10:16 +0800)
committerFrederik Vanrenterghem <frederik@vanrenterghem.biz>
Thu, 28 Dec 2023 02:16:50 +0000 (10:16 +0800)
html/post-index.mustache patch | blob | history
html/post.mustache patch | blob | history
maak-website.el patch | blob | history

diff --git a/html/post-index.mustache b/html/post-index.mustache
index 5622b6dc682260788a94003912d75ded8513b678..9a0923b5afede0c3fbe73a6db2ffe4ae012d5319 100644 (file)
--- a/html/post-index.mustache
+++ b/html/post-index.mustache
@@ -6,10 +6,23 @@
   <body>
     {{>navbar}} 
 
-    <main class="container content inlinepage">
-
-         {{{contents}}}
-    </main>
+    <div class="container-fluid">
+      <div class="row justify-content-center">
+       <div class="col-auto d-none d-md-block pt-2 ps-2">
+         <aside id="sidebar" class="card">
+           <div class="card-body">
+             <p>Tags</p>
+             <!--# include file="tag-index-body.html" -->
+           </div>
+         </aside>
+       </div> <!-- end of column -->
+       <div class="col-xs-11 col-sm-11 col-md-8 col-lg-9 col-xl-9 col-xxl-9 pt-2 ps-2 pe-2">
+         <section id="content" class="content inlinepage">
+           {{{contents}}}
+         </section>
+       </div>
+      </div>
+    </div>
     
     {{>footer}}
   </body>
diff --git a/html/post.mustache b/html/post.mustache
index f4e268709419be54deed6d9584f734ae2b7f7604..c8f4522db8388a7ee37f89ff93a96266dd834317 100644 (file)
--- a/html/post.mustache
+++ b/html/post.mustache
@@ -14,7 +14,7 @@
       </ol>
     </nav>
     <article class="container content inlinepage card h-entry">
-      <section id="content" role="main" class="e-content">
+      <section id="content" role="main" class="e-content card-body">
        <!-- <h1>{{title}}</h1> -->
        {{{contents}}}
       </section>
diff --git a/maak-website.el b/maak-website.el
index 25964b92498ee25cae8e908fee7d58920eac2c00..a30d8e28e4f59f53b44cf7de63e344a36ea20a7b 100644 (file)
--- a/maak-website.el
+++ b/maak-website.el
@@ -9,6 +9,7 @@
 (setq org-html-htmlize-output-type 'css) ; default: 'inline-css
 (setq org-time-stamp-custom-formats '("%A %e %B %Y" . "%A %e %B %Y at %H:%M"))
 (setq org-display-custom-times t)
+(setq org-html-container-element "section") ;; TODO - check
 (setq my-blog-base-folder "~/websites/stage.vanrenterghem.biz")
 (setq my-blog-source-folder "~/websites/stage.vanrenterghem.biz/source")
 (setq my-blog-target-folder "~/websites/stage.vanrenterghem.biz/target")
@@ -132,29 +133,38 @@ Either the section between #+BEGIN_PREVIEW and +#END_PREVIEW is used, or the fir
        (let* ((abspath (file-name-concat "/home/frederik/websites/stage.vanrenterghem.biz/source/posts" file))
                (relpath (file-relative-name abspath "/home/frederik/websites/stage.vanrenterghem.biz/source/posts/"))
                (title (org-publish-find-title file project-plist))
-               (date (format-time-string (cdr org-time-stamp-formats) (org-publish-find-date file project-plist)))
+               (date (format-time-string (cdr org-time-stamp-custom-formats) (org-publish-find-date file project-plist)))
                (preview (my-blog-get-preview abspath))
               )
           ;; insert a horizontal line before every post, kill the first one
           ;; before saving
-          (insert "-----\n")
           (insert (concat "* [[file:" relpath "][" title "]]\n"))
           ;; add properties for `ox-rss.el' here
          (let ((rss-permalink (concat (file-name-sans-extension relpath) ".html"))
-               (rss-pubdate date))
+               (rss-pubdate (format-time-string (cdr org-time-stamp-formats) (org-publish-find-date file project-plist))))
            (org-mode)
+           (org-set-property "HTML_CONTAINER_CLASS" "card mb-2") ;Bootstrap margin border 2
+           (org-set-property "HTML_HEADLINE_CLASS" "card-header card-title border-bottom-0 fs-5 fw-bold text-decoration-none")
            (org-set-property "RSS_PERMALINK" rss-permalink)
            (org-set-property "PUBDATE" rss-pubdate)
            (org-set-property "RSS_TITLE" title))
           ;; insert the date, preview, & read more link
+         (insert "#+ATTR_HTML: :class card-header\n")
           (insert (concat "Published: " date "\n\n"))
+         (insert "#+BEGIN_export html\n")
+         (insert "<section class=\"card-body\">\n")
+         (insert "#+END_export\n")
          (insert preview)
                                        ;(insert (concat "#+INCLUDE: \"" relpath "\" :only-contents t :lines \"1-10\"\n"))
           (insert "\n")
-          (insert (concat "[[file:" relpath "][Read More...]]\n"))))
+          (insert (concat "[[file:" relpath "][Read More...]]\n"))
+         (insert "#+BEGIN_export html\n")
+         (insert "<\/section>\n")
+         (insert "#+END_export\n")
+         ))
       ;; kill the first hrule to make this look OK
-      (goto-char (point-min))
-      (let ((kill-whole-line t)) (kill-line))
+      ;(goto-char (point-min))
+      ;(let ((kill-whole-line t)) (kill-line))
       ;; insert a title and save
       (insert "#+OPTIONS: title:nil\n")
       (insert "#+TITLE: Frederik Vanrenterghem's blog\n")
@@ -185,11 +195,17 @@ representation for the files to include, as returned by
 
 (defun my-blog-cleanup-sitemaps (plist)
   "Clean up temporary files created in the process of publishing"
+  ;; Create a body-only version of the tags index.
+  (with-temp-file (file-name-concat
+                  (plist-get (cdr (assoc "posts" org-publish-project-alist)) :publishing-directory)
+                  "tag-index-body.html")
+    (insert-file-contents (file-name-concat
+                          (plist-get (cdr (assoc "landing" org-publish-project-alist)) :base-directory)
+                          "tag-index.org"))
+    (org-export-to-buffer 'mustache-html (current-buffer) nil nil nil t nil))
   (delete-file (file-name-concat my-blog-source-folder "sitemap.org"))
   (delete-file (file-name-concat my-blog-posts-folder "sitemap.org"))
-  (delete-file (file-name-concat my-blog-posts-folder "sitemap.org~"))
-
-  )
+  (delete-file (file-name-concat my-blog-posts-folder "sitemap.org~")))
   
 (setq org-publish-project-alist
       `(("landing"
Source for www.vanrenterghem.biz since 28 Dec 2023.