From 98147d7ec0c0b81b703ad9629fc7a5181a4a77d0 Mon Sep 17 00:00:00 2001 From: Silvio Heinze Date: Tue, 14 Jan 2025 00:53:15 +0100 Subject: [PATCH] reformat button without grouping --- app/templates/campaigns/detail.html | 42 +++++++++----- app/templates/campaigns/my.html | 22 ++++--- app/templates/organizations/detail.html | 2 +- app/templates/organizations/my.html | 77 +++++++++++++------------ app/templates/workshops/form.html | 2 +- app/templates/workshops/my.html | 24 ++++---- 6 files changed, 94 insertions(+), 75 deletions(-) diff --git a/app/templates/campaigns/detail.html b/app/templates/campaigns/detail.html index 5f687a9..fe031d7 100644 --- a/app/templates/campaigns/detail.html +++ b/app/templates/campaigns/detail.html @@ -45,15 +45,21 @@

{% trans "Rooms" %}

CO₂ 584ppm TVOC 18ppb - -
- - {% trans "Details" %} - - {% trans "Edit" %} - - {% trans "Delete" %} -
+ +
+ + + {% trans "Details" %} + + + + {% trans "Edit" %} + + + + {% trans "Delete" %} + +
{% empty %} @@ -87,13 +93,17 @@

{% trans "Participants" %}

{{ user.username }} {{ user.email }} - -
- - {% trans "Details" %} - - {% trans "Remove" %} -
+ +
+ + + {% trans "Details" %} + + + + {% trans "Remove" %} + +
{% empty %} diff --git a/app/templates/campaigns/my.html b/app/templates/campaigns/my.html index 46e60b0..217177b 100644 --- a/app/templates/campaigns/my.html +++ b/app/templates/campaigns/my.html @@ -28,15 +28,19 @@
{% trans "Public:" %} {{ campaign.public|yesno:"Ja,Nein" }}

-
-
- - {% trans "Details" %} - - {% trans "Edit" %} - - {% trans "Delete" %} -
+
+ + + {% trans "Details" %} + + + + {% trans "Edit" %} + + + + {% trans "Delete" %} +
{% endfor %} diff --git a/app/templates/organizations/detail.html b/app/templates/organizations/detail.html index 50bbe84..8ff181c 100644 --- a/app/templates/organizations/detail.html +++ b/app/templates/organizations/detail.html @@ -90,7 +90,7 @@

{% trans "Invite a User" %}

{% endif %} -
+
{% trans "Back to Organizations" %} diff --git a/app/templates/organizations/my.html b/app/templates/organizations/my.html index 6a9180c..3c75eaa 100644 --- a/app/templates/organizations/my.html +++ b/app/templates/organizations/my.html @@ -8,45 +8,46 @@ {% endblock styles %} {% block content %} -
-

{% trans "My Organisations" %}

- {% trans "Create Organization" %} -
-{% if member_organizations %} -
- {% for organization in organizations %} -
-
-
- {{ organization.name }} - {% if organization in owner_organizations %} - {% trans "Owner" %} - {% elif organization in member_organizations %} - {% trans "Member" %} - {% else %} - {% trans "Other" %} - {% endif %} -
-

- {{ organization.description|truncatewords:20 }} -

-
-
-
+
+

{% trans "My Organisations" %}

+ {% trans "Create Organization" %} +
+ {% if member_organizations %} +
+ {% for organization in organizations %} +
+
+
+ {{ organization.name }} + {% if organization in owner_organizations %} + {% trans "Owner" %} + {% elif organization in member_organizations %} + {% trans "Member" %} + {% else %} + {% trans "Other" %} + {% endif %} +
+

+ {{ organization.description|truncatewords:20 }} +

+
+
- {% trans "Details" %} - - {% trans "Edit" %} - - {% trans "Delete" %} + {% trans "Details" %} + + + {% trans "Edit" %} + + + {% trans "Delete" %} +
-
- {% endfor %} -
-{% else %} - -{% endif %} + {% endfor %} +
+ {% else %} + + {% endif %} {% endblock content %} diff --git a/app/templates/workshops/form.html b/app/templates/workshops/form.html index bf5e99e..0ee041d 100644 --- a/app/templates/workshops/form.html +++ b/app/templates/workshops/form.html @@ -7,7 +7,7 @@ {% endblock styles %} {% block content %} -

{% trans "Workshop" %}

+

{% trans "Workshop" %}

{% csrf_token %} {{ form|crispy }} diff --git a/app/templates/workshops/my.html b/app/templates/workshops/my.html index 8d56be0..2a4c539 100644 --- a/app/templates/workshops/my.html +++ b/app/templates/workshops/my.html @@ -6,7 +6,7 @@ {% block content %}

{% trans "My Workshops" %}

- {% trans "Create workshop" %} + {% trans "Create workshop" %}
{% if workshops %}
@@ -19,15 +19,19 @@
{{ workshop.t {% trans "Public:" %} {{ workshop.public|yesno:"Ja,Nein" }}

- {% endfor %}