Merge branch 'fomanticui' into 'main'

bump to fomanticui 2.9.3 See merge request yaal/canaille!152
yaal-coop · Sep 8, 2023 · 9218f2c · 9218f2c
2 parents 5cff3ab + c2e6158
commit 9218f2c
Show file tree

Hide file tree

Showing 23 changed files with 3,814 additions and 1,722 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -10,6 +10,7 @@ Added
   phase, they get redirected back to that page afterwards.
   :issue:`168` :pr:`151`
 - flask-babel and pytz are now part of the `front` extras
+- Bump to fomantic-ui 2.9.3 :pr:`152`
 
 [0.0.33] - 2023-08-26
 =====================

diff --git a/canaille/core/templates/group.html b/canaille/core/templates/group.html
@@ -11,16 +11,14 @@
 {%- endblock -%}
 
 {% block submenu %}
-    <nav class="ui bottom attached two item borderless menu">
-        <a class="{% if edited_group %}active {% endif %}item" href="{{ url_for('core.groups.groups') }}">
-            <i class="th list icon"></i>
-            {% trans %}View{% endtrans %}
-        </a>
-        <a class="{% if not edited_group %}active {% endif %}item"  href="{{ url_for('core.groups.create_group') }}">
-            <i class="plus icon"></i>
-            {% trans %}Add{% endtrans %}
-        </a>
-    </nav>
+    <a class="{% if edited_group %}active {% endif %}item" href="{{ url_for('core.groups.groups') }}">
+        <i class="th list icon"></i>
+        {% trans %}View{% endtrans %}
+    </a>
+    <a class="{% if not edited_group %}active {% endif %}item"  href="{{ url_for('core.groups.create_group') }}">
+        <i class="plus icon"></i>
+        {% trans %}Add{% endtrans %}
+    </a>
 {% endblock %}
 
 {% block content %}

diff --git a/canaille/core/templates/groups.html b/canaille/core/templates/groups.html
@@ -6,16 +6,14 @@
 {%- endblock -%}
 
 {% block submenu %}
-    <nav class="ui bottom attached two item borderless menu">
-        <a class="active item" href="{{ url_for('core.groups.groups') }}">
-            <i class="th list icon"></i>
-            {% trans %}View{% endtrans %}
-        </a>
-        <a class="item" href="{{ url_for('core.groups.create_group') }}">
-            <i class="plus icon"></i>
-            {% trans %}Add{% endtrans %}
-        </a>
-    </nav>
+    <a class="active item" href="{{ url_for('core.groups.groups') }}">
+        <i class="th list icon"></i>
+        {% trans %}View{% endtrans %}
+    </a>
+    <a class="item" href="{{ url_for('core.groups.create_group') }}">
+        <i class="plus icon"></i>
+        {% trans %}Add{% endtrans %}
+    </a>
 {% endblock %}
 
 {% block content %}

diff --git a/canaille/core/templates/invite.html b/canaille/core/templates/invite.html
@@ -10,20 +10,18 @@
 {% endblock %}
 
 {% block submenu %}
-    <nav class="ui bottom attached three item borderless menu">
-        <a class="item" href="{{ url_for('core.account.users') }}">
-            <i class="th list icon"></i>
-            {% trans %}View{% endtrans %}
-        </a>
-        <a class="item" href="{{ url_for('core.account.profile_creation') }}">
-            <i class="plus icon"></i>
-            {% trans %}Add{% endtrans %}
-        </a>
-        <a class="active item" href="{{ url_for('core.account.user_invitation') }}">
-            <i class="paper plane icon"></i>
-            {% trans %}Invite{% endtrans %}
-        </a>
-    </nav>
+    <a class="item" href="{{ url_for('core.account.users') }}">
+        <i class="th list icon"></i>
+        {% trans %}View{% endtrans %}
+    </a>
+    <a class="item" href="{{ url_for('core.account.profile_creation') }}">
+        <i class="plus icon"></i>
+        {% trans %}Add{% endtrans %}
+    </a>
+    <a class="active item" href="{{ url_for('core.account.user_invitation') }}">
+        <i class="paper plane icon"></i>
+        {% trans %}Invite{% endtrans %}
+    </a>
 {% endblock %}
 
 {% block content %}

