Skip to content

Dev bootstrap5 #477

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
effgarces merged 2 commits into from
Jan 24, 2025
Merged

Dev bootstrap5 #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c4f036
The appearance of reserveButton and resourceName is standardized to t…
labmecanicatec Jan 23, 2025
ba77454
Using card in search-availability results
labmecanicatec Jan 23, 2025
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
20 changes: 20 additions & 0 deletions Web/css/librebooking.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,42 @@
--primary: #669999;
--primary-hover: #527a7a;
--primary-disabled: #85adad;
--text-color-btn: #ffffff;
}

[data-bs-theme="dimgray"] {
--primary: #696969;
--primary-hover: #595959;
--primary-disabled: #808080;
--text-color-btn: #ffffff;
}

[data-bs-theme="dark_red"] {
--primary: #8b0000;
--primary-hover: #660000;
--primary-disabled: #b30000;
--text-color-btn: #ffffff;
}

[data-bs-theme="dark_green"] {
--primary: #006400;
--primary-hover: #003300;
--primary-disabled: #009900;
--text-color-btn: #ffffff;
}

[data-bs-theme="french_blue"] {
--primary: #0072B5;
--primary-hover: #005180;
--primary-disabled: #0091e6;
--text-color-btn: #ffffff;
}

[data-bs-theme="orange"] {
--primary: #be6e34;
--primary-hover: #a05c2c;
--primary-disabled: #e4b99b;
--text-color-btn: #ffffff;
}

