From 8bc32dd034810a209220567813f4277f45b2b8d7 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Fri, 15 Jul 2022 21:00:38 +0200
Subject: [PATCH] show infobox in destination list
---
sass/src/common/index.scss | 12 ++++++++++++
templates/_checked_in.html.ep | 17 +++++++++++++++--
templates/account.html.ep | 4 ++--
3 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/sass/src/common/index.scss b/sass/src/common/index.scss
index 97d8dd52..6f8282f5 100644
--- a/sass/src/common/index.scss
+++ b/sass/src/common/index.scss
@@ -22,6 +22,18 @@ a.unmarked {
color: $off-black;
}
+div.targetlist {
+ display: grid;
+ grid-template-columns: 1fr max-content;
+ align-items: center;
+ > a.nonflex {
+ padding-left: 1em;
+ padding-top: 1em;
+ padding-bottom: 1em;
+ display: inline-block;
+ }
+}
+
a.tablerow {
display: flex;
justify-content: space-between;
diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep
index 442dec4a..dd000260 100644
--- a/templates/_checked_in.html.ep
+++ b/templates/_checked_in.html.ep
@@ -310,7 +310,12 @@
<div class="card-content">
<i class="material-icons small right sync-failed-marker grey-text" style="display: none;">sync_problem</i>
<span class="card-title">Ziel ändern?</span>
- <p>
+ % if ($user->{sb_template}) {
+ <div class="targetlist">
+ % }
+ % else {
+ <p>
+ % }
% for my $station (@{$journey->{route_after}}) {
% my $is_dest = ($journey->{arr_name} and $station->[0] eq $journey->{arr_name});
<a class="action-checkout tablerow" style="<%= $is_dest? 'font-weight: bold;' : '' %>" data-station="<%= $station->[0] %>">
@@ -325,8 +330,16 @@
<span>Zusatzhalt</span>
% }
</a>
+ % if ($user->{sb_template}) {
+ <a class="nonflex" href="<%= resolve_sb_template($user->{sb_template}, name => $station->[0], eva => $station->[1]{eva}) %>"><i class="material-icons tiny">info</i></a>
+ % }
+ % }
+ % if ($user->{sb_template}) {
+ </div>
+ % }
+ % else {
+ </p>
% }
- </p>
<p>
Falls das Backend ausgefallen ist oder der Zug aus anderen
Gründen verloren ging: <a class="action-checkout"
diff --git a/templates/account.html.ep b/templates/account.html.ep
index 27b82a0d..7658237e 100644
--- a/templates/account.html.ep
+++ b/templates/account.html.ep
@@ -147,7 +147,7 @@
% }
</td>
</tr>
- <!-- <tr>
+ <tr>
<th scope="row">Externe Dienste</th>
<td>
<a href="/account/services"><i class="material-icons">edit</i></a>
@@ -158,7 +158,7 @@
<span style="color: #999999;">Keine</span>
% }
</td>
- </tr> -->
+ </tr>
<tr>
<th scope="row">Registriert am</th>
<td><%= $acc->{registered_at}->strftime('%d.%m.%Y %H:%M') %></td>
--
GitLab