From fb126c69289abf7174f53b0d04f56f195e0fbd12 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Fri, 6 Dec 2019 21:42:26 +0100
Subject: optionally show journey comment in public user status

Closes #19
---
 templates/_checked_in.html.ep         |  2 +-
 templates/_public_status_card.html.ep |  3 +++
 templates/account.html.ep             |  3 +++
 templates/privacy.html.ep             | 16 ++++++++++++++++
 templates/user_status.html.ep         |  2 +-
 5 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep
index 5631e12..f915769 100644
--- a/templates/_checked_in.html.ep
+++ b/templates/_checked_in.html.ep
@@ -4,7 +4,7 @@
 			<i class="material-icons small right sync-failed-marker grey-text" style="display: none;">sync_problem</i>
 			<span class="card-title">Eingecheckt in <%= $journey->{train_type} %> <%= $journey->{train_no} %></span>
 			% if ($journey->{comment}) {
-				<p><%= $journey->{comment} %>.</p>
+				<p><%= $journey->{comment} %></p>
 			% }
 			<p>
 				<div class="center-align countdown"
diff --git a/templates/_public_status_card.html.ep b/templates/_public_status_card.html.ep
index 0bed878..4a846af 100644
--- a/templates/_public_status_card.html.ep
+++ b/templates/_public_status_card.html.ep
@@ -3,6 +3,9 @@
 		<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"><%= $name %> ist unterwegs</span>
+			% if ($public_level & 0x04 and $journey->{comment}) {
+				<p>„<%= $journey->{comment} %>“</p>
+			% }
 			<p>
 				% if ($journey->{train_line}) {
 					<div class="center-align"><b><%= $journey->{train_type} %> <%= $journey->{train_line} %></b> <%= $journey->{train_no} %></div>
diff --git a/templates/account.html.ep b/templates/account.html.ep
index 627be85..7ad48b5 100644
--- a/templates/account.html.ep
+++ b/templates/account.html.ep
@@ -69,6 +69,9 @@
 					% if ($acc->{is_public} & 0x02) {
 						Aktueller Status
 					% }
+					% if (($acc->{is_public} & 0x06) == 0x06) {
+						mit Kommentar
+					% }
 				</td>
 			</tr>
 			<tr>
diff --git a/templates/privacy.html.ep b/templates/privacy.html.ep
index 4469154..b16ee44 100644
--- a/templates/privacy.html.ep
+++ b/templates/privacy.html.ep
@@ -27,6 +27,22 @@
 			Wann die letzte Reise beendet wurde, wird bewusst nicht angegeben.
 		</div>
 	</div>
+	<div class="row">
+		<div class="input-field col s12">
+			<label>
+				%= check_box public_comment => 1
+				<span>Checkin-Kommentar</span>
+			</label>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col s12">
+			Wenn aktiv, wird in deinem aktuellen Status auch der optionale
+			Freitext-Kommentar der Zugfahrt gezeigt. Wenn du gerade nicht
+			eingecheckt bist oder dein aktueller Status nicht öffentlich ist,
+			hat dieses Feld keine Auswirkungen.
+		</div>
+	</div>
 	<div class="row">
 		<div class="col s3 m3 l3">
 		</div>
diff --git a/templates/user_status.html.ep b/templates/user_status.html.ep
index 2a6be03..78ef547 100644
--- a/templates/user_status.html.ep
+++ b/templates/user_status.html.ep
@@ -1,5 +1,5 @@
 <div class="row">
 	<div class="col s12 publicstatuscol" data-user="<%= $name %>">
-		%= include '_public_status_card', name => $name, journey => $journey
+		%= include '_public_status_card', name => $name, public_level => $public_level, journey => $journey
 	</div>
 </div>
-- 
cgit v1.2.3