这是indexloc提供的服务，不要输入任何密码
Skip to content

Dev bootstrap5 #486

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
merged 4 commits into from
Feb 18, 2025
Merged

Dev bootstrap5 #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d64194
userPopup como card
labmecanicatec Jan 24, 2025
6ef17fc
Appearance improvements in manage_blackouts_edit.tpl
labmecanicatec Jan 25, 2025
ec65439
Merge branch 'LibreBooking:dev-bootstrap5' into dev-bootstrap5
labmecanicatec Jan 30, 2025
6074a22
The link-primary class is added to the register and login links
labmecanicatec Feb 17, 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
18 changes: 5 additions & 13 deletions Web/css/librebooking.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,26 +477,14 @@ table.reservations td {
cursor: pointer;
}

#userDetailsDiv,
#resourceDetailsDiv {
max-width: 50%;
display: none;
position: absolute;
z-index: 99999;
}

#userDetailsDiv,
#customize-columns {
display: none;
position: absolute;
border: solid 1px var(--color-lines);
background-color: #fff;
padding: 5px;
-webkit-box-shadow: 0px 0px 3px 0px #212121;
-moz-box-shadow: 0px 0px 3px 0px #212121;
box-shadow: 0px 0px 3px 0px #212121;
z-index: 99999;
}

#reservation-box label {
min-width: 50px;
}
Expand Down Expand Up @@ -573,6 +561,10 @@ input.mid-number {
color: var(--text-color-btn);
}

.repeat-date-list {
min-height: 40px;
}

