From 3d64194ec8f11532eb051fb7036f1710ab4e9d81 Mon Sep 17 00:00:00 2001 From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:44:10 -0500 Subject: [PATCH 1/3] userPopup como card --- Web/css/librebooking.css | 14 +---------- Web/scripts/userPopup.js | 2 +- tpl/Ajax/user_details.tpl | 52 +++++++++++++++++++++++++++------------ 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/Web/css/librebooking.css b/Web/css/librebooking.css index 18e0ffef6..b904f2f90 100644 --- a/Web/css/librebooking.css +++ b/Web/css/librebooking.css @@ -477,6 +477,7 @@ table.reservations td { cursor: pointer; } +#userDetailsDiv, #resourceDetailsDiv { max-width: 50%; display: none; @@ -484,19 +485,6 @@ table.reservations td { 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; } diff --git a/Web/scripts/userPopup.js b/Web/scripts/userPopup.js index ac998ea5b..d18879b17 100644 --- a/Web/scripts/userPopup.js +++ b/Web/scripts/userPopup.js @@ -9,7 +9,7 @@ $.fn.bindUserDetails = function (userId, options) { function getDiv() { if ($('#userDetailsDiv').length <= 0) { - return $('
').appendTo('body'); + return $('
').appendTo('body'); } else { diff --git a/tpl/Ajax/user_details.tpl b/tpl/Ajax/user_details.tpl index b4560874a..3577fc4d0 100644 --- a/tpl/Ajax/user_details.tpl +++ b/tpl/Ajax/user_details.tpl @@ -1,22 +1,42 @@ {if $CanViewUser}
-
- {fullname first=$User->FirstName() last=$User->LastName() ignorePrivacy=true}
-
{translate key=Email} {$User->EmailAddress()}
-
{translate key=Phone} {$User->GetAttribute(UserAttribute::Phone)} +
+ {fullname first=$User->FirstName() last=$User->LastName() ignorePrivacy=true}
-
{translate key=Organization} - {$User->GetAttribute(UserAttribute::Organization)}
-
{translate key=Position} - {$User->GetAttribute(UserAttribute::Position)}
-
- {foreach from=$Attributes item=attribute} -
{$attribute->Label()} - {$User->GetAttributeValue($attribute->Id())}
- {/foreach} +
+ {if $User->EmailAddress()} +
+ {translate key=Email} + {$User->EmailAddress()} +
+ {/if} + {if $User->GetAttribute(UserAttribute::Phone)} +
+ {translate key=Phone} + {$User->GetAttribute(UserAttribute::Phone)} +
+ {/if} + {if $User->GetAttribute(UserAttribute::Organization)} +
+ {translate key=Organization} + {$User->GetAttribute(UserAttribute::Organization)} +
+ {/if} + {if $User->GetAttribute(UserAttribute::Position)} +
+ {translate key=Position} + {$User->GetAttribute(UserAttribute::Position)} +
+ {/if} +
+ {foreach from=$Attributes item=attribute} +
+ {$attribute->Label()} + {$User->GetAttributeValue($attribute->Id())} +
+ {/foreach} +
{/if} \ No newline at end of file From 6ef17fc4c8228a93fcaf597fb1872f2417cef375 Mon Sep 17 00:00:00 2001 From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com> Date: Fri, 24 Jan 2025 19:57:53 -0500 Subject: [PATCH 2/3] Appearance improvements in manage_blackouts_edit.tpl Added spacing between updateBlackout elements, improved vertical alignment of RecurrenceDiv, increased height of repeat-date-list Appearance improvements in manage_blackouts_edit.tpl --- Web/css/librebooking.css | 4 ++++ tpl/Admin/Blackouts/manage_blackouts_edit.tpl | 4 ++-- tpl/Controls/RecurrenceDiv.tpl | 11 +++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Web/css/librebooking.css b/Web/css/librebooking.css index b904f2f90..e45f0f6bc 100644 --- a/Web/css/librebooking.css +++ b/Web/css/librebooking.css @@ -561,6 +561,10 @@ input.mid-number { color: var(--text-color-btn); } +.repeat-date-list { + min-height: 40px; +} + .no-show { display: none !important; } \ No newline at end of file diff --git a/tpl/Admin/Blackouts/manage_blackouts_edit.tpl b/tpl/Admin/Blackouts/manage_blackouts_edit.tpl index b46e83c0e..ac5e4a00c 100644 --- a/tpl/Admin/Blackouts/manage_blackouts_edit.tpl +++ b/tpl/Admin/Blackouts/manage_blackouts_edit.tpl @@ -1,6 +1,6 @@
-
+
@@ -11,7 +11,7 @@ value="{formatdate date=$BlackoutStartDate format='h:i A'}" />
-
+
diff --git a/tpl/Controls/RecurrenceDiv.tpl b/tpl/Controls/RecurrenceDiv.tpl index 9ac83ceb4..e92e96994 100644 --- a/tpl/Controls/RecurrenceDiv.tpl +++ b/tpl/Controls/RecurrenceDiv.tpl @@ -1,6 +1,6 @@
-
+
-
+
From 6074a22282f0c5eb148f65a876bfca520a289c2a Mon Sep 17 00:00:00 2001 From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com> Date: Mon, 17 Feb 2025 10:57:12 -0500 Subject: [PATCH 3/3] The link-primary class is added to the register and login links --- tpl/Install/install.tpl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tpl/Install/install.tpl b/tpl/Install/install.tpl index af74ab161..758b03e9a 100644 --- a/tpl/Install/install.tpl +++ b/tpl/Install/install.tpl @@ -138,16 +138,17 @@ {if $InstallCompletedSuccessfully} {translate key=InstallationSuccess}
- {translate key=Register} + {translate key=Register} {translate key=RegisterAdminUser args="$ConfigPath"}

- {translate key=Login} + {translate key=Login} {translate key=LoginWithSampleAccounts} {/if} {if $UpgradeCompletedSuccessfully} {translate key=InstalledVersion args=$TargetVersion} -

{translate key=InstallUpgradeConfig}

+

{translate key=InstallUpgradeConfig} +

{/if} {if $InstallFailed} {translate key=InstallationFailure}