Merge pull request #2 from gr-im/some-fixes

Some fixes
xhtmlboi · Mar 17, 2024 · 91e05ba · 91e05ba
2 parents f383d46 + 2a7e4c0
commit 91e05ba
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 61 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -18,8 +18,6 @@ jobs:
           opam-depext-flags: --with-test
 
       - run: opam install . --deps-only --with-doc --with-test
-      - run: opam install yocaml
-      - run: opam install yocaml_unix yocaml_yaml yocaml_markdown yocaml_jingoo
       - run: opam exec -- dune exec src/blogger.exe -- build
 
       - name: Deploy

diff --git a/blogger.opam b/blogger.opam
@@ -12,7 +12,7 @@ build: [
 ]
 
 license: "GPL-3.0-or-later"
-tags: [ "angry" "cuisine" "nerd" "ocaml" "preface" ]
+tags: [ "blog" "ocaml" "preface" ]
 homepage: "https://github.com/xhtmlboi/blogger"
 dev-repo: "git://github.com/xhtmlboi/blogger.git"
 bug-reports: "https://github.com/xhtmlboi/blogger/issues"
@@ -23,17 +23,9 @@ depends: [
   "preface" { >= "0.1.0" }
   "logs" {>= "0.7.0" }
   "cmdliner" { >= "1.0.0"}
-  "yocaml" {pinned}
-  "yocaml_unix" {pinned}
-  "yocaml_yaml" {pinned}
-  "yocaml_markdown" {pinned}
-  "yocaml_jingoo" {pinned}
-]
-
-pin-depends: [
-  ["yocaml.dev" "git+https://github.com/xhtmlboi/yocaml.git"]
-  ["yocaml_unix.dev" "git+https://github.com/xhtmlboi/yocaml.git"]
-  ["yocaml_yaml.dev" "git+https://github.com/xhtmlboi/yocaml.git"]
-  ["yocaml_markdown.dev" "git+https://github.com/xhtmlboi/yocaml.git"]
-  ["yocaml_jingoo.dev" "git+https://github.com/xhtmlboi/yocaml.git"]
+  "yocaml"
+  "yocaml_unix"
+  "yocaml_yaml"
+  "yocaml_markdown"
+  "yocaml_jingoo"
 ]
diff --git a/templates/layout.html b/templates/layout.html
@@ -1,57 +1,57 @@
-{%- if article_title -%}
-{%- set dash = " - " -%}
-{%- set page_title = article_title -%}
-{%- elseif title -%}
-{%- set dash = " - " -%}
-{%- set page_title = title -%}
-{%- else -%}
-{%- set dash = "" -%}
-{%- set page_title = "" -%}
-{%- endif %}
-{% if article_description -%}
-{%- set page_description = article_description -%}
-{%- elseif description -%}
-{%- set page_description = description -%}
-{%- else -%}
-{%- set page_description = "XHTMLBoy's website" -%}
+{%- if article_title -%} {%- set dash = " - " -%} {%- set page_title =
+article_title -%} {%- elseif title -%} {%- set dash = " - " -%} {%- set
+page_title = title -%} {%- else -%} {%- set dash = "" -%} {%- set page_title =
+"" -%} {%- endif %} {% if article_description -%} {%- set page_description =
+article_description -%} {%- elseif description -%} {%- set page_description =
+description -%} {%- else -%} {%- set page_description = "XHTMLBoy's website" -%}
 {%- endif -%}
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="utf-8">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>
-        XHTMLBoy's website{{ dash }}{{ page_title }}
-    </title>
-    <meta name="description" content="{{ page_description }}">
-    <link href="/css/fonts.css" rel="stylesheet">
-    <link rel="stylesheet" href="/css/hl.css">
-    <link href="/css/style.css" rel="stylesheet">
+    <meta charset="utf-8" />
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>XHTMLBoy's website{{ dash }}{{ page_title }}</title>
+    <meta name="description" content="{{ page_description }}" />
+    <link href="/css/fonts.css" rel="stylesheet" />
+    <link rel="stylesheet" href="/css/hl.css" />
+    <link href="/css/style.css" rel="stylesheet" />
     <script src="/js/hl.js"></script>
-    <link rel="alternate" type="application/rss+xml" href="/feed.xml" title="RSSBoy">
+    <link
+      rel="alternate"
+      type="application/rss+xml"
+      href="/feed.xml"
+      title="RSSBoy"
+    />
   </head>
   <body>
     <header>
       <h1>XHTMLBoy's Website</h1>
       <blockquote>
-        You are on a website dedicated to the enthusiasts of
-        (valid) <strong>XHTML</strong>, and of <strong>beautiful
-        mechanics</strong>.
+        You are on a website dedicated to the enthusiasts of (valid)
+        <strong>XHTML</strong>, and of <strong>beautiful mechanics</strong>.
       </blockquote>
     </header>
-    <main>
-        {%- autoescape false -%}
-        {{ body }}
-        {% endautoescape -%}
-    </main>
+    <main>{%- autoescape false -%} {{ body }} {% endautoescape -%}</main>
     <footer>
-        <a href="https://github.com/xhtmlboi/yocaml">Powered by <strong>YOCaml</strong></a>
-        (snif, WordPress was definitively a better name)
-        <br />
-        <a class="valid" href="https://validator.w3.org/check?uri=https%3A%2F%2Fxhtmlboi.github.io&charset=%28detect+automatically%29&doctype=Inline&group=0">HTML5</a>
-        <a class="valid" href="https://jigsaw.w3.org/css-validator/validator?uri=https%3A%2F%2Fxhtmlboi.github.io%2Fcss%2Fstyle.css&profile=css3svg&usermedium=all&warning=1&vextwarning=&lang=en">CSS3</a>
+      <a href="https://github.com/xhtmlboi/yocaml"
+        >Powered by <strong>YOCaml</strong></a
+      >
+      (snif, WordPress was definitively a better name)
+      <br>
+      <a
+        class="valid"
+        href="https://validator.w3.org/check?uri=https%3A%2F%2Fxhtmlboi.github.io&charset=%28detect+automatically%29&doctype=Inline&group=0"
+        >HTML5</a
+      >
+      <a
+        class="valid"
+        href="https://jigsaw.w3.org/css-validator/validator?uri=https%3A%2F%2Fxhtmlboi.github.io%2Fcss%2Fstyle.css&profile=css3svg&usermedium=all&warning=1&vextwarning=&lang=en"
+        >CSS3</a
+      >
     </footer>
-    <script>hljs.highlightAll();</script>
+    <script>
+      hljs.highlightAll();
+    </script>
   </body>
 </html>
diff --git a/templates/list_articles.html b/templates/list_articles.html
@@ -13,17 +13,17 @@ <h3>Essays and ramblings</h3>
     <li>
         <div class="side">
             <a href="{{ article.author.link }}">
-                <img src="{{ article.author.avatar }}">
+                <img src="{{ article.author.avatar }}" alt="avatar of {{ article.author.name }}">
             </a>
             {%- for co_author in article.co_authors -%}
             <a href="{{ co_author.author.link  }}">
-                <img src="{{ co_author.author.avatar }}">
+                <img src="{{ co_author.author.avatar }}" alt="avatar of {{ co_author.author.name }}">
             </a>
             {%- endfor -%}
         </div>
         <div class="content">
             <span class="date">{{ article.date.canonical }}</span>
-            <a href="{{ article.url }}">{{ article.article_title }}</a><br />
+            <a href="{{ article.url }}">{{ article.article_title }}</a><br>
             <p>{{ article.article_description }}</p>
             <div class="bottom">
                 <ul class="tags-list">