[1.9.52]

CHANGELOG.md

@@ -10,12 +10,18 @@ Tyto - Littérateur
 
 # CURRENTLY IN DEV (in devel branch) !
 
+## [1.9.52]
+- fix toc_N in HTML ID titles
+- fix navbar, when getting article title
+- update (work in progress) tpl_files/styles.css default doc references
+- add logs (verbose) when adding an item in navbar, sidebar module
+
 ## [1.9.51]
 - Translated english logs
 - Some commands cannot be used if domain is not activated
 - New [action] "show": show files contents [multiple targets]
 - fix typo in metas module
 
-## [1.9.51]
+## [1.9.50]
 - Complete new code
 

README.md

@@ -2,6 +2,7 @@
 This program can be tested and should mainly work. Please report any problems
 
 Tyto - Littérateur is translated in french and english.
+Official website not yet udpated for this new version.
 
 # Commands
 ```
@@ -20,7 +21,7 @@ tyto help words anchor
 - Go to this directory
 - type `tyto new domain`
 - type `tyto check domain` and PLEASE, CHECK configuration file
-- create in new directory domain ".../articles/", an article (see help)
+- create in new directory domain ".../articles/", an articl file [myfile].tyto (see help)
 - type `wip myfile.tyto`
 
 

debian/control

@@ -1,5 +1,5 @@
 Package: tyto
-Version: 1.9.51
+Version: 1.9.52
 Section: custom
 Priority: optional
 Architecture: all

src/usr/bin/tyto

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# version: 1.9.51
+# version: 1.9.52
 # Tyto - Littérateur
 
 # Copyright (C) 2023 Cyrille Louarn <echolib+tyto@a-lec.org>

src/var/lib/tyto/program/debug.py

@@ -76,6 +76,7 @@ def set_messages():
     205 : langs.logs.inf_file_create,
     206 : langs.logs.inf_file_upd,
     207 : langs.logs.inf_dir_create,
+    208 : langs.logs.inf_add_item,
     210 : langs.logs.inf_check_post,
     211 : langs.logs.inf_wip_process,
     212 : langs.logs.inf_mod_process,

src/var/lib/tyto/program/modules.py

@@ -366,7 +366,7 @@ def create_navbar_html(html_file):
             continue
    
          # Item has a "title" set with # as separator
-         set_dir   = line.rstrip()
+         set_dir = line.rstrip()
 
 
          # Set_dir begins with "/" ; apply correction
@@ -389,13 +389,21 @@ def create_navbar_html(html_file):
          if cf_load(ln, set_dir + "/index.tyto", "navbar"):
             try:    set_title = cf.get("ARTICLE", "title")
             except: continue
+         else:
+            continue
 
          # Check and inform if not index.html exists
          srv_index_html = domain.wip + "/index.html"
          if not os.path.exists(srv_index_html):
             debug.out(11, "%s. navbar (404) wip/%s/index.html"%(
                           ln, set_dir
-                          ), files["navbar"]["wrk"], True, 1, False) 
+                          ), files["navbar"]["wrk"], True, 1, False)
+            continue
+         
+         debug.out(208, "navbar. %s"%(
+                        cf.get("ARTICLE", "title")
+                        ), files["navbar"]["wip"], False, 0, False
+                  )
          
          # Create menu links
          if not menu_links:
@@ -448,7 +456,10 @@ def create_sidebar_html(html_file):
             continue
          
          items += 1
-         print("> -",items, cf.get("ARTICLE", "title"))
+         debug.out(208, "sidebar. %s. %s"%(
+                        items, cf.get("ARTICLE", "title")
+                        ), files["sidebar"]["wip"], False, 0, False
+                  )
          
          if not html_items:
             html_items = sidebar_item%(

src/var/lib/tyto/program/wip.py

@@ -192,7 +192,7 @@ def titles():
    for title in sorted_titles:
       line = HTMLs["title"]%(
                    (int(title[1]) + 1),    # #"1" = h"2"...
-                   nbr, domain.web["css"], # nbr fot toc_X CSS ID
+                   titles[title], domain.web["css"], # nbr fot toc_X CSS ID
                    title[3:],              # title without marker
                    (int(title[1]) + 1)     # </h of marker ID>
                    )

src/var/lib/tyto/tpl_files/styles.css

@@ -14,25 +14,24 @@ div#site_container {}
 /* ----------------------------------------------------------------------------
  * Header (Wensite Logo, Description)
 */
-header#site_header {}
+a#site_link {}
-/* Website Logo */
+header#header {}
-div#site_logo {}
+div#header_logo {}
-a#site_logo_link {}
+img#header_logo_image {}
-img#site_logo_image {}
+div#header_abouts {}
-/* Website about*/
+p#header_title {}
-div#site_infos {}
+p#header_about {}
-p#site_infos_title {}
+
-p#site_infos_text {}
 
 
 /* ----------------------------------------------------------------------------
  * Menu navbar (Website)
 */
-nav#site_menu {}
+nav#menu {}
-menu#site_menu_items {}
+menu#menu_items {}
-li.site_menu_item {}
+li.menu_item {}
-/* also a.tyto {} */
+a.menu_link {}
-a.site_menu_link {}
+
 
 
 /* div contains <article> and <aside> */

src/var/lib/tyto/translations/logs_en.py

@@ -85,6 +85,7 @@ inf_dir_create  = "Directory created"
 inf_check_post  = "Checking article"
 inf_wip_process = "Converting"
 inf_mod_process = "Checking modules"
+inf_add_item    = "Add item"
 inf_end_process = "Tyto!"
 
 # Form
@@ -644,7 +645,7 @@ logo:    URI
    ))
 ))
 
-# Block-Code. %s
+# Block-Code. CSS Class (default "bcode")
 # ! Opened marker is at same position than closed marker
 {{ PyCode
    ...
@@ -686,7 +687,6 @@ logo:    URI
      help_abbr_header,
      help_anc_header,
      css_info,
-     css_info,
      help_list,
      help_cite,
      help_image_writer,

src/var/lib/tyto/translations/logs_fr.py

@@ -85,6 +85,7 @@ inf_dir_create  = "Dossier créé"
 inf_check_post  = "Vérification de l'article"
 inf_wip_process = "Conversion"
 inf_mod_process = "Vérification des modules"
+inf_add_item    = "Ajout de l'article"
 inf_end_process = "Tyto!"
 
 # Form
@@ -588,7 +589,7 @@ _`souligné`_  => <u>
 *`DOMAINE/articles/ `* # comme /` est le marqueur italique d'ouverture
 
 # Multiples marqueurs. Ajouter "&"
-# Tip : ** + ← + `` + ← && + ← + __ + ← `` + ← Très gras et souligné
+# Astuce : ** + ← + `` + ← && + ← + __ + ← `` + ← Très gras et souligné
 
 *`&_`Très gras et souligné`_&`*
 """
@@ -656,7 +657,7 @@ logo:    URI
    ))
 ))
 
-# Code (bloc). %s
+# Code (bloc). Class CSS possible (default "bcode")
 # ! Le marqueur d'ouverture est à la même position que le marqueur de fermeture
 {{ PyCode
    ...
@@ -698,7 +699,6 @@ logo:    URI
      help_abbr_header,
      help_anc_header,
      css_info,
-     css_info,
      help_list,
      help_cite,
      help_image_writer,