Merge branch 'develop' into feature/annotation_leaflet

openatlas/templates/index/index.html

@@ -1,10 +1,3 @@
-<div class="row g-1">
-  <div class="col-auto">{{ ('<i class="fas fa-book"></i> ' + _('manual')|uc_first)|link("/static/manual/index.html", class_=config.CSS.button.primary, external=True)|safe }}</div>
-  <div class="col-auto">{{ _('model')|button(url_for('model_index'))|safe }}</div>
-  <div class="col-auto">{{ (_('reference systems')|uc_first)|link(url_for('index', view='reference_system'), class_=config.CSS.button.primary)|safe }}</div>
-  <div class="col-auto">{{ _('network visualization')|button(url_for('network', dimensions=0))|safe }}</div>
-</div>
-
 <p class="mt-3">
   {{ _('hello')|uc_first }} <strong>{{ current_user.username }}</strong>.
   {% if session.login_previous_success %}

openatlas/templates/layout.html

@@ -175,9 +175,6 @@
     <div>
         {{ g.settings.site_name }}
         <a href="{{ url_for('index_changelog') }}">{{ config.VERSION }}</a>
-        {% if g.settings.frontend_website_url %}
-          - {{ _('frontend')|link(g.settings.frontend_website_url, external=True)|safe }}
-        {% endif %}
     </div>
 </nav>
 {% with messages = get_flashed_messages(with_categories=true) %}

openatlas/views/index.py

@@ -13,7 +13,8 @@
 from openatlas.display.tab import Tab
 from openatlas.display.table import Table
 from openatlas.display.util import (
-    bookmark_toggle, format_date, link, required_group, send_mail, uc_first)
+    bookmark_toggle, button, format_date, link, required_group, send_mail,
+    uc_first)
 from openatlas.forms.field import SubmitField
 from openatlas.models.content import get_translation
 from openatlas.models.entity import Entity
@@ -34,7 +35,27 @@ def overview() -> str:
                         intro=get_translation('intro')))},
             crumbs=['overview'])
     tabs = {
-        'info': Tab('info'),
+        'info': Tab(
+            'info',
+            buttons=[
+                link(
+                    '<i class="fas fa-book"></i> ' + uc_first(_('manual')),
+                    "/static/manual/index.html",
+                    class_=app.config['CSS']['button']['primary'],
+                    external=True),
+                button(_('model'), url_for('model_index')),
+                button(
+                    _('reference systems'),
+                    url_for('index', view='reference_system')),
+                button(
+                    _('network visualization'),
+                    url_for('network', dimensions=0)),
+                link(
+                    _('frontend'),
+                    g.settings['frontend_website_url'],
+                    class_=app.config['CSS']['button']['primary'],
+                    external=True) if g.settings['frontend_website_url']
+                else '']),
         'bookmarks': Tab(
             'bookmarks',
             table=Table(['name', 'class', 'begin', 'end'])),