Updated js for datatables and resource admin view and editor fordescription/notefield

Pages/Admin/ManageGroupsPage.php

@@ -165,7 +165,7 @@ public function ProcessPageLoad()
         $this->presenter->PageLoad();
         $this->Set('chooseText', Resources::GetInstance()->GetString('Choose') . '...');
         $this->Set('CanChangeRoles', $this->CanChangeRoles);
-        $this->Display('Admin/manage_groups.tpl');
+        $this->Display('Admin/Groups/manage_groups.tpl');
     }
 
     public function BindPageInfo(PageInfo $pageInfo)

Web/css/librebooking.css

@@ -216,6 +216,26 @@ fieldset:disabled .btn {
     color: var(--primary) !important;
 }
 
+.accordion-header {
+    background: var(--bs-secondary-bg);
+    color: var(--primary) !important;
+}
+
+.accordion-header:has(.accordion-icon-container.collapsed) {
+    background: #ffffff;
+    color: var(--primary) !important;
+}
+
+.accordion-header:hover {
+    background: var(--bs-secondary-bg) !important;
+    color: var(--primary) !important;
+}
+
+.noImage {
+    min-height: 100px;
+
+}
+
 .timespan {
     --bs-bg-opacity: .2;
 }
@@ -484,6 +504,10 @@ table.reservations td {
     z-index: 99999;
 }
 
+#resourceDetailsDiv .description p, #resourceDetailsDiv .note p {
+    margin: 0;
+}
+
 #userDetailsDiv,
 #customize-columns {
     display: none;
@@ -575,4 +599,16 @@ input.mid-number {
 
 .no-show {
     display: none !important;
-}
+}
+
+.trumbowyg-editor p, .notesValue p, .descriptionValue p {
+    margin: 0;
+}
+
+.editable-container.editable-popup {
+    max-width: 50% !important;
+    }
+
+    .editable-input {
+    max-width: 90%;
+    }

Web/scripts/admin/accessory.js

@@ -26,20 +26,20 @@ function AccessoryManagement(opts) {
 
 	AccessoryManagement.prototype.init = function () {
 
-		elements.accessoryList.delegate('a.update', 'click', function (e) {
+		elements.accessoryList.on('click', 'a.update', function (e) {
 			setActiveId($(this));
 			e.preventDefault();
 		});
 
-		elements.accessoryList.delegate('.edit', 'click', function () {
+		elements.accessoryList.on('click', '.edit', function () {
 			editAccessory();
 		});
 
-		elements.accessoryList.delegate('.delete', 'click', function () {
+		elements.accessoryList.on('click', '.delete', function () {
 			deleteAccessory();
 		});
 
-		elements.accessoryList.delegate('.resources', 'click', function () {
+		elements.accessoryList.on('click', '.resources', function () {
 			showAccessoryResources();
 		});
 
@@ -52,7 +52,7 @@ function AccessoryManagement(opts) {
 		});
 
 
-		elements.accessoryResourcesDialog.delegate('.resourceCheckbox', 'click', function () {
+		elements.accessoryResourcesDialog.on('click', '.resourceCheckbox', function () {
 			handleAccessoryResourceClick($(this));
 		});
 

Web/scripts/admin/announcement.js

@@ -33,18 +33,18 @@ function AnnouncementManagement(opts) {
 
 	AnnouncementManagement.prototype.init = function () {
 
-		elements.announcementList.delegate('a.update', 'click', function (e) {
+		elements.announcementList.on( 'click', 'a.update', function (e) {
 			setActiveId($(this));
 			e.preventDefault();
 		});
 
-		elements.announcementList.delegate('.edit', 'click', function () {
+		elements.announcementList.on('click', '.edit', function () {
 			editAnnouncement();
 		});
-		elements.announcementList.delegate('.sendEmail', 'click', function () {
+		elements.announcementList.on('click', '.sendEmail', function () {
 			emailAnnouncement();
 		});
-		elements.announcementList.delegate('.delete', 'click', function () {
+		elements.announcementList.on('click', '.delete', function () {
 			deleteAnnouncement();
 		});
 

Web/scripts/admin/attributes.js

@@ -68,12 +68,12 @@ function AttributeManagement(opts) {
             RefreshAttributeList();
         });
 
-        elements.attributeList.delegate('a.update', 'click', function (e) {
+        elements.attributeList.on( 'click', 'a.update', function (e) {
             e.preventDefault();
             e.stopPropagation();
         });
 
-        elements.attributeList.delegate('.delete', 'click', function (e) {
+        elements.attributeList.on('click', '.delete', function (e) {
             e.preventDefault();
             var attributeId = $(this).closest('tr').attr('attributeId');
 
@@ -101,7 +101,7 @@ function AttributeManagement(opts) {
             showRelevantAttributeOptions($(this).val(), elements.addDialog);
         });
 
-        elements.attributeList.delegate('.edit', 'click', function (e) {
+        elements.attributeList.on('click', '.edit', function (e) {
             e.preventDefault();
             e.stopPropagation();
             selectedEntityChoices = elements.editEntityChoices;
@@ -145,11 +145,11 @@ function AttributeManagement(opts) {
             }
         });
 
-        selectedEntityChoices.delegate('a.all', 'click', function (e) {
+        selectedEntityChoices.on('click', 'a.all', function (e) {
             onEntityChoiceClick(e);
         });
 
-        selectedEntityChoices.delegate('a.ok', 'click', function (e) {
+        selectedEntityChoices.on('click', 'a.ok', function (e) {
             e.preventDefault();
             selectedEntityChoices.hide();
             handleEntitiesSelected(activeAppliesTo);

Web/scripts/admin/blackouts.js

@@ -45,11 +45,11 @@ function BlackoutManagement(opts) {
 			$(this).closest('.modal').modal("hide");
 		});
 
-		$('#result').delegate('.reload', 'click', function (e) {
+		$('#result').on( 'click', '.reload', function (e) {
 			location.reload();
 		});
 
-		$('#result').delegate('.unblock', 'click', function (e) {
+		$('#result').on('click', '.unblock', function (e) {
 			$('#result').hide();
 			$('#wait-box').modal('hide');
 		});
@@ -96,19 +96,19 @@ function BlackoutManagement(opts) {
 		handleBlackoutApplicabilityChange();
 		wireUpTimePickers();
 
-		elements.blackoutTable.delegate('.update', 'click', function (e) {
+		elements.blackoutTable.on('click', '.update', function (e) {
 			e.preventDefault();
 
 			var tr = $(this).parents('tr');
 			var id = tr.attr('data-blackout-id');
 			setActiveBlackoutId(id);
 		});
 
-		elements.blackoutTable.delegate('.delete', 'click', function () {
+		elements.blackoutTable.on('click', '.delete', function () {
 			showDeleteBlackout();
 		});
 
-		elements.blackoutTable.delegate('.delete-recurring', 'click', function () {
+		elements.blackoutTable.on('click', '.delete-recurring', function () {
 			showDeleteRecurringBlackout();
 		});
 
@@ -210,7 +210,7 @@ function BlackoutManagement(opts) {
 			$(this).attachReservationPopup(refNum, options.popupUrl);
 		});
 
-		$("#reservationTable").delegate('.editable', 'click', function () {
+		$("#reservationTable").on('click', '.editable', function () {
 			$(this).addClass('clicked');
 			var td = $(this).find('.referenceNumber');
 			viewReservation(td.text());
@@ -275,4 +275,4 @@ function BlackoutManagement(opts) {
 			ChangeUpdateScope(options.scopeOpts.full);
 		});
 	}
-}
+}