Merge branch 'main' into chatfunc

routes/library/article.py

@@ -20,12 +20,12 @@ def data(article_id):
         raise TypeError(f"No article named '{article_id}' found in the database.")
     return render_template(
         "library/article.jinja",
-        article_id  =database_entry["article_id"   ].capitalize(),
+        article_id  =database_entry["article_id"    ],
-        title       =database_entry["title"     ].capitalize(),
+        title       =database_entry["title"         ].title(),
-        subtitle    =database_entry["subtitle"         ],
+        subtitle    =database_entry["subtitle"      ],
-        main_text   =database_entry["main_text"          ].capitalize(),
+        main_text   =database_entry["main_text"     ].capitalize(),
-        author      =database_entry["author"   ],
+        author      =database_entry["author"        ],
-        publish_date=database_entry["publish_date"           ])
+        publish_date=database_entry["publish_date"  ])
 
 @page.route("/species/image/<photoid>")
 def image(photoid):

templates/library/article.jinja

@@ -4,18 +4,13 @@
 {% endblock %}
 {% block content %}
 {% from 'button.jinja' import button %}
-<div class="species-layout">
 <section id="summary" style="padding: 10px 20px; text-align: center; margin-top:1rem" class="container">
     <h1>{{ title }}</h1>
-    <h2><em>{{ subtitle }}</em></h2>
+    <h3><em>{{ subtitle }}</em></h3>
-    <p>Category: {{author}}</p>
+    <p>Author: {{author}}</p>
-    <p>Category: {{publish_date}}</p>
+    <p>Published: {{publish_date}}</p>
-
+    <p>{{ main_text }}</p>
 </section>
-<section id="info" style="padding: 10px 20px; text-align: center;" class="container">
-<p>{{ main_text }}</p>
-</section>
-</div>
 {# this button should only be visible to certain account types #}
 {# <div style="text-align: right;">
     {{ button(url='/species/editor/'+species_id, button_text='Edit Species') }}