From 49038d7b87cac8ebb3ebabd0a71af56d8cac1053 Mon Sep 17 00:00:00 2001 From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com> Date: Wed, 18 Jun 2025 21:12:28 -0700 Subject: [PATCH] refactor: monitor-display.css & monitor-display-schedule.tpl disable monitor-display.css & restyle monitor-display-schedule.tpl using Bootstrap 5 Prevented monitor-display.css from loading to reduce style conflicts and improve maintainability. Replaced custom styles in tpl\MonitorDisplay\monitor-display-schedule.tpl with Bootstrap 5 classes, resulting in a cleaner layout and better UI consistency with the rest of the application. --- .../monitor-display-schedule.tpl | 40 ++++++++++--------- tpl/MonitorDisplay/monitor-display.tpl | 2 +- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/tpl/MonitorDisplay/monitor-display-schedule.tpl b/tpl/MonitorDisplay/monitor-display-schedule.tpl index ee7f99312..67b264a8c 100644 --- a/tpl/MonitorDisplay/monitor-display-schedule.tpl +++ b/tpl/MonitorDisplay/monitor-display-schedule.tpl @@ -56,25 +56,27 @@ {else} {assign var=TodaysDate value=Date::Now()} {foreach from=$BoundDates item=date} -
{formatdate date=$date}
- {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} -
{$resource->Name}
- {assign var=slots value=$DailyLayout->GetLayout($date, $resource->Id)} - {foreach from=$slots item=slot} - {if $slot->IsReserved()} -
- {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} -
- {/if} +
+
{formatdate date=$date}
+ {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} +
{$resource->Name}
+ {assign var=slots value=$DailyLayout->GetLayout($date, $resource->Id)} + {foreach from=$slots item=slot} + {if $slot->IsReserved()} +
+ {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} +
+ {/if} + {/foreach} {/foreach} - {/foreach} +
{/foreach} {/if} \ No newline at end of file diff --git a/tpl/MonitorDisplay/monitor-display.tpl b/tpl/MonitorDisplay/monitor-display.tpl index bc5921116..351f2b839 100644 --- a/tpl/MonitorDisplay/monitor-display.tpl +++ b/tpl/MonitorDisplay/monitor-display.tpl @@ -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'}
{if $Enabled}