From f0e5ce7fd1dae13cc257a8a860fccbc294530776 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Sat, 10 Apr 2021 20:44:04 +0000
Subject: register: more work on ui/ux

---
 include/account.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'include/account.php')

diff --git a/include/account.php b/include/account.php
index f7e2c7e32..939a4344e 100644
--- a/include/account.php
+++ b/include/account.php
@@ -1241,20 +1241,20 @@ function zar_register_dutystate( $now=NULL, $day=NULL ) {
 	$atform = $isduty ? '' : 'disabled';
 	$utc_now = datetime_convert(date_default_timezone_get(), 'UTC', $now, 'c');
 
-	$nowfmt	= t('Registration is currently')
-			. ' (<span data-utc="' . $utc_now . '" class="register_date">' . $utc_now . '</span>) '
-			. $dutyis . '.<br>';
-
+	$nowfmt = '';
 
 	if (!$isduty) {
+		$nowfmt	 = t('Registration is currently');
+		$nowfmt .= ' (<span data-utc="' . $utc_now . '" class="register_date">' . $utc_now . '</span>) ';
+		$nowfmt .= $dutyis . ',<br>';
+
 		$pernext = zarIsDuty($day, $now, 'nextOpen');
 		$week_days = ['','monday','tuesday','wednesday','thursday','friday','saturday','sunday'];
 		$utc_next_open = datetime_convert(date_default_timezone_get(), 'UTC', $week_days[$pernext[0]] . ' ' . $pernext[1], 'c');
 
 		if (is_array($pernext)) {
-			$nowfmt .= t('Next opens') . ' '
-			. '<span data-utc="' . $utc_next_open . '" class="register_date">' . $utc_next_open . '</span>.';
-
+			$nowfmt .= t('please come back');
+			$nowfmt .= ' <span data-utc="' . $utc_next_open . '" class="register_date">' . $utc_next_open . '</span>.';
 		}
 	}
 	return array( 'isduty' => $isduty, 'nowfmt' => $nowfmt, 'atform' => $atform);
-- 
cgit v1.2.3