diff --git a/canaille/core/templates/mails/admin.html b/canaille/core/templates/mails/admin.html
@@ -6,28 +6,26 @@
 {%- endblock -%}
 
 {% block submenu %}
-    <nav class="ui bottom attached five item borderless menu">
-        <a class="active item" href="{{ url_for('core.admin.mail_index') }}">
-            <i class="user mail icon"></i>
-            {% trans %}Emails{% endtrans %}
-        </a>
-        <a class="item" href="{{ url_for('oidc.clients.index') }}">
-            <i class="th list icon"></i>
-            {% trans %}Clients{% endtrans %}
-        </a>
-        <a class="item" href="{{ url_for('oidc.clients.add') }}">
-            <i class="plus icon"></i>
-            {% trans %}Add a client{% endtrans %}
-        </a>
-        <a class="item" href="{{ url_for('oidc.tokens.index') }}">
-            <i class="key icon"></i>
-            {% trans %}Tokens{% endtrans %}
-        </a>
-        <a class="item" href="{{ url_for('oidc.authorizations.index') }}">
-            <i class="user secret icon"></i>
-            {% trans %}Codes{% endtrans %}
-        </a>
-    </nav>
+    <a class="active item" href="{{ url_for('core.admin.mail_index') }}">
+        <i class="user mail icon"></i>
+        {% trans %}Emails{% endtrans %}
+    </a>
+    <a class="item" href="{{ url_for('oidc.clients.index') }}">
+        <i class="th list icon"></i>
+        {% trans %}Clients{% endtrans %}
+    </a>
+    <a class="item" href="{{ url_for('oidc.clients.add') }}">
+        <i class="plus icon"></i>
+        {% trans %}Add a client{% endtrans %}
+    </a>
+    <a class="item" href="{{ url_for('oidc.tokens.index') }}">
+        <i class="key icon"></i>
+        {% trans %}Tokens{% endtrans %}
+    </a>
+    <a class="item" href="{{ url_for('oidc.authorizations.index') }}">
+        <i class="user secret icon"></i>
+        {% trans %}Codes{% endtrans %}
+    </a>
 {% endblock %}
 
 {% block content %}

diff --git a/canaille/core/templates/profile_add.html b/canaille/core/templates/profile_add.html
@@ -11,22 +11,20 @@
 {% endblock %}
 
 {% block submenu %}
-    <nav class="ui bottom attached {% if has_smtp %}three{% else %}two{% endif %} item borderless menu">
-        <a class="item" href="{{ url_for('core.account.users') }}">
-            <i class="th list icon"></i>
-            {% trans %}View{% endtrans %}
+    <a class="item" href="{{ url_for('core.account.users') }}">
+        <i class="th list icon"></i>
+        {% trans %}View{% endtrans %}
+    </a>
+    <a class="active item" href="{{ url_for('core.account.profile_creation') }}">
+        <i class="plus icon"></i>
+        {% trans %}Add{% endtrans %}
+    </a>
+    {% if has_smtp %}
+        <a class="item" href="{{ url_for('core.account.user_invitation') }}">
+            <i class="paper plane icon"></i>
+            {% trans %}Invite{% endtrans %}
         </a>
-        <a class="active item" href="{{ url_for('core.account.profile_creation') }}">
-            <i class="plus icon"></i>
-            {% trans %}Add{% endtrans %}
-        </a>
-        {% if has_smtp %}
-            <a class="item" href="{{ url_for('core.account.user_invitation') }}">
-                <i class="paper plane icon"></i>
-                {% trans %}Invite{% endtrans %}
-            </a>
-        {% endif %}
-    </nav>
+    {% endif %}
 {% endblock %}
 
 {% block content %}

diff --git a/canaille/core/templates/profile_edit.html b/canaille/core/templates/profile_edit.html
@@ -17,16 +17,14 @@
 {% endblock %}
 
 {% block submenu %}
