From ec64ff32ab8b4dcb80ca92a584f6ce54de915c0d Mon Sep 17 00:00:00 2001
From: Cyrille L <echolib@a-lec.org>
Date: Thu, 6 Apr 2023 10:18:40 +0200
Subject: [PATCH] HTML changes. Show main title <h1> in <article>. New author
 line at the end of article

---
 src/var/lib/tyto/program/html.py         | 31 +++++++++++++-----------
 src/var/lib/tyto/translations/site_en.py |  6 ++---
 src/var/lib/tyto/translations/site_fr.py |  8 +++---
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/var/lib/tyto/program/html.py b/src/var/lib/tyto/program/html.py
index 0466b4e..943d800 100644
--- a/src/var/lib/tyto/program/html.py
+++ b/src/var/lib/tyto/program/html.py
@@ -138,8 +138,8 @@ def create_main_page(target, article_bottom):
     '          <span id="article_code"> \n' + \
     '            <a id="article_code_link"\n' + \
     '               href="./%s"\n'%os.path.basename(db.short_src) + \
-    '               title="%s">{%s}</a></span> \n'%(
-                    langs.site.tyto_psrc,
+    '               title="%s [%s]">{%s}</a></span> \n'%(
+                    langs.site.tyto_psrc, db.title,
                     langs.site.source_code
                     )
   
@@ -169,21 +169,24 @@ def create_main_page(target, article_bottom):
   '    </header>\n' + \
   '\n' + \
   '    <article id="article_main">\n' + \
+  '    <h1 id="main_title"\n' + \
+  '        title="[%s] %s %s %s %s">%s</h1>\n'%(
+                   db.title, langs.site.w_written, db.date,
+                   langs.site.by, db.author,
+                   db.title,
+                   ) + \
+  '%s\n'%article_bottom + \
   '      <section id="article_infos">\n' + \
   '        <p>\n' + \
-  '          <span id="article_title"\n' + \
-  '                title="[%s] %s %s %s %s">%s</span>\n'%(
-                   db.title, langs.site.w_written, db.date, langs.site.by,
-                   db.author,
-                   langs.site.article
-                   ) + \
-  '%s'%post_html_code + \
-  '          <span>%s</span> \n'%langs.site.written_by + \
-  '          <span id="article_author">%s</span>. \n'%(db.author) + \
+  '        <span id="article_author"\n' + \
+  '              title="%s %s [%s]">%s</span>, %s\n'%(
+                       db.author, langs.site.author_of, db.title,
+                       db.author, langs.site.le
+                       ) + \
   '%s\n'%time_html_pub + \
+  '%s'%post_html_code + \
   '        </p>\n' + \
   '      </section>\n' + \
-  '%s\n'%article_bottom + \
   '    </article>\n' + \
   '\n' + \
   '<!--# include virtual="/template/sidebar.html"-->\n' + \
@@ -227,9 +230,9 @@ def create_html_time_meta(process):
   '<!--Tyto_Published-->\n' + \
   '          <time datetime="%s">\n'%date_raw + \
   '            <span id="article_pub"\n' + \
-  '                  title="[%s] %s %s (%s)">%s %s</span>\n'%(
+  '                  title="[%s] %s %s (%s)">%s</span>\n'%(
                      db.title, langs.site.w_published, date_pub, time_pub,
-                     langs.site.published, date_pub
+                     date_pub
                      ) + \
   '          </time>\n' + \
   '<!--/Tyto_Published-->'
diff --git a/src/var/lib/tyto/translations/site_en.py b/src/var/lib/tyto/translations/site_en.py
index c99aa7c..a1e655e 100644
--- a/src/var/lib/tyto/translations/site_en.py
+++ b/src/var/lib/tyto/translations/site_en.py
@@ -29,6 +29,7 @@ title   = 'Title'
 File    = 'File'
 name    = 'Name'
 by      = "by"
+le      = "the"
 q       = '?'
 i       = '!'
 pp      = ":"
@@ -40,12 +41,11 @@ source_code = "Source code"
 home        = "Home"
 go_home     = "Go to Homepage"
 read        = "Read"
-tyto_psrc   = "Show this article source code in Tyto format"
+tyto_psrc   = "Source code in Tyto format of"
 w_written   = "was written the"
 w_published = "was published the"
 written     = "written the"
-written_by  = 'written by'
-published   = "Published the"
+author_of   = "is the uthor of"
 
 # Sidebar
 site_sdb_t  = "Featured..."
diff --git a/src/var/lib/tyto/translations/site_fr.py b/src/var/lib/tyto/translations/site_fr.py
index 06928b2..8d3bd58 100644
--- a/src/var/lib/tyto/translations/site_fr.py
+++ b/src/var/lib/tyto/translations/site_fr.py
@@ -28,6 +28,7 @@ title   = 'Titre'
 File    = 'Fichier'
 name    = 'Nom'
 by      = "par"
+le      = "le"
 q       = ' ?'
 i       = ' !'
 pp      = " :"
@@ -39,12 +40,11 @@ source_code = "Code source"
 home        = "Accueil"
 go_home     = "Aller à la page d'accueil"
 read        = "À lire"
-tyto_psrc   = "Voir le code source au format Tyto de cet article"
+tyto_psrc   = "Code source au format Tyto de"
 w_written   = "a été écrit le"
 w_published = "a été publié le"
-written   = "écrit le"
-written_by  = 'écrit par'
-published = "Publié le"
+written     = "écrit le"
+author_of   = "est l'auteur de"
 
 # Barre latérale
 site_sdb_t  = "À l'affiche..."