register: more work on ui/ux

1 files changed, 33 insertions, 25 deletions

diff --git a/view/tpl/regate_pre.tpl b/view/tpl/regate_pre.tpl
index adc63b181..7596f6846 100644
--- a/view/tpl/regate_pre.tpl
+++ b/view/tpl/regate_pre.tpl
@@ -1,41 +1,49 @@
-<h2>{{$title}}</h2>
-
-{{$delay_desc.0}}
-<div id="countdown" class="h3"></div>
-
-{{$desc.0}}<br>
-<br>
-{{$desc.1}}<br>
-{{$id}}<br>
-<br>
-{{$desc.2}}<br>
-{{$pin}}<br>
-<br>
-<div class="">
-	{{$delay_desc.1}}<br>
-	<span id="register_start" data-utc="{{$regdelay}}" class="register_date">
-		{{$regdelay}}
-	</span>
-	&nbsp;&dash;&nbsp; 
-	<span data-utc="{{$regexpire}}" class="register_date">
-		{{$regexpire}}
-	</span>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		{{if $now}}
+		<div class="section-content-danger-wrapper">
+			<div class="h3">{{$now}}</div>
+		</div>
+		{{else}}
+		<div class="section-content-warning-wrapper">
+			{{$strings.0}}
+			<div id="countdown" class="h3"></div>
+		</div>
+		<div class="section-content-info-wrapper">
+			{{$strings.1}} {{$id}}
+			<div class="h3">{{$pin}}</div>
+		</div>
+		<div class="d-none">
+			{{$strings.2}}<br>
+			<span id="register_start" data-utc="{{$regdelay}}" class="register_date">
+				{{$regdelay}}
+			</span>
+			&nbsp;&dash;&nbsp; 
+			<span data-utc="{{$regexpire}}" class="register_date">
+				{{$regexpire}}
+			</span>
+		</div>
+		{{/if}}
+	</div>
 </div>
+
 <script>
 	$('.register_date').each( function () {
 		var date = new Date($(this).data('utc'));
-		$(this).html(date.toLocaleString());
+		$(this).html(date.toLocaleString(undefined, {weekday: 'short', hour: 'numeric', minute: 'numeric'}));
 	});
 
-
 	var date = '{{$countdown}}';
-
 	date = date !== '' ? date : $('#register_start').data('utc');
 
 	if(date) {
 		doCountDown(date, 'countdown');
 		var x = setInterval(doCountDown, 1000, date, 'countdown');
 	}
+
 	function doCountDown(date, id) {
 		var countDownDate = new Date(date).getTime();
 		var now = new Date().getTime();