html {
Expand Down Expand Up @@ -553,6 +559,20 @@ input.mid-number {
cursor: pointer;
}

.resourceName {
background-color: var(--primary);
color: var(--text-color-btn);
}

.resourceName a {
color: inherit;
text-decoration: none;
}

.reserveButton .btn {
color: var(--text-color-btn);
}

.no-show {
display: none !important;
}
17 changes: 7 additions & 10 deletions tpl/Dashboard/resource_availability.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,12 @@
{foreach from=$availability item=i}
<div class="availabilityItem row p-2 border-bottom align-items-center">
<div class="col-12 col-sm-5">
<span class="resourceName px-2 py-1 rounded-1 {if !$i->GetColor()}bg-success bg-opacity-10{/if}"
<span class="resourceName px-2 py-1 rounded-1"
{if $i->GetColor()}style="background-color:{$i->GetColor()};color:{$i->GetTextColor()};" {/if}>
<i resource-id="{$i->ResourceId()}" class="resourceNameSelector bi bi-info-circle-fill
{if !$i->GetColor()}link-success{/if}"></i>
<i resource-id="{$i->ResourceId()}" class="resourceNameSelector bi bi-info-circle-fill"></i>
<a href="{$Path}{Pages::RESERVATION}?{QueryStringKeys::RESOURCE_ID}={$i->ResourceId()}"
resource-id="{$i->ResourceId()}"
class="resourceNameSelector
{if !$i->GetColor()}link-success link-underline-opacity-0 link-underline-opacity-100-hover{/if}"
style="color:{$i->GetTextColor()}">{$i->ResourceName()}</a>
resource-id="{$i->ResourceId()}" class="resourceNameSelector" {if $i->GetColor()}
style="color:{$i->GetTextColor()} {/if}">{$i->ResourceName()}</a>
</span>
</div>
<div class="availability col-12 col-sm-4">
Expand All @@ -36,7 +33,7 @@
{/if}
</div>
<div class="reserveButton col-12 col-sm-3 d-grid gap-2">
<button class="btn btn-sm btn-success"
<button class="btn btn-sm btn-primary"
onclick="window.location.href='{$Path}{Pages::RESERVATION}?{QueryStringKeys::RESOURCE_ID}={$i->ResourceId()}'">
{translate key=Reserve}
</button>
Expand Down Expand Up @@ -75,7 +72,7 @@
{format_date date=$i->ReservationEnds() timezone=$Timezone key=dashboard}
</div>
<div class="reserveButton col-12 col-sm-3 d-grid gap-2">
<button class="btn btn-sm btn-success"
<button class="btn btn-sm btn-primary"
onclick="window.location.href='{$Path}{Pages::RESERVATION}?{QueryStringKeys::RESOURCE_ID}={$i->ResourceId()}&{QueryStringKeys::START_DATE}={format_date date=$i->ReservationEnds() timezone=$Timezone key=url_full}'">
{translate key=Reserve}
</button>
Expand Down Expand Up @@ -112,7 +109,7 @@
{format_date date=$i->ReservationEnds() timezone=$Timezone key=dashboard}
</div>
<div class="reserveButton col-12 col-sm-3 d-grid gap-2">
<button class="btn btn-sm btn-success"
<button class="btn btn-sm btn-primary"
onclick="window.location.href='{{$Path}}{{Pages::RESERVATION}}?{{QueryStringKeys::RESOURCE_ID}}={{$i->ResourceId()}}&{{QueryStringKeys::START_DATE}}={{format_date date=$i->ReservationEnds() timezone=$Timezone key=url_full}}'">
{{translate key=Reserve}}
</button>
Expand Down
6 changes: 3 additions & 3 deletions tpl/Reservation/create.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<span>{translate key='Cancel'}</span>
</button>
{block name="submitButtons"}
<button type="button" class="btn btn-sm btn-success save create btnCreate">
<button type="button" class="btn btn-sm btn-primary save create btnCreate">
<i class="bi bi-check-circle"></i>
{translate key='Create'}
</button>
Expand Down Expand Up @@ -390,7 +390,7 @@
<span class="d-none d-sm-inline-block">{translate key='Cancel'}</span>
</button>
{block name="submitButtons"}
<button type="button" class="btn btn-sm btn-success save create btnCreate">
<button type="button" class="btn btn-sm btn-primary save create btnCreate">
<i class="bi bi-check-circle"></i>
{translate key='Create'} </button>
{/block}
Expand All @@ -405,7 +405,7 @@
{/block}
{/if}

<div id="retrySubmitParams" class="no-show"></div>
<div id="retrySubmitParams" class="d-none"></div>
</form>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions tpl/Reservation/edit.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
{translate key=CheckOut}</button>
{/if}
{if $IsRecurring}
<button type="button" class="btn btn-sm btn-success update prompt">
<button type="button" class="btn btn-sm btn-primary update prompt">
<span class="bi bi-check-circle"></span>
{translate key='Update'}
</button>
Expand Down Expand Up @@ -129,7 +129,7 @@

{else}

<button type="button" class="btn btn-sm btn-success save update btnEdit">
<button type="button" class="btn btn-sm btn-primary save update btnEdit">
<span class="bi bi-check-circle"></span>
{translate key='Update'}
</button>
Expand Down
27 changes: 10 additions & 17 deletions tpl/SearchAvailability/search-availability-results.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,24 @@
<div class="row gy-3">
{foreach from=$Openings item=opening}
<div class="col-sm-3">
<div class="opening border rounded-1 mx-2 shadow-sm" data-resourceid="{$opening->Resource()->Id}"
<div class="opening card shadow-sm" data-resourceid="{$opening->Resource()->Id}"
data-startdate="{format_date date=$opening->Start() key=system_datetime}"
data-enddate="{format_date date=$opening->End() key=system_datetime}">
<div {if $opening->Resource()->HasColor()}
<h5 class="card-header resourceName" data-resourceId="{$opening->Resource()->Id}"
{if $opening->Resource()->HasColor()}
style="background-color: {$opening->Resource()->Color};color:{$opening->Resource()->TextColor};"
{else} class="bg-success bg-opacity-10 text-success"
{/if}>
<div class="resourceName d-inline-flex px-2 py-1" data-resourceId="{$opening->Resource()->Id}">
<i class="bi bi-info-circle-fill pe-1"></i> {$opening->Resource()->Name}
</div>
</div>
{*<div data-resourceId="{$opening->Resource()->Id}" {if $opening->Resource()->HasColor()}
class="resourceName"
style="background-color: {$opening->Resource()->Color};color:{$opening->Resource()->TextColor};"
{else} class="resourceName bg-success bg-opacity-10"
{/if}>
{$opening->Resource()->Name}
</div>*}
<i class="bi bi-info-circle-fill pe-1"></i> {$opening->Resource()->Name}
</h5>
{assign var=key value=short_reservation_date}
{if $opening->SameDate()}
{assign var=key value=period_time}
{/if}
<div class="dates px-2 py-1">
{format_date date=$opening->Start() key=res_popup} -
{format_date date=$opening->End() key=$key}
<div class="card-body dates px-2 py-1">
<h6 class="card-text">
{format_date date=$opening->Start() key=res_popup} -
{format_date date=$opening->End() key=$key}
</h6>
</div>
</div>
</div>
Expand Down