.no-show {
display: none !important;
}
2 changes: 1 addition & 1 deletion Web/scripts/userPopup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ $.fn.bindUserDetails = function (userId, options) {
function getDiv() {
if ($('#userDetailsDiv').length <= 0)
{
return $('<div id="userDetailsDiv"/>').appendTo('body');
return $('<div id="userDetailsDiv" class="card shadow-sm"/>').appendTo('body');
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions tpl/Admin/Blackouts/manage_blackouts_edit.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<form id="editBlackoutForm" class="form-inline" role="form" method="post">
<div id="updateBlackout" class="row gy-1 p-4">
<div class="form-group col-12 col-sm-6 d-flex align-items-center">
<div class="form-group col-12 col-sm-6 d-flex align-items-center gap-1">
<label class="fw-bold" for="updateStartDate">{translate key=BeginDate}</label>
<input type="date" id="updateStartDate" class="form-control form-control-sm dateinput"
value="{formatdate date=$BlackoutStartDate format='Y-m-d'}" />
Expand All @@ -11,7 +11,7 @@
value="{formatdate date=$BlackoutStartDate format='h:i A'}" />
</div>

<div class="form-group col-12 col-sm-6 d-flex align-items-center">
<div class="form-group col-12 col-sm-6 d-flex align-items-center gap-1">
<label class="fw-bold" for="updateEndDate">{translate key=EndDate}</label>
<input type="date" id="updateEndDate" class="form-control form-control-sm dateinput" size="10"
value="{formatdate date=$BlackoutEndDate format='Y-m-d'}" />
Expand Down
52 changes: 36 additions & 16 deletions tpl/Ajax/user_details.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,42 @@
{if $CanViewUser}
<div id="userDetailsPopup">
<div id="userDetailsName" class="fw-bold border-bottom">
{fullname first=$User->FirstName() last=$User->LastName() ignorePrivacy=true}</div>
<div id="userDetailsEmail" class="fw-bold"><span class="label">{translate key=Email}</span> <a
href="mailto:{$User->EmailAddress()}" class="link-primary">{$User->EmailAddress()}</a></div>
<div id="userDetailsPhone" class="fw-bold"><span class="label">{translate key=Phone}</span> <a
href="tel:{$User->GetAttribute(UserAttribute::Phone)}"
class="link-primary">{$User->GetAttribute(UserAttribute::Phone)}</a>
<div class="card-header fw-bold">
{fullname first=$User->FirstName() last=$User->LastName() ignorePrivacy=true}
</div>
<div id="userDetailsOrganization" class="fw-bold"><span class="label">{translate key=Organization}</span>
{$User->GetAttribute(UserAttribute::Organization)}</div>
<div id="userDetailsPosition" class="fw-bold"><span class="label">{translate key=Position}</span>
{$User->GetAttribute(UserAttribute::Position)}</div>
<div id="userDetailsAttributes" class="fw-bold">
{foreach from=$Attributes item=attribute}
<div class="customAttribute"><span class="label">{$attribute->Label()}</span>
{$User->GetAttributeValue($attribute->Id())}</div>
{/foreach}
<div id="userDetailsName" class="card-body">
{if $User->EmailAddress()}
<div id="userDetailsEmail" class="fw-bold">
<span class="label">{translate key=Email}</span>
<a href="mailto:{$User->EmailAddress()}" class="link-primary">{$User->EmailAddress()}</a>
</div>
{/if}
{if $User->GetAttribute(UserAttribute::Phone)}
<div id="userDetailsPhone" class="fw-bold">
<span class="label">{translate key=Phone}</span>
<a href="tel:{$User->GetAttribute(UserAttribute::Phone)}"
class="link-primary">{$User->GetAttribute(UserAttribute::Phone)}</a>
</div>
{/if}
{if $User->GetAttribute(UserAttribute::Organization)}
<div id="userDetailsOrganization" class="fw-bold">
<span class="label">{translate key=Organization}</span>
{$User->GetAttribute(UserAttribute::Organization)}
</div>
{/if}
{if $User->GetAttribute(UserAttribute::Position)}
<div id="userDetailsPosition" class="fw-bold">
<span class="label">{translate key=Position}</span>
{$User->GetAttribute(UserAttribute::Position)}
</div>
{/if}
<div id="userDetailsAttributes" class="fw-bold">
{foreach from=$Attributes item=attribute}
<div class="customAttribute">
<span class="label">{$attribute->Label()}</span>
{$User->GetAttributeValue($attribute->Id())}
</div>
{/foreach}
</div>
</div>
</div>
{/if}
11 changes: 5 additions & 6 deletions tpl/Controls/RecurrenceDiv.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div id="{if isset($prefix)}{$prefix}{/if}repeatDiv" class="repeat-div">
<div class="form-group">
<div class="d-flex align-items-center gap-1 mb-2">
<div class="d-flex align-items-center mb-2">
<label class="fw-bold"
for="{if isset($prefix)}{$prefix}{/if}repeatOptions">{translate key="RepeatPrompt"}</label>
<select id="{if isset($prefix)}{$prefix}{/if}repeatOptions" {formname key=repeat_options}
Expand All @@ -11,9 +11,9 @@
</select>
</div>

<div class="d-flex align-items-center flex-wrap gap-1 mb-2">
<div class="d-flex align-items-center flex-wrap mb-2">
<div id="{if isset($prefix)}{$prefix}{/if}repeatEveryDiv"
class="recur-toggle d-none days weeks months years d-flex align-items-center flex-wrap gap-1">
class="recur-toggle d-none days weeks months years d-flex align-items-center flex-wrap">
<label class="fw-bold"
for="{if isset($prefix)}{$prefix}{/if}repeatInterval">{translate key="RepeatEveryPrompt"}</label>
<div class="input-group-sm d-flex align-items-center flex-wrap gap-1">
Expand Down Expand Up @@ -92,8 +92,7 @@
</div>
</div>

<div id="{if isset($prefix)}{$prefix}{/if}repeatUntilDiv"
class="d-none recur-toggle d-flex align-items-center gap-1">
<div id="{if isset($prefix)}{$prefix}{/if}repeatUntilDiv" class="d-none recur-toggle d-flex align-items-center">
<label class="fw-bold"
for="{if isset($prefix)}{$prefix}{/if}EndRepeat">{translate key="RepeatUntilPrompt"}</label>
<input type="date" id="{if isset($prefix)}{$prefix}{/if}EndRepeat"
Expand All @@ -104,7 +103,7 @@
</div>

<div id="{if isset($prefix)}{$prefix}{/if}customDatesDiv" class="d-none specific-dates">
<div class="d-flex align-items-center flex-wrap gap-1 mb-2">
<div class="d-flex align-items-center flex-wrap mb-2">
<label class="fw-bold"
for="{if isset($prefix)}{$prefix}{/if}RepeatDate">{translate key=RepeatOn}</label>
<div class="input-group input-group-sm w-auto">
Expand Down
7 changes: 4 additions & 3 deletions tpl/Install/install.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,17 @@
{if $InstallCompletedSuccessfully}
{translate key=InstallationSuccess}
<br />
<a href="{$Path}{Pages::REGISTRATION}">{translate key=Register}</a>
<a href="{$Path}{Pages::REGISTRATION}" class="link-primary">{translate key=Register}</a>
{translate key=RegisterAdminUser args="$ConfigPath"}
<br />
<br />
<a href="{$Path}{Pages::LOGIN}">{translate key=Login}</a>
<a href="{$Path}{Pages::LOGIN}" class="link-primary">{translate key=Login}</a>
{translate key=LoginWithSampleAccounts}
{/if}
{if $UpgradeCompletedSuccessfully}
{translate key=InstalledVersion args=$TargetVersion}
<h3><a href="configure.php">{translate key=InstallUpgradeConfig}</a></h3>
<h3><a href="configure.php" class="link-primary">{translate key=InstallUpgradeConfig}</a>
</h3>
{/if}
{if $InstallFailed}
{translate key=InstallationFailure}
Expand Down