From 135b727fec9ed1ebba48b839106ee65c94b739df Mon Sep 17 00:00:00 2001
From: weeman <weeman@frankfurt.ccc.de>
Date: Thu, 19 Dec 2024 18:49:01 +0100
Subject: [PATCH] =?UTF-8?q?=C3=9Cberarbeite=20Buttons?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../plainui/components/function_btns.html.j2 | 14 +++++-----
.../components/list_assemblies.html.j2 | 2 +-
.../plainui/components/list_events.html.j2 | 3 ++-
.../plainui/components/list_projects.html.j2 | 2 +-
.../plainui/components/list_rooms.html.j2 | 4 +--
src/plainui/jinja2/plainui/event.html.j2 | 26 +++++++++++--------
.../jinja2/plainui/projects/detail.html.j2 | 8 +++---
src/plainui/jinja2/plainui/user.html.j2 | 12 ++++++---
8 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/src/plainui/jinja2/plainui/components/function_btns.html.j2 b/src/plainui/jinja2/plainui/components/function_btns.html.j2
index 5dcac57a5..1ad5cd85b 100644
--- a/src/plainui/jinja2/plainui/components/function_btns.html.j2
+++ b/src/plainui/jinja2/plainui/components/function_btns.html.j2
@@ -5,7 +5,7 @@
csrf_input
#}
-{% macro fav(fav_id, fav_type, fav_is, color="transparent", next=request.get_full_path() ) -%}
+{% macro fav(fav_id, fav_type, fav_is, color="transparent", next=request.get_full_path(), margin=True) -%}
{% if not archive_mode %}
<form action="{{ url('plainui:modify_favorites') }}"
class="d-inline-block"
@@ -20,7 +20,7 @@
<input type="hidden" name="mode" value="remove">
<button type="submit"
id="fav_{{ fav_id }}"
- class="active me-2 btn-icon-big btn btn-{{ color }}"
+ class="active btn-icon-big btn btn-{{ color }} {% if margin %}me-2{% endif %}"
title="{{ _('remove from favorites') }}">
<svg xmlns="http://www.w3.org/2000/svg"
width="16"
@@ -35,7 +35,7 @@
<input type="hidden" name="mode" value="add">
<button type="submit"
id="fav_{{ fav_id }}"
- class="me-2 btn-icon-big btn btn-{{ color }}"
+ class="btn-icon-big btn btn-{{ color }} {% if margin %}me-2{% endif %}"
title="{{ _('add to favorites') }}">
<svg xmlns="http://www.w3.org/2000/svg"
width="16"
@@ -129,10 +129,10 @@
</a>
{%- endmacro %}
#
-{% macro report(report_url=none, kind=none, next=none, lookup_key=none, title=_("report this url"), color="transparent" ) -%}
+{% macro report(report_url=none, kind=none, next=none, lookup_key=none, title=_("report this url"), color="transparent", margin=True) -%}
{% if not archive_mode %}
<a href="{{ build_report_url(request, reported_url=report_url, kind=kind, next_url=next, lookup_key=lookup_key) }}"
- class="me-2 btn-icon-big btn btn-{{ color }}"
+ class="btn-icon-big btn btn-{{ color }} {% if margin %}me-2{% endif %}"
title="{{ title }}">
<svg width="1.25rem"
height="1.25rem"
@@ -150,10 +150,10 @@
{% endif %}
{%- endmacro %}
-{% macro edit(edit, title=_("edit this"), color="transparent" ) -%}
+{% macro edit(edit, title=_("edit this"), color="transparent", margin=True) -%}
{% if not archive_mode %}
<a href="{{ edit }}"
- class="me-2 btn-icon-big btn btn-{{ color }}"
+ class="btn-icon-big btn btn-{{ color }} {% if margin %}me-2{% endif %}"
title="{{ title }}">
<svg xmlns="http://www.w3.org/2000/svg"
width="16"
diff --git a/src/plainui/jinja2/plainui/components/list_assemblies.html.j2 b/src/plainui/jinja2/plainui/components/list_assemblies.html.j2
index 61ead37e8..d169fd379 100644
--- a/src/plainui/jinja2/plainui/components/list_assemblies.html.j2
+++ b/src/plainui/jinja2/plainui/components/list_assemblies.html.j2
@@ -38,8 +38,8 @@
<div>{{ assembly.name }}</div>
</a>
<div class="hub-grid-buttons">
- {{ fbtns.share('plainui:assembly', assembly_slug=assembly.slug, color=color,) }}
{{ fbtns.fav(assembly.id, "assembly", faved, color=color) }}
+ {{ fbtns.share('plainui:assembly', assembly_slug=assembly.slug, color=color,) }}
{{ fbtns.report(link, lookup_key=assembly.slug, color=color) }}
</div>
{% if assembly.public_events_count or assembly.public_projects_count or assembly.tags__count %}
diff --git a/src/plainui/jinja2/plainui/components/list_events.html.j2 b/src/plainui/jinja2/plainui/components/list_events.html.j2
index 9c3e17808..29ce7a65d 100644
--- a/src/plainui/jinja2/plainui/components/list_events.html.j2
+++ b/src/plainui/jinja2/plainui/components/list_events.html.j2
@@ -114,9 +114,10 @@
{{ icon_public(event.is_public) }}
{{ fbtns.edit(hub_absolute('backoffice:sos-edit', pk=event.id) , color=button_color) }}
{% endif %}
+
{% if not hide_buttons %}
- {{ fbtns.share('plainui:event', event_slug=event.slug, color=button_color) }}
{{ fbtns.fav(event.id, "event", faved, color=button_color) }}
+ {{ fbtns.share('plainui:event', event_slug=event.slug, color=button_color) }}
{{ fbtns.report(link, color=button_color) }}
{% endif %}
</div>
diff --git a/src/plainui/jinja2/plainui/components/list_projects.html.j2 b/src/plainui/jinja2/plainui/components/list_projects.html.j2
index 17a9eabb8..9c2dfa7d2 100644
--- a/src/plainui/jinja2/plainui/components/list_projects.html.j2
+++ b/src/plainui/jinja2/plainui/components/list_projects.html.j2
@@ -44,8 +44,8 @@
title="{{ project.name }}"
class="hub-text-list-item-title hub-grid-title">{{ project.name }}</a>
<div class="hub-grid-buttons">
- {{ fbtns.share('plainui:project', color=color, slug=project.slug) }}
{{ fbtns.fav(project.id, "project", favorite, color=color) }}
+ {{ fbtns.share('plainui:project', color=color, slug=project.slug) }}
{{ fbtns.report(link, lookup_key=project.slug, color=color) }}
</div>
{% if metadata and (project.assembly or project.tags) %}
diff --git a/src/plainui/jinja2/plainui/components/list_rooms.html.j2 b/src/plainui/jinja2/plainui/components/list_rooms.html.j2
index 11f12e5ab..132b85121 100644
--- a/src/plainui/jinja2/plainui/components/list_rooms.html.j2
+++ b/src/plainui/jinja2/plainui/components/list_rooms.html.j2
@@ -29,8 +29,8 @@
</div>
<div class="hub-grid-buttons">
{% if room.capacity and room.capacity != None and room.capacity > 0 %}
- <span class="btn-icon-big btn-transparent">{{ icon("capacity") }}</span>
- <span class="me-5" title="{{ _('capacity') }}">
+ <span class="btn-icon-big btn-transparent me-2">{{ icon("capacity") }}</span>
+ <span class="me-3" title="{{ _('capacity') }}">
{%- if room.occupants and room.occupants != None -%}
{{ room.occupants ~ ' / ' }}
{%- endif -%}
diff --git a/src/plainui/jinja2/plainui/event.html.j2 b/src/plainui/jinja2/plainui/event.html.j2
index 2c2724635..db1764aef 100644
--- a/src/plainui/jinja2/plainui/event.html.j2
+++ b/src/plainui/jinja2/plainui/event.html.j2
@@ -129,24 +129,28 @@
{% if event.abstract %}<div class="hub-text">{{ event.abstract }}</div>{% endif %}
</div>
- <div>
- {%- if not event.is_sos and can_manage -%}
- {{ fbtns.edit(hub_absolute('backoffice:assembly-event', assembly=assembly.id, pk=event.id) , color="secondary") }}
- {%- elif event.is_sos and can_manage -%}
- {{ fbtns.edit(hub_absolute('backoffice:sos-edit', pk=event.id) , color="secondary") }}
- {% endif %}
- {{ fbtns.fav(event.id, "event", is_favorite, color="secondary") }}
- {{ fbtns.report(lookup_key=event.slug, color="primary") }}
+ <div class="hub-hlayout">
+ {{ fbtns.fav(event.id, "event", is_favorite, color="secondary", margin=False) }}
+
{% if event.additional_data.get('feedback_url') and running_state == "complete" %}
<a href=" {{ event.additional_data.get("feedback_url") }}"
- class="btn btn-primary"
- target="_blank">
- title="{{ _('Click here to let us know how you liked this event') }}"
+ class="btn btn-secondary"
+ target="_blank"
+ title="{{ _('Click here to let us know how you liked this event') }}">
<i class="bi bi-hand-thumbs-up"></i>
<i class="bi bi-hand-thumbs-down"></i>
{{ _("Rate event") }}
</a>
{% endif %}
+
+ {%- if not event.is_sos and can_manage -%}
+ {{ fbtns.edit(hub_absolute('backoffice:assembly-event', assembly=assembly.id, pk=event.id) ,
+ color="secondary", margin=False) }}
+ {%- elif event.is_sos and can_manage -%}
+ {{ fbtns.edit(hub_absolute('backoffice:sos-edit', pk=event.id) , color="secondary", margin=False) }}
+ {% endif %}
+
+ {{ fbtns.report(lookup_key=event.slug, color="warning") }}
</div>
</div>
</div>
diff --git a/src/plainui/jinja2/plainui/projects/detail.html.j2 b/src/plainui/jinja2/plainui/projects/detail.html.j2
index dc5f2e6dc..541805773 100644
--- a/src/plainui/jinja2/plainui/projects/detail.html.j2
+++ b/src/plainui/jinja2/plainui/projects/detail.html.j2
@@ -79,10 +79,10 @@
{% endfor %}
</div>
{% endif %}
- <div>
- {% set link = url('plainui:project', slug=project.slug ) %}
- {{ fbtns.fav(project.id, "project", is_favorite, color="primary") }}
- {{ fbtns.report(link, color="primary") }}
+ <div class="hub-hlayout">
+ {% set link = url('plainui:project', slug=project.slug) %}
+ {{ fbtns.fav(project.id, "project", is_favorite, color="secondary", margin=False) }}
+ {{ fbtns.report(link, color="warning", margin=False) }}
</div>
</div>
</div>
diff --git a/src/plainui/jinja2/plainui/user.html.j2 b/src/plainui/jinja2/plainui/user.html.j2
index e9119a7bb..6f8f97ea3 100644
--- a/src/plainui/jinja2/plainui/user.html.j2
+++ b/src/plainui/jinja2/plainui/user.html.j2
@@ -21,17 +21,23 @@
<div class="hub-col-remaining hub-card hub-vlayout">
<h1 class="hub-head-main">{{ display_user.get_display_name() }}</h1>
{% if display_user.pronouns %}<div>{{ tagMacros.secondary(display_user.pronouns) }}</div>{% endif %}
+
{% if description_html %}
<div class="hub-text">{{ markdownMacro.markdown_plain(markdown=description_html | safe, border=false) }}</div>
{% endif %}
+
<div class="hub-hlayout">
{% if display_user != user and display_user.user_type != 'speaker' %}
<a href="{{ url('plainui:personal_message_send_to', recipient=display_user.username) }}"
- class="hub-btn">{{ _("Send PN") }}</a>
- {{ fbtns.report(link, lookup_key=display_user.username, color='outline-secondary') }}
+ class="btn btn-secondary">
+ <i class="bi bi-envelope"></i>
+ {{ _("Send PN") }}
+ </a>
+ {{ fbtns.report(link, lookup_key=display_user.username, color='warning', margin=False) }}
{% endif %}
+
{% if display_user == user %}
- <a href="{{ url('plainui:userprofile') }}" class="hub-btn">{{ _("Edit your profile") }}</a>
+ <a href="{{ url('plainui:userprofile') }}" class="btn btn-secondary">{{ _("Edit your profile") }}</a>
{% endif %}
</div>
</div>
--
GitLab