Modification contenu et style

MBunel · Sep 23, 2024 · 6250cf2 · 6250cf2
1 parent cb83dc8
commit 6250cf2
Show file tree

Hide file tree

Showing 8 changed files with 118 additions and 58 deletions.
diff --git a/manifest.scm b/manifest.scm
@@ -9,7 +9,7 @@
 
 (concatenate-manifests
  (list
-  (specifications->manifest '("bash" "make" "pandoc" "emacs" "emacs-htmlize" "emacs-citeproc-el"))
+  (specifications->manifest '("bash" "make" "pandoc" "emacs-no-x" "emacs-htmlize" "emacs-citeproc-el"))
   (packages->manifest
    (list
     (package

diff --git a/publish.el b/publish.el
@@ -13,10 +13,11 @@
 (weblorg-site
  :theme nil
  :base-url weblorg-default-url 
- :template-vars '(("site_name" . "Mattia Bunel")
+ :template-vars '(("site_name" . "mbunel.xyz")
                   ("site_owner" . "owner@mail.com (owner)")
                   ("site_description" . "owner's personal blog.")))
 
+;; Main page
 (weblorg-route
  :name "index"
  :input-pattern "src/index.org"
@@ -33,37 +34,54 @@
  :url "/{{ slug }}.html")
 
 ;; List of blog posts
-;; (weblorg-route
-;;  :name "blog"
-;;  :input-pattern "src/posts/*.org"
-;;  :input-aggregate #'weblorg-input-aggregate-all-desc
-;;  :template "blog.html"
-;;  :output "output/billets.html"
-;;  :url "/billets.html")
+(weblorg-route
+ :name "blog"
+ :input-pattern "src/posts/*.org"
+ :input-aggregate #'weblorg-input-aggregate-all-desc
+ :template "blog.html"
+ :output "output/billets.html"
+ :url "/billets.html")
 
-;; (weblorg-route
-;;  :name "categories"
-;;  :input-pattern "src/posts/*.org"
-;;  :input-aggregate #'weblorg-input-aggregate-by-category
-;;  :template "category.html"
-;;  :output "output/tags/{{ name }}.html"
-;;  :url "output/{{ name }}")
+(weblorg-route
+ :name "categories"
+ :input-pattern "src/posts/*.org"
+ :input-aggregate #'weblorg-input-aggregate-by-category
+
+ :template "category.html"
+ :output "output/tags/{{ name }}.html"
+ :url "/tags/{{ name }}.html")
 
-;; (weblorg-route
-;;  :name "posts"
-;;  :input-pattern "src/posts/*.org"
-;;  :template "post.html"
-;;  :output "output/posts/{{ slug }}.html"
-;;  :url "/posts/{{ slug }}.html")
+(weblorg-route
+ :name "posts"
+ :input-pattern "src/posts/*.org"
+ :template "post.html"
+ :output "output/posts/{{ slug }}.html"
+ :url "/posts/{{ slug }}.html")
 
 ;; ;; Blog RSS
-;; (weblorg-route
-;;  :name "feed"
-;;  :input-pattern "src/posts/*.org"
-;;  :input-aggregate #'weblorg-input-aggregate-all-desc
-;;  :template "feed.xml"
-;;  :output "output/feed.xml"
-;;  :url "/feed.xml")
+(weblorg-route
+ :name "feed"
+ :input-pattern "src/posts/*.org"
+ :input-aggregate #'weblorg-input-aggregate-all-desc
+ :template "feed.xml"
+ :output "output/feed.xml"
+ :url "/feed.xml")
+
+;; Cours
+(weblorg-route
+ :name "cours"
+ :input-pattern "src/cours/*.org"
+ :template "page.html"
+ :output "output/cours/{{ slug }}.html"
+ :url "/cours/{{ slug }}.html")
+
+(weblorg-route
+ :name "pages_cours"
+ :input-pattern "src/cours/*.org"
+ :input-aggregate #'weblorg-input-aggregate-all-desc
+ :template "cours.html"
+ :output "output/cours.html"
+ :url "/cours.html")
 
 ;; Static
 (weblorg-route

diff --git a/src/index.org b/src/index.org
@@ -2,16 +2,4 @@
 #+LANGUAGE:fr
 #+OPTIONS: toc:nil num:nil
 
-Je suis docteur en géomatique, rattaché, au corps des ingénieurs des
-travaux géographiques et cartographiques de l’état (ITGCE), avec la
-fonction d’ingénieur d’études référent pour les produits altimétriques
-au sein de l’institut national de l’information géographique et
-forestière (IGN).
-
-#+attr_html: :style font-size:small; margin-bottom:2.5em;
-#+begin_div
-+ GitHub : https://github.com/MBunel
-+ OCRID : https://orcid.org/0000-0001-7751-3507
-+ Research Gate : https://www.researchgate.net/profile/Mattia-Bunel
-+ HAL : https://cv.archives-ouvertes.fr/mattia-bunel
-#+end_div
+Je suis Mattia Bunel, géographe et géomaticien, actuellement ingénieur de recherche à l'EHESS et à l'UMR Géograpie-cités, en charge de la [[https://psigehess.hypotheses.org/][plateforme géomatique]].
diff --git a/src/pages/apropos.org b/src/pages/apropos.org
@@ -1,4 +1,27 @@
 #+TITLE: À propos
 #+SLUG:a-propos
+#+OPTIONS: num:nil toc:nil
 
-Ce site utilise la palette [[https://catppuccin.com/][Catppuccin]] et les polices [[https://github.com/impallari/Libre-Baskerville][Libre Baskerville]], [[https://github.com/impallari/Libre-Franklin][Libre Franklin]] et [[https://github.com/googlefonts/spacemono][Space Mono]].
+Je suis géographe et géomaticien, actuellement ingénieur de recherche à l'EHESS et à l'UMR Géograpie-cités, en charge de la plateforme géomatique. 
+
+* Liens utiles
+
+#+Attr_html: :style font-size:small; margin-bottom:2.5em;
+#+Begin_div
++ GitHub : https://github.com/MBunel
++ OCRID : https://orcid.org/0000-0001-7751-3507
++ Research Gate : https://www.researchgate.net/profile/Mattia-Bunel
++ HAL : https://cv.archives-ouvertes.fr/mattia-bunel
+#+end_div
+
+
+* À propos de la technique
+
+Ce site est un site statique généré à l'aide d'un moteur de blog statique basé sur emacs, [[https://emacs.love/weblorg/][/weblorg/]]. J'utilise un [[https://github.com/MBunel/mbunel.xyz/tree/main/theme][template personalisé]], ainsi que les polices [[https://github.com/impallari/Libre-Baskerville][Libre Baskerville]], [[https://github.com/impallari/Libre-Franklin][Libre Franklin]], [[https://github.com/googlefonts/spacemono][Space Mono]] et la palette [[https://catppuccin.com/][Catppuccin]].
+
+La publication de ce site est automatisée par une [[https://github.com/MBunel/mbunel.xyz/blob/main/.github/workflows/main.yml][/GitHub Action/]], reproductible grâce à l'utilisation du gestionnaire de package [[https://guix.gnu.org/][Guix]].
+
+Les sources sont disponibles sur [[https://github.com/MBunel/mbunel.xyz][ce dépôt GitHub.]]
+
+* Publications
+Voir la [[url_for:pages,slug=publications][liste de mes publications]].
diff --git a/theme/static/style.css b/theme/static/style.css
@@ -233,6 +233,8 @@ main {
     flex-grow: 1;
     flex-shrink: 0;
     flex-basis: auto;
+    margin-left:1em;
+    margin-right:1em;
 }
 
 h1, h2, h3 {
@@ -253,14 +255,14 @@ hgroup {
 }
 
 hgroup > h1 {
-    margin:0;
+    margin-bottom:0;
 }
 
 hgroup > p {
     font-family: "Libre Franklin",sans;
     font-weight: bold;
     font-size: large;
-    margin: 0;
+    margin-top: 0;
 }
 
 .org-src-containe {
@@ -342,6 +344,34 @@ ul {
     // list-style-type: none;
 }
 
+/* Tags */
+.post-tags {
+
+}
+
+.post-tags ul {
+    margin: 0;
+    padding: 0;
+}
+
+.post-tags ul li {
+    display: inline;
+    margin-left: 0.5em;
+    background-color: var(--mantle);
+    box-shadow: 0.1em 0.2em 0.2em var(--crust);
+    padding: 0.1em 0.2em;
+}
+
+.post-tags ul li:first-child {
+    margin-left:0;
+}
+
+.tag {
+    font-family: "Space Mono", "DejaVu Sans Mono", monospace;
+    font-style: normal;
+}
+
+
 /* Tables */
 table {
     margin:1em auto;

diff --git a/theme/templates/base.html b/theme/templates/base.html
@@ -60,19 +60,14 @@ <h1>
       </nav>
     </header>
     {% endblock %}
-
-    {# Probably where most of the action will happen #}
     <main>
       {% block main %}{% endblock %}
     </main>
-
-    {# Links, copyright notice, etc #}
     {% block footer %}
     <footer>
       <p>Fabriqué à coups de <kbd>M-x</kbd> le {{ now() | strftime("%d %b %Y") }}, avec <a href="https://emacs.love/weblorg" target="_blank">Weblorg</a> et <a href="https://guix.gnu.org/" target="_blank">Guix</a>.</p>
-      <p>Ce site utilise la palette <a href="https://catppuccin.com/" target="_blank">Catppuccin</a> et les polices <a href="https://github.com/impallari/Libre-Baskerville" target="_blank">Libre Baskerville</a>, <a href="https://github.com/impallari/Libre-Franklin" target="_blank">Libre Franklin</a> et <a href="https://github.com/googlefonts/spacemono" target="_blank">Space Mono</a>.</p>
-      <p>Mattia Bunel, <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">CC-BY-SA 4.0</a>, 2024.</p>
+      <p><a href="{{ url_for("pages", slug="a-propos") }}">Mattia Bunel,</a> <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">CC-BY-SA 4.0</a>, 2024.</p>
     </footer>
     {% endblock %}
-</body>
+  </body>
 </html>
diff --git a/theme/templates/category.html b/theme/templates/category.html
@@ -1,12 +1,12 @@
 {% extends "base.html" %}
-{% block body %}
-  <div class="title"><h1>{{ name }}</h1></div>
+{% block main %}
+  <h1 class="tag">#{{ category.name }}</h1>
   <div class="content">
     <ul>
       {% for post in category.posts %}
         <li>
-          <span class="pubdate">{{ post.date }}</span>
-          <!--a href="{{ url_for("posts", slug=post.slug) }}">{{ post.title }}</a-->
+          <span class="pubdate">{{ post.date |strftime("%d %b %Y") }}</span>
+          <a href="{{ url_for("posts", slug=post.slug) }}">{{ post.title }}</a>
         </li>
       {% endfor %}
     </ul>

diff --git a/theme/templates/post.html b/theme/templates/post.html
@@ -33,8 +33,14 @@ <h1 class="post__title">{{ post.title }}</h1>
     </div>
     {% endif %}
     {% if post.filetags is defined %}
-    <div>
-      {{ post.filetags}}
+    <div class="post-tags">
+      <ul>
+	{% for filetag in post.filetags %}
+	<li>
+          <a href="{{ url_for("categories", name=filetag) }}"><span class="tag">#{{ filetag }}</span></a>
+	</li>
+	{% endfor %}
+      </ul>
     </div>
     {% endif %}
   </section>