Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
AURA
dashboard-clock
Commits
24cdb5f5
Commit
24cdb5f5
authored
Nov 25, 2020
by
david
Browse files
Fix formatting and times for next timeslot.
#11
parent
56f4fec7
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/StudioClock.svelte
View file @
24cdb5f5
...
@@ -208,8 +208,8 @@
...
@@ -208,8 +208,8 @@
return
name
;
return
name
;
}
}
/* Display the time
slot
of a show */
/* Display the
start end end
time of a show */
function
displayShowTimes
lot
(
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)} {displayShowTimes
lot
(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)} {displayShowTimes
lot
(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}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment