refactor(tooltips): standardize popup template names and update refer… by JohnVillalovos · Pull Request #1206 · LibreBooking/librebooking

JohnVillalovos · 2026-03-22T19:49:53Z

…ences

Template changes:

tpl/Ajax/respopup.tpl → tpl/Ajax/reservation_popup.tpl tpl/Ajax/resourcedetails.tpl → tpl/Ajax/resource_popup.tpl tpl/Ajax/user_details.tpl → tpl/Ajax/user_popup.tpl

Updated references:
Adjusted the corresponding PHP pages to use the new template names:

Pages/Ajax/ReservationPopupPage.php
Pages/Ajax/ResourceDetailsPage.php
Pages/Ajax/UserDetailsPopupPage.php

These changes ensure more consistent and predictable naming between templates and their associated JS.

Copilot

Pull request overview

This PR standardizes naming for AJAX popup Smarty templates (reservation/resource/user) and updates the corresponding PHP page classes to render the renamed templates, aiming for more consistent popup/template naming across the tooltip/popup system.

Changes:

Renamed AJAX popup templates to *_popup.tpl (reservation/resource/user) and removed the legacy filenames.
Updated Pages/Ajax/* page classes to render the renamed templates.
Minor formatting/cleanup within tpl/Ajax/resource_popup.tpl.

Reviewed changes

Copilot reviewed 7 out of 8 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
tpl/Ajax/user_popup.tpl	New user details popup template (replacement for `user_details.tpl`).
tpl/Ajax/user_details.tpl	Removed legacy user details popup template.
tpl/Ajax/reservation_popup.tpl	New reservation tooltip template (replacement for `respopup.tpl`).
tpl/Ajax/respopup.tpl	Removed legacy reservation tooltip template.
tpl/Ajax/resource_popup.tpl	Minor formatting adjustments within the resource popup template.
Pages/Ajax/UserDetailsPopupPage.php	Updated to display `Ajax/user_popup.tpl`.
Pages/Ajax/ResourceDetailsPage.php	Updated to display `Ajax/resource_popup.tpl`.
Pages/Ajax/ReservationPopupPage.php	Updated to display `Ajax/reservation_popup.tpl`.

tpl/Ajax/user_popup.tpl

tpl/Ajax/reservation_popup.tpl

…ences Template changes: tpl/Ajax/respopup.tpl → tpl/Ajax/reservation_popup.tpl tpl/Ajax/resourcedetails.tpl → tpl/Ajax/resource_popup.tpl tpl/Ajax/user_details.tpl → tpl/Ajax/user_popup.tpl Updated references: Adjusted the corresponding PHP pages to use the new template names: Pages/Ajax/ReservationPopupPage.php Pages/Ajax/ResourceDetailsPage.php Pages/Ajax/UserDetailsPopupPage.php These changes ensure more consistent and predictable naming between templates and their associated JS.

Copilot

Pull request overview

Copilot reviewed 13 out of 13 changed files in this pull request and generated 9 comments.

Copilot · 2026-03-22T23:50:52Z

tpl/Controls/Attributes/SingleLineTextbox.tpl

+	{if isset($readonly) && $readonly && isset($tooltip) && $tooltip}
+		<span class="customAttribute readonly fw-bold">{$attribute->Label()}{if $attribute->Required() && !$searchmode}
+				<i class="bi bi-asterisk text-danger align-top text-small"></i>
+			{/if}</span>
+	{else}
+		<label
+			class="customAttribute {if isset($readonly) && $readonly}readonly{elseif isset($searchmode) && $searchmode}search{else}standard{/if} fw-bold"
+			for="{$attributeId}">{$attribute->Label()}{if $attribute->Required() && !$searchmode}
+				<i class="bi bi-asterisk text-danger align-top text-small"></i>
+			{/if}</label>


In readonly mode these templates render no form control with id $attributeId, but the else branch still emits a <label for="$attributeId">... when tooltip is not set. This produces invalid HTML and breaks label-to-control accessibility. Consider removing the for attribute (or using a non-label element) whenever $readonly is true, not only when $tooltip is enabled.

Copilot · 2026-03-22T23:50:53Z

tpl/Controls/Attributes/MultiLineTextbox.tpl

+            {/if}</span>
+    {else}
+        <label class="customAttribute {if $readonly}readonly{elseif $searchmode}search{else}standard{/if} fw-bold"
+            for="{$attributeId}">{$attribute->Label()}{if $attribute->Required() && !$searchmode}


Readonly rendering outputs only a <span> for the value, so there is no element with id $attributeId to associate the <label for="$attributeId"> with. Because the template only avoids <label> when tooltip is set, you still get invalid label associations in other readonly contexts. Consider using <span>/<div> (or removing for) whenever $readonly is true.

Suggested change

for="{$attributeId}">{$attribute->Label()}{if $attribute->Required() && !$searchmode}

{if !$readonly}for="{$attributeId}"{/if}>{$attribute->Label()}{if $attribute->Required() && !$searchmode}

Copilot · 2026-03-22T23:50:53Z

tpl/Controls/Attributes/Date.tpl

+			{/if}</span>
+	{else}
+		<label class="customAttribute d-block {if $readonly}readonly{elseif $searchmode}search{else}standard{/if} fw-bold"
+			for="{$attributeId}">{$attribute->Label()}{if $attribute->Required() && !$searchmode}


In readonly mode there is no input/select with id $attributeId, but the template still emits a <label for="$attributeId"> unless tooltip is set. This results in invalid HTML and incorrect accessibility semantics. Consider removing the for attribute (or using a non-label element) for all readonly renders.

Suggested change

for="{$attributeId}">{$attribute->Label()}{if $attribute->Required() && !$searchmode}

{if !$readonly}for="{$attributeId}"{/if}>{$attribute->Label()}{if $attribute->Required() && !$searchmode}

Copilot · 2026-03-22T23:50:53Z

tpl/Ajax/reservation_popup.tpl

+                    {if $hideUserInfo || $hideDetails}
+                        {translate key=Private}
+                    {else}
+                        {$fullName}


This popup HTML is injected into a Bootstrap tooltip with data-bs-html=true (see reservationPopup.js). $fullName is output without HTML escaping, so any </& content would be interpreted as markup inside the tooltip. Please escape $fullName before output.

Suggested change

{$fullName}

{$fullName|escape}

Copilot · 2026-03-22T23:50:53Z

tpl/Ajax/reservation_popup.tpl

+                <div class="resources">
+                    {translate key="Resources"} ({$resources|@count}):
+                    {foreach from=$resources item=resource name=resource_loop}
+                        {$resource->Name()}


Resource names are inserted into HTML tooltip content via {$resource->Name()} without escaping. Since tooltip rendering uses data-bs-html=true, resource names containing special characters could be interpreted as markup. Please apply HTML escaping to Name() output here.

Suggested change

{$resource->Name()}

{$resource->Name()|escape:'html'}

Copilot · 2026-03-22T23:50:54Z

tpl/Ajax/reservation_popup.tpl

+                    <div class="accessories">
+                        {translate key="Accessories"} ({$accessories|@count}):
+                        {foreach from=$accessories item=accessory name=accessory_loop}
+                            {$accessory->Name} ({$accessory->QuantityReserved})


Accessory names are output unescaped inside HTML tooltip content (data-bs-html=true). Please HTML-escape $accessory->Name to avoid markup injection/broken tooltip rendering.

Suggested change

{$accessory->Name} ({$accessory->QuantityReserved})

{$accessory->Name|escape:'html'} ({$accessory->QuantityReserved})

Copilot · 2026-03-22T23:50:54Z

tpl/Controls/Attributes/SelectList.tpl

+    {if $readonly && isset($tooltip) && $tooltip}
+        <span class="customAttribute readonly fw-bold">{$attribute->Label()}{if $attribute->Required() && !$searchmode}
+                <i class="bi bi-asterisk text-danger align-top text-small"></i>
+            {/if}</span>
+    {else}
+        <label class="customAttribute {if $readonly}readonly{elseif $searchmode}search{else}standard{/if} fw-bold"
+            for="{$attributeId}">{$attribute->Label()}{if $attribute->Required() && !$searchmode}
+                <i class="bi bi-asterisk text-danger align-top text-small"></i>
+            {/if}</label>


When $readonly is true the control renders a <span> value (no matching element with id $attributeId), but the template still outputs <label for="$attributeId">... unless tooltip is set. This is invalid markup and harms accessibility; switch to a non-label element or drop the for attribute for all readonly renders.

Copilot · 2026-03-22T23:50:54Z

tpl/Ajax/reservation_popup.tpl

+            {capture "email"}
+                <div class="email">
+                    {if !$hideUserInfo && !$hideDetails}
+                        {$email}


Because this template is rendered as HTML inside a Bootstrap tooltip (data-bs-html=true), $email is treated as markup. It's currently output without escaping; please HTML-escape it (or output a deliberately constructed safe link) to prevent injection.

Suggested change

{$email}

{$email|escape:'html'}

Copilot · 2026-03-22T23:50:54Z

tpl/Ajax/reservation_popup.tpl

+            {capture "phone"}
+                <div class="phone">
+                    {if !$hideUserInfo && !$hideDetails}
+                        {$phone}


$phone is output unescaped inside HTML tooltip content (data-bs-html=true). Please HTML-escape it (or generate a safe tel: link) to avoid potential markup injection/broken rendering.

Suggested change

{$phone}

{$phone|escape:'html'}

Copilot AI review requested due to automatic review settings March 22, 2026 19:49

Copilot started reviewing on behalf of JohnVillalovos March 22, 2026 19:50 View session

Copilot AI reviewed Mar 22, 2026

View reviewed changes

tpl/Ajax/user_popup.tpl Show resolved Hide resolved

tpl/Ajax/reservation_popup.tpl Show resolved Hide resolved

tpl/Ajax/reservation_popup.tpl Show resolved Hide resolved

JohnVillalovos commented Mar 22, 2026

View reviewed changes

tpl/Ajax/reservation_popup.tpl Show resolved Hide resolved

JohnVillalovos commented Mar 22, 2026

View reviewed changes

tpl/Ajax/reservation_popup.tpl Outdated Show resolved Hide resolved

JohnVillalovos force-pushed the jlvillal/1205_part1 branch from f23c840 to 3a50231 Compare March 22, 2026 23:41

JohnVillalovos requested a review from Copilot March 22, 2026 23:44

Copilot started reviewing on behalf of JohnVillalovos March 22, 2026 23:45 View session

Copilot AI reviewed Mar 22, 2026

View reviewed changes

	for="{$attributeId}">{$attribute->Label()}{if $attribute->Required() && !$searchmode}
	{if !$readonly}for="{$attributeId}"{/if}>{$attribute->Label()}{if $attribute->Required() && !$searchmode}

	{$accessory->Name} ({$accessory->QuantityReserved})
	{$accessory->Name\|escape:'html'} ({$accessory->QuantityReserved})

Conversation

JohnVillalovos commented Mar 22, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Mar 22, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 22, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 22, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 22, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 22, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 22, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 22, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 22, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 22, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants