Commit 24cdb5f5 authored by david's avatar david
Browse files

Fix formatting and times for next timeslot. #11

parent 56f4fec7
...@@ -208,8 +208,8 @@ ...@@ -208,8 +208,8 @@
return name; return name;
} }
/* Display the timeslot of a show */ /* Display the start end end time of a show */
function displayShowTimeslot(timeslot) { function displayShowTimes(timeslot) {
let str = ""; let str = "";
if (timeslot != null && timeslot.timeslot_start != null && timeslot.show_name != "") { if (timeslot != null && timeslot.timeslot_start != null && timeslot.show_name != "") {
...@@ -361,7 +361,7 @@ ...@@ -361,7 +361,7 @@
background-color:rgb(24, 24, 24); background-color:rgb(24, 24, 24);
margin-right: 20px; margin-right: 20px;
padding: 12px; padding: 12px;
text-align: center; /* text-align: center; */
} }
#current-timeslot .timeslot-title { #current-timeslot .timeslot-title {
...@@ -380,6 +380,7 @@ ...@@ -380,6 +380,7 @@
#next-timeslot .timeslot-title { #next-timeslot .timeslot-title {
color: gray !important; color: gray !important;
font-size: 2em; font-size: 2em;
padding-left: 50px;
} }
#playlist { #playlist {
...@@ -613,7 +614,7 @@ ...@@ -613,7 +614,7 @@
<div style="width: 70%; float: left; text-align: left"> <div style="width: 70%; float: left; text-align: left">
<h1> <h1>
{#if hasValidTimeslot(value)} {#if hasValidTimeslot(value)}
{@html displayShowName(value.current_timeslot, nocurrenttimeslot)} {displayShowTimeslot(value.current_timeslot)} {@html displayShowName(value.current_timeslot, nocurrenttimeslot)} {displayShowTimes(value.current_timeslot)}
{:else} {:else}
<span class="red">{nocurrenttimeslot}</span> <span class="red">{nocurrenttimeslot}</span>
{/if} {/if}
...@@ -693,13 +694,12 @@ ...@@ -693,13 +694,12 @@
</div> </div>
{#if value.next_timeslot} {#if value.next_timeslot}
<div id="next-timeslot"> <div id="next-timeslot">
<h3 class="timeslot-title">{@html displayShowName(value.next_timeslot, nonexttimeslot)} {displayShowTimeslot(value)}</h3> <h3 class="timeslot-title">{@html displayShowName(value.next_timeslot, nonexttimeslot)} {displayShowTimes(value.next_timeslot)}</h3>
</div> </div>
{/if} {/if}
{:catch error} {:catch error}
<div class="error"><p>{error}</p></div> <div class="error"><p>{error}</p></div>
{/await} {/await}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment