Skip to content

refactor: monitor-display.css & monitor-display-schedule.tpl #610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnVillalovos merged 1 commit into from
Jun 19, 2025
Merged

refactor: monitor-display.css & monitor-display-schedule.tpl #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 21 additions & 19 deletions tpl/MonitorDisplay/monitor-display-schedule.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,27 @@
{else}
{assign var=TodaysDate value=Date::Now()}
{foreach from=$BoundDates item=date}
<div class="monitor-display-date">{formatdate date=$date}</div>
{foreach from=$Resources item=resource name=resource_loop}
{if $resource->HasColor()}{assign var=style value="color:{$resource->GetTextColor()}
!important;background-color:{$resource->GetColor()} !important;"}{/if}
<div class="monitor-display-resource-name">{$resource->Name}</div>
{assign var=slots value=$DailyLayout->GetLayout($date, $resource->Id)}
{foreach from=$slots item=slot}
{if $slot->IsReserved()}
<div class="reserved" style="{$style}">
{formatdate date=$slot->BeginDate() key=period_time} -
{assign var=slotformat value=period_time}
{if !$slot->BeginDate()->DateEquals($slot->EndDate())}
{assign var=slotformat value=short_reservation_date}
{/if}
{formatdate date=$slot->EndDate() key=$slotformat}
{$slot->Label($SlotLabelFactory)|escapequotes}
</div>
{/if}
<div class="alert alert-light">
<div class="monitor-display-date fw-bold fs-5">{formatdate date=$date}</div>
{foreach from=$Resources item=resource name=resource_loop}
{if $resource->HasColor()}{assign var=style value="color:{$resource->GetTextColor()}!important;background-color:{$resource->GetColor()}
!important;"}{/if}
<div class="monitor-display-resource-name fw-bold fs-6">{$resource->Name}</div>
{assign var=slots value=$DailyLayout->GetLayout($date, $resource->Id)}
{foreach from=$slots item=slot}
{if $slot->IsReserved()}
<div class="reserved rounded-1 p-1 mb-1" style="{$style}">
{formatdate date=$slot->BeginDate() key=period_time} -
{assign var=slotformat value=period_time}
{if !$slot->BeginDate()->DateEquals($slot->EndDate())}
{assign var=slotformat value=short_reservation_date}
{/if}
{formatdate date=$slot->EndDate() key=$slotformat}
{$slot->Label($SlotLabelFactory)|escapequotes}
</div>
{/if}
{/foreach}
{/foreach}
{/foreach}
</div>
{/foreach}
{/if}
2 changes: 1 addition & 1 deletion tpl/MonitorDisplay/monitor-display.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{include file='globalheader.tpl' HideNavBar=true cssFiles='css/schedule.css, css/monitor-display.css'}
{include file='globalheader.tpl' HideNavBar=true cssFiles='css/schedule.css'}

<div id="page-monitor-display">
{if $Enabled}
Expand Down