-    <nav class="ui bottom attached two item borderless menu">
-        <a class="active item" href="{{ url_for('core.account.profile_edition', edited_user=edited_user) }}">
-            <i class="id card icon"></i>
-            {% trans %}Personal information{% endtrans %}
-        </a>
-        <a class="item" href="{{ url_for('core.account.profile_settings', edited_user=edited_user) }}">
-            <i class="tools icon"></i>
-            {% trans %}Account settings{% endtrans %}
-        </a>
-    </nav>
+    <a class="active item" href="{{ url_for('core.account.profile_edition', edited_user=edited_user) }}">
+        <i class="id card icon"></i>
+        {% trans %}Personal information{% endtrans %}
+    </a>
+    <a class="item" href="{{ url_for('core.account.profile_settings', edited_user=edited_user) }}">
+        <i class="tools icon"></i>
+        {% trans %}Account settings{% endtrans %}
+    </a>
 {% endblock %}
 
 {% block content %}

diff --git a/canaille/core/templates/profile_settings.html b/canaille/core/templates/profile_settings.html
@@ -10,16 +10,14 @@
 {%- endblock -%}
 
 {% block submenu %}
-    <nav class="ui bottom attached two item borderless menu">
-        <a class="item" href="{{ url_for('core.account.profile_edition', edited_user=edited_user) }}">
-            <i class="id card icon"></i>
-            {% trans %}Personal information{% endtrans %}
-        </a>
-        <a class="active item" href="{{ url_for('core.account.profile_settings', edited_user=edited_user) }}">
-            <i class="tools icon"></i>
-            {% trans %}Account settings{% endtrans %}
-        </a>
-    </nav>
+    <a class="item" href="{{ url_for('core.account.profile_edition', edited_user=edited_user) }}">
+        <i class="id card icon"></i>
+        {% trans %}Personal information{% endtrans %}
+    </a>
+    <a class="active item" href="{{ url_for('core.account.profile_settings', edited_user=edited_user) }}">
+        <i class="tools icon"></i>
+        {% trans %}Account settings{% endtrans %}
+    </a>
 {% endblock %}
 
 {% macro render_field(field, noindicator=false) %}

diff --git a/canaille/core/templates/users.html b/canaille/core/templates/users.html
@@ -6,22 +6,20 @@
 {%- endblock -%}
 
 {% block submenu %}
-    <nav class="ui bottom attached {% if has_smtp %}three{% else %}two{% endif %} item borderless menu">
-        <a class="active item" href="{{ url_for('core.account.users') }}">
-            <i class="th list icon"></i>
-            {% trans %}View{% endtrans %}
+    <a class="active item" href="{{ url_for('core.account.users') }}">
+        <i class="th list icon"></i>
+        {% trans %}View{% endtrans %}
+    </a>
+    <a class="item" href="{{ url_for('core.account.profile_creation') }}">
+        <i class="plus icon"></i>
+        {% trans %}Add{% endtrans %}
+    </a>
+    {% if has_smtp %}
+        <a class="item" href="{{ url_for('core.account.user_invitation') }}">
+            <i class="paper plane icon"></i>
+            {% trans %}Invite{% endtrans %}
         </a>
-        <a class="item" href="{{ url_for('core.account.profile_creation') }}">
-            <i class="plus icon"></i>
-            {% trans %}Add{% endtrans %}
-        </a>
-        {% if has_smtp %}
-            <a class="item" href="{{ url_for('core.account.user_invitation') }}">
-                <i class="paper plane icon"></i>
-                {% trans %}Invite{% endtrans %}
-            </a>
-        {% endif %}
-    </nav>
+    {% endif %}
 {% endblock %}
 
 {% block content %}

diff --git a/canaille/oidc/templates/authorization_list.html b/canaille/oidc/templates/authorization_list.html
@@ -6,28 +6,26 @@
 {%- endblock -%}
 
 {% block submenu %}
-    <nav class="ui bottom attached five item borderless menu">
-        <a class="item" href="{{ url_for('core.admin.mail_index') }}">
-            <i class="user mail icon"></i>
-            {% trans %}Emails{% endtrans %}
-        </a>
-        <a class="item" href="{{ url_for('oidc.clients.index') }}">
-            <i class="th list icon"></i>
-            {% trans %}Clients{% endtrans %}
-        </a>
-        <a class="item" href="{{ url_for('oidc.clients.add') }}">
-            <i class="plus icon"></i>
-            {% trans %}Add a client{% endtrans %}
-        </a>
-        <a class="item" href="{{ url_for('oidc.tokens.index') }}">
-            <i class="key icon"></i>
-            {% trans %}Tokens{% endtrans %}
-        </a>
-        <a class="active item" href="{{ url_for('oidc.authorizations.index') }}">
-            <i class="user secret icon"></i>
-            {% trans %}Codes{% endtrans %}
-        </a>
-    </nav>
+    <a class="item" href="{{ url_for('core.admin.mail_index') }}">
+        <i class="user mail icon"></i>
+        {% trans %}Emails{% endtrans %}
+    </a>
+    <a class="item" href="{{ url_for('oidc.clients.index') }}">
+        <i class="th list icon"></i>
+        {% trans %}Clients{% endtrans %}
+    </a>
+    <a class="item" href="{{ url_for('oidc.clients.add') }}">
+        <i class="plus icon"></i>
+        {% trans %}Add a client{% endtrans %}
+    </a>
+    <a class="item" href="{{ url_for('oidc.tokens.index') }}">
+        <i class="key icon"></i>
+        {% trans %}Tokens{% endtrans %}
+    </a>
+    <a class="active item" href="{{ url_for('oidc.authorizations.index') }}">
+        <i class="user secret icon"></i>
+        {% trans %}Codes{% endtrans %}
+    </a>
 {% endblock %}
 
 {% block content %}

diff --git a/canaille/oidc/templates/authorization_view.html b/canaille/oidc/templates/authorization_view.html
@@ -5,28 +5,26 @@
 {%- endblock -%}
 
 {% block submenu %}
-    <nav class="ui bottom attached five item borderless menu">
-        <a class="item" href="{{ url_for('core.admin.mail_index') }}">
-            <i class="user mail icon"></i>
-            {% trans %}Emails{% endtrans %}
-        </a>
-        <a class="item" href="{{ url_for('oidc.clients.index') }}">
-            <i class="th list icon"></i>
-            {% trans %}Clients{% endtrans %}
-        </a>
-        <a class="item" href="{{ url_for('oidc.clients.add') }}">
-            <i class="plus icon"></i>
-            {% trans %}Add a client{% endtrans %}
-        </a>
-        <a class="item" href="{{ url_for('oidc.tokens.index') }}">
-            <i class="key icon"></i>
-            {% trans %}Tokens{% endtrans %}
-        </a>
-        <a class="active item" href="{{ url_for('oidc.authorizations.index') }}">
-            <i class="user secret icon"></i>
-            {% trans %}Codes{% endtrans %}
-        </a>
-    </nav>
+    <a class="item" href="{{ url_for('core.admin.mail_index') }}">
+        <i class="user mail icon"></i>
+        {% trans %}Emails{% endtrans %}
+    </a>
+    <a class="item" href="{{ url_for('oidc.clients.index') }}">
+        <i class="th list icon"></i>
+        {% trans %}Clients{% endtrans %}
+    </a>
+    <a class="item" href="{{ url_for('oidc.clients.add') }}">
+        <i class="plus icon"></i>
+        {% trans %}Add a client{% endtrans %}
+    </a>
+    <a class="item" href="{{ url_for('oidc.tokens.index') }}">
+        <i class="key icon"></i>
+        {% trans %}Tokens{% endtrans %}
+    </a>
+    <a class="active item" href="{{ url_for('oidc.authorizations.index') }}">
+        <i class="user secret icon"></i>
+        {% trans %}Codes{% endtrans %}
+    </a>
 {% endblock %}
 
 {% block content %}