- {/if}
+ {assign var="hasResults" value=false}
+ {foreach from=$AttributeList item=attribute name=attrLoop}
+ {if $attribute->AppliesToEntity($id)}
+ {if !$hasResults}
+ {assign var="hasResults" value=true}
+ {* Content at the start of the iteration *}
+
{translate key='Public'}
@@ -1757,11 +1767,17 @@
}
function setupCustomAttributesIcon() {
- $('#customAttributesIcon').on('click', function() {
- const isExpanded = $("#customAttributesControl").attr('aria-expanded') === 'true';
+ $('[id^="customAttributesIcon"]').each(function() {
+ const icon = $(this);
+ const target = icon.closest('a').data('bs-target');
+
+ $(target).on('shown.bs.collapse', function() {
+ icon.removeClass('bi-chevron-down').addClass('bi-chevron-up');
+ });
- $(this).toggleClass('bi-chevron-down', !isExpanded);
- $(this).toggleClass('bi-chevron-up', isExpanded);
+ $(target).on('hidden.bs.collapse', function() {
+ icon.removeClass('bi-chevron-up').addClass('bi-chevron-down');
+ });
});
}
@@ -1789,7 +1805,7 @@
url: updateUrl + '{ManageResourcesActions::ActionChangeSchedule}', source: [
{foreach from=$Schedules item=scheduleName key=scheduleId}
{
- value:{$scheduleId}, text: '{$scheduleName|escape:'javascript'}'
+ value:{$scheduleId}, text: "{$scheduleName|escape:'javascript'}"
},
{/foreach}
]
@@ -1797,13 +1813,13 @@
$('.resourceTypeName').editable({
url: updateUrl + '{ManageResourcesActions::ActionChangeResourceType}',
- emptytext: '{{translate key=NoResourceTypeLabel}|escape:'javascript'}',
+ emptytext: "{translate key=NoResourceTypeLabel|escape:'javascript'}",
source: [{
value: '0', text: '' //'-- {translate key=None} --'
},
{foreach from=$ResourceTypes item=resourceType key=id}
{
- value:{$id}, text: '{$resourceType->Name()|escape:'javascript'}'
+ value:{$id}, text: "{$resourceType->Name()|escape:'javascript'}"
},
{/foreach}
]
@@ -1814,30 +1830,30 @@
});
$('.locationValue').editable({
- url: updateUrl + '{ManageResourcesActions::ActionChangeLocation}', emptytext: '{{translate key='NoLocationLabel'}|escape:'javascript'}'
+ url: updateUrl + '{ManageResourcesActions::ActionChangeLocation}', emptytext: "{translate key='NoLocationLabel'|escape:'javascript'}"
});
$('.contactValue').editable({
- url: updateUrl + '{ManageResourcesActions::ActionChangeContact}', emptytext: '{{translate key='NoContactLabel'}|escape:'javascript'}}'
+ url: updateUrl + '{ManageResourcesActions::ActionChangeContact}', emptytext: "{translate key='NoContactLabel'|escape:'javascript'}"
});
$('.descriptionValue').editable({
url: updateUrl + '{ManageResourcesActions::ActionChangeDescription}',
- emptytext: '{{translate key='NoDescriptionLabel'}|escape:'javascript'}'
+ emptytext: "{translate key='NoDescriptionLabel'|escape:'javascript'}"
});
$('.notesValue').editable({
- url: updateUrl + '{ManageResourcesActions::ActionChangeNotes}', emptytext: '{{translate key='NoDescriptionLabel'}|escape:'javascript'}'
+ url: updateUrl + '{ManageResourcesActions::ActionChangeNotes}', emptytext: "{translate key='NoDescriptionLabel'|escape:'javascript'}"
});
$('.resourceAdminValue').editable({
- url: updateUrl + '{ManageResourcesActions::ActionChangeAdmin}', emptytext: '{{translate key=None}|escape:'javascript'}', source: [{
+ url: updateUrl + '{ManageResourcesActions::ActionChangeAdmin}', emptytext: "{translate key=None|escape:'javascript'}", source: [{
value: '0',
text: ''
},
{foreach from=$AdminGroups item=group key=scheduleId}
{
- value:{$group->Id()}, text: '{$group->Name()|escape:'javascript'}'
+ value:{$group->Id()}, text: "{$group->Name()|escape:'javascript'}"
},
{/foreach}
]
@@ -1873,7 +1889,7 @@
userAutocompleteUrl: "../ajax/autocomplete.php?type={AutoCompleteType::User}",
groupAutocompleteUrl: "../ajax/autocomplete.php?type={AutoCompleteType::Group}",
permissionsUrl: '{$smarty.server.SCRIPT_NAME}',
- copyText: '{{translate key=Copy}|escape:"javascript"}'
+ copyText: "{translate key=Copy|escape:'javascript'}"
};
var resourceManagement = new ResourceManagement(opts);
@@ -1998,11 +2014,6 @@
resourceManagement.initializeStatusFilter('{$ResourceStatusFilterId}', '{$ResourceStatusReasonFilterId}');
resourceManagement.addResourceGroups({$ResourceGroups});
- /*$('#filter-resources-panel').showHidePanel();
-
- $(".owl-carousel").owlCarousel({
- items: 1
- });*/
});
From 62e571f5ad0143f477a50e9636ef0ee3a3a4b72a Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Thu, 20 Feb 2025 11:30:05 -0500
Subject: [PATCH 03/16] Simplify and unify appearance with manage resources
---
tpl/Admin/Resources/view_resources.tpl | 52 ++++++++++++--------------
1 file changed, 23 insertions(+), 29 deletions(-)
diff --git a/tpl/Admin/Resources/view_resources.tpl b/tpl/Admin/Resources/view_resources.tpl
index fc7640b3a..712587e8d 100644
--- a/tpl/Admin/Resources/view_resources.tpl
+++ b/tpl/Admin/Resources/view_resources.tpl
@@ -25,7 +25,6 @@
- {*
*}
- {foreach from=$AttributeFilters item=attribute}
- {control type="AttributeControl" idPrefix="search" attribute=$attribute searchmode=true class="customAttribute filter-customAttribute{$attribute->Id()}
- {$groupClass}"}
- {/foreach}
-