From 05e6325c3a2dab2b941884bdb18891df63221905 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Fri, 23 Aug 2024 17:10:19 -0500
Subject: [PATCH 03/12] css theme
The orange theme is introduced
---
Web/css/librebooking.css | 8 ++++----
tpl/Admin/Configuration/manage_configuration.tpl | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Web/css/librebooking.css b/Web/css/librebooking.css
index 4857745fb..ffd548a94 100644
--- a/Web/css/librebooking.css
+++ b/Web/css/librebooking.css
@@ -43,10 +43,10 @@
--primary-disabled: #0091e6;
}
-[data-bs-theme="pastel_blue"] {
- --primary: #5d9b9b;
- --primary-hover: #4d8080;
- --primary-disabled: #70a9a9;
+[data-bs-theme="orange"] {
+ --primary: #be6e34;
+ --primary-hover: #a05c2c;
+ --primary-disabled: #e4b99b;
}
html {
diff --git a/tpl/Admin/Configuration/manage_configuration.tpl b/tpl/Admin/Configuration/manage_configuration.tpl
index 71a713964..c64c7194b 100644
--- a/tpl/Admin/Configuration/manage_configuration.tpl
+++ b/tpl/Admin/Configuration/manage_configuration.tpl
@@ -34,12 +34,12 @@
{if $setting->Key == ConfigKeys::DEFAULT_TIMEZONE}
-
-
-
+
+
@@ -181,9 +183,11 @@
name="{FormKeys::ACCESSORY_RESOURCE}[{$resource->GetId()}]"
value="{$resource->GetId()}">
+ {$resource->GetName()}
+
-
+
{include file='globalfooter.tpl'}
\ No newline at end of file
From 55701eaccf21d9e57ccbc734f4f3f3a2daee83f2 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Tue, 27 Aug 2024 14:52:26 -0500
Subject: [PATCH 06/12] DataTables update
Responsive is disabled, text strings are added
---
lang/en_us.php | 5 ++++
lang/es.php | 23 +++++++++++----
lib/Common/SmartyPage.php | 59 +++++++++++++++++++++++----------------
3 files changed, 57 insertions(+), 30 deletions(-)
diff --git a/lang/en_us.php b/lang/en_us.php
index c0d75c788..3187c52bc 100755
--- a/lang/en_us.php
+++ b/lang/en_us.php
@@ -1062,6 +1062,11 @@ protected function _LoadStrings()
$strings['NoResourcesToView'] = 'No available resources';
//End View Resource
+ //Datatables
+ $strings['Info'] = "Showing page _PAGE_ of _PAGES_ of _MAX_";
+ $strings['LengthMenu'] = "Display _MENU_ records per page";
+ //End Datatables
+
$this->Strings = $strings;
return $this->Strings;
diff --git a/lang/es.php b/lang/es.php
index a8a81facd..bac6a8466 100644
--- a/lang/es.php
+++ b/lang/es.php
@@ -532,7 +532,7 @@ protected function _LoadStrings()
$strings['UsersInGroups'] = 'Usuarios en grupos';
$strings['UsersWithAccessToResources'] = 'Usuarios con acceso a recursos';
$strings['AnnouncementSubject'] = '%s ha publicado un nuevo anuncio';
- $strings['AnnouncementEmailNotice'] = 'los usuarios recibirán este anuncio por correo';
+ $strings['AnnouncementEmailNotice'] = 'usuarios recibirán este anuncio por correo';
$strings['Day'] = 'Día';
$strings['NotifyWhenAvailable'] = 'Notificarme cuando esté disponible';
$strings['AddingToWaitlist'] = 'Añadiéndote a la lista de espera';
@@ -679,11 +679,11 @@ protected function _LoadStrings()
$strings['FullAccess'] = 'Acceso completo';
$strings['ViewOnly'] = 'Sólo Ver';
$strings['Purge'] = 'Purgar';
- $strings['UsersWillBeDeleted'] = 'los usuarios serán borrados';
- $strings['BlackoutsWillBeDeleted'] = 'se borrarán las agendas de no disponibilidad';
- $strings['ReservationsWillBePurged'] = 'se purgarán las reservas';
- $strings['ReservationsWillBeDeleted'] = 'se borrarán las reservas';
- $strings['PermanentlyDeleteUsers'] = 'Borrar definitivamente los usuarios que no se han logado desde';
+ $strings['UsersWillBeDeleted'] = 'usuarios serán borrados';
+ $strings['BlackoutsWillBeDeleted'] = 'agendas de no disponibilidad serán borradas';
+ $strings['ReservationsWillBePurged'] = 'reservas serán purgadas';
+ $strings['ReservationsWillBeDeleted'] = 'reservas serán borradas';
+ $strings['PermanentlyDeleteUsers'] = 'Borrar definitivamente los usuarios que no se han iniciado sesión desde';
$strings['DeleteBlackoutsBefore'] = 'Borrar agenda de no disponibilidad antes de';
$strings['DeletedReservations'] = 'Reservas Borradas';
$strings['DeleteReservationsBefore'] = 'Borrar reservas anteriores a';
@@ -1017,6 +1017,17 @@ protected function _LoadStrings()
//End Schedule Resource Permissions
//END NEEDS CHECKING
+ //View Resource
+ $strings['Check'] = 'Comprobar';
+ $strings['PermissionType'] = 'Tipo de permiso';
+ $strings['NoResourcesToView'] = 'No hay recursos disponibles';
+ //End View Resource
+
+ //Datatables
+ $strings['Info'] = "Mostrando página _PAGE_ of _PAGES_ de _MAX_";
+ $strings['LengthMenu'] = "Mostrar _MENU_ registros po página";
+ //End Datatables
+
$this->Strings = $strings;
return $this->Strings;
diff --git a/lib/Common/SmartyPage.php b/lib/Common/SmartyPage.php
index 54f00d03e..f3ccbf6f7 100644
--- a/lib/Common/SmartyPage.php
+++ b/lib/Common/SmartyPage.php
@@ -575,10 +575,14 @@ public function CreatePagination($params, $smarty)
$sb->Append('