ifl/iflrandevu
1
1
Fork 0
forked from mirrors/easyappointments
Code Issues 6 Pull requests Releases 3 Activity

Further utility class fixes

Browse source
This commit is contained in:
Alex Tselegidis 2021-11-23 08:43:40 +01:00
parent 0088065e43
commit 01fe98602f
8 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/views/pages/instance/instance_update_page.php
View file

@ -63,7 +63,7 @@
</p> </p>
</div> </div>
<div class="well text-left"> <div class="well text-start">
Error Message: <?= $exception ?> Error Message: <?= $exception ?>
</div> </div>
<?php endif; ?> <?php endif; ?>

2
application/views/pages/providers/providers_page.php
View file

@ -67,7 +67,7 @@
</div> </div>
<div class="record-details column col-12 col-md-7"> <div class="record-details column col-12 col-md-7">
<div class="float-md-left mb-4 me-4"> <div class="float-md-start mb-4 me-4">
<div class="add-edit-delete-group btn-group"> <div class="add-edit-delete-group btn-group">
<button id="add-provider" class="btn btn-primary"> <button id="add-provider" class="btn btn-primary">
<i class="fas fa-plus-square me-2"></i> <i class="fas fa-plus-square me-2"></i>

2
application/views/pages/settings/business_logic/business_logic_page.php
View file

@ -74,7 +74,7 @@
<tbody><!-- Dynamic Content --></tbody> <tbody><!-- Dynamic Content --></tbody>
</table> </table>
<div class="text-right"> <div class="text-end">
<button class="btn btn-outline-secondary" id="apply-global-working-plan" type="button"> <button class="btn btn-outline-secondary" id="apply-global-working-plan" type="button">
<i class="fas fa-check"></i> <i class="fas fa-check"></i>
<?= lang('apply_to_all_providers') ?> <?= lang('apply_to_all_providers') ?>

2
application/views/pages/users/users_page.php
View file

@ -112,7 +112,7 @@
</div> </div>
<div class="record-details column col-12 col-md-7"> <div class="record-details column col-12 col-md-7">
<div class="float-md-left mb-4 me-4"> <div class="float-md-start mb-4 me-4">
<div class="add-edit-delete-group btn-group"> <div class="add-edit-delete-group btn-group">
<button id="add-provider" class="btn btn-primary"> <button id="add-provider" class="btn btn-primary">
<i class="fas fa-plus-square me-2"></i> <i class="fas fa-plus-square me-2"></i>

68
assets/js/backend_calendar_default_view.js
View file

@ -366,18 +366,18 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
displayEdit = displayEdit =
($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom')) && ($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom')) &&
GlobalVariables.user.privileges.appointments.edit === true GlobalVariables.user.privileges.appointments.edit === true
? 'mr-2' ? 'me-2'
: 'd-none'; : 'd-none';
displayDelete = displayDelete =
($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom')) && ($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom')) &&
GlobalVariables.user.privileges.appointments.delete === true GlobalVariables.user.privileges.appointments.delete === true
? 'mr-2' ? 'me-2'
: 'd-none'; // Same value at the time. : 'd-none'; // Same value at the time.
$html = $('<div/>', { $html = $('<div/>', {
'html': [ 'html': [
$('<strong/>', { $('<strong/>', {
'class': 'd-inline-block mr-2', 'class': 'd-inline-block me-2',
'text': EALang.start 'text': EALang.start
}), }),
$('<span/>', { $('<span/>', {
@ -390,7 +390,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
$('<br/>'), $('<br/>'),
$('<strong/>', { $('<strong/>', {
'class': 'd-inline-block mr-2', 'class': 'd-inline-block me-2',
'text': EALang.end 'text': EALang.end
}), }),
$('<span/>', { $('<span/>', {
@ -416,10 +416,10 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
'class': 'd-flex justify-content-center', 'class': 'd-flex justify-content-center',
'html': [ 'html': [
$('<button/>', { $('<button/>', {
'class': 'close-popover btn btn-outline-secondary mr-2', 'class': 'close-popover btn btn-outline-secondary me-2',
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-ban mr-2' 'class': 'fas fa-ban me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.close 'text': EALang.close
@ -430,7 +430,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
'class': 'delete-popover btn btn-outline-secondary ' + displayDelete, 'class': 'delete-popover btn btn-outline-secondary ' + displayDelete,
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-trash-alt mr-2' 'class': 'fas fa-trash-alt me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.delete 'text': EALang.delete
@ -441,7 +441,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
'class': 'edit-popover btn btn-primary ' + displayEdit, 'class': 'edit-popover btn btn-primary ' + displayEdit,
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-edit mr-2' 'class': 'fas fa-edit me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.edit 'text': EALang.edit
@ -460,13 +460,13 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
displayDelete = displayDelete =
($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom')) && ($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom')) &&
GlobalVariables.user.privileges.appointments.delete === true GlobalVariables.user.privileges.appointments.delete === true
? 'mr-2' ? 'me-2'
: 'd-none'; // Same value at the time. : 'd-none'; // Same value at the time.
$html = $('<div/>', { $html = $('<div/>', {
'html': [ 'html': [
$('<strong/>', { $('<strong/>', {
'class': 'd-inline-block mr-2', 'class': 'd-inline-block me-2',
'text': EALang.provider 'text': EALang.provider
}), }),
$('<span/>', { $('<span/>', {
@ -475,7 +475,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
$('<br/>'), $('<br/>'),
$('<strong/>', { $('<strong/>', {
'class': 'd-inline-block mr-2', 'class': 'd-inline-block me-2',
'text': EALang.start 'text': EALang.start
}), }),
$('<span/>', { $('<span/>', {
@ -488,7 +488,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
$('<br/>'), $('<br/>'),
$('<strong/>', { $('<strong/>', {
'class': 'd-inline-block mr-2', 'class': 'd-inline-block me-2',
'text': EALang.end 'text': EALang.end
}), }),
$('<span/>', { $('<span/>', {
@ -501,7 +501,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
$('<br/>'), $('<br/>'),
$('<strong/>', { $('<strong/>', {
'class': 'd-inline-block mr-2', 'class': 'd-inline-block me-2',
'text': EALang.timezone 'text': EALang.timezone
}), }),
$('<span/>', { $('<span/>', {
@ -515,10 +515,10 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
'class': 'd-flex justify-content-between', 'class': 'd-flex justify-content-between',
'html': [ 'html': [
$('<button/>', { $('<button/>', {
'class': 'close-popover btn btn-outline-secondary mr-2', 'class': 'close-popover btn btn-outline-secondary me-2',
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-ban mr-2' 'class': 'fas fa-ban me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.close 'text': EALang.close
@ -529,7 +529,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
'class': 'delete-popover btn btn-outline-secondary ' + displayDelete, 'class': 'delete-popover btn btn-outline-secondary ' + displayDelete,
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-trash-alt mr-2' 'class': 'fas fa-trash-alt me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.delete 'text': EALang.delete
@ -540,7 +540,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
'class': 'edit-popover btn btn-primary ' + displayEdit, 'class': 'edit-popover btn btn-primary ' + displayEdit,
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-edit mr-2' 'class': 'fas fa-edit me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.edit 'text': EALang.edit
@ -552,13 +552,13 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
] ]
}); });
} else { } else {
displayEdit = GlobalVariables.user.privileges.appointments.edit === true ? 'mr-2' : 'd-none'; displayEdit = GlobalVariables.user.privileges.appointments.edit === true ? 'me-2' : 'd-none';
displayDelete = GlobalVariables.user.privileges.appointments.delete === true ? 'mr-2' : 'd-none'; displayDelete = GlobalVariables.user.privileges.appointments.delete === true ? 'me-2' : 'd-none';
$html = $('<div/>', { $html = $('<div/>', {
'html': [ 'html': [
$('<strong/>', { $('<strong/>', {
'class': 'd-inline-block mr-2', 'class': 'd-inline-block me-2',
'text': EALang.start 'text': EALang.start
}), }),
$('<span/>', { $('<span/>', {
@ -571,7 +571,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
$('<br/>'), $('<br/>'),
$('<strong/>', { $('<strong/>', {
'class': 'd-inline-block mr-2', 'class': 'd-inline-block me-2',
'text': EALang.end 'text': EALang.end
}), }),
$('<span/>', { $('<span/>', {
@ -584,7 +584,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
$('<br/>'), $('<br/>'),
$('<strong/>', { $('<strong/>', {
'class': 'd-inline-block mr-2', 'class': 'd-inline-block me-2',
'text': EALang.timezone 'text': EALang.timezone
}), }),
$('<span/>', { $('<span/>', {
@ -593,7 +593,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
$('<br/>'), $('<br/>'),
$('<strong/>', { $('<strong/>', {
'class': 'd-inline-block mr-2', 'class': 'd-inline-block me-2',
'text': EALang.service 'text': EALang.service
}), }),
$('<span/>', { $('<span/>', {
@ -602,7 +602,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
$('<br/>'), $('<br/>'),
$('<strong/>', { $('<strong/>', {
'class': 'd-inline-block mr-2', 'class': 'd-inline-block me-2',
'text': EALang.provider 'text': EALang.provider
}), }),
GeneralFunctions.renderMapIcon(event.data.provider), GeneralFunctions.renderMapIcon(event.data.provider),
@ -612,34 +612,34 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
$('<br/>'), $('<br/>'),
$('<strong/>', { $('<strong/>', {
'class': 'd-inline-block mr-2', 'class': 'd-inline-block me-2',
'text': EALang.customer 'text': EALang.customer
}), }),
GeneralFunctions.renderMapIcon(event.data.customer), GeneralFunctions.renderMapIcon(event.data.customer),
$('<span/>', { $('<span/>', {
'class': 'd-inline-block ml-1', 'class': 'd-inline-block ms-1',
'text': event.data.customer.first_name + ' ' + event.data.customer.last_name 'text': event.data.customer.first_name + ' ' + event.data.customer.last_name
}), }),
$('<br/>'), $('<br/>'),
$('<strong/>', { $('<strong/>', {
'class': 'd-inline-block mr-2', 'class': 'd-inline-block me-2',
'text': EALang.email 'text': EALang.email
}), }),
GeneralFunctions.renderMailIcon(event.data.customer.email), GeneralFunctions.renderMailIcon(event.data.customer.email),
$('<span/>', { $('<span/>', {
'class': 'd-inline-block ml-1', 'class': 'd-inline-block ms-1',
'text': event.data.customer.email 'text': event.data.customer.email
}), }),
$('<br/>'), $('<br/>'),
$('<strong/>', { $('<strong/>', {
'class': 'd-inline-block mr-2', 'class': 'd-inline-block me-2',
'text': EALang.phone 'text': EALang.phone
}), }),
GeneralFunctions.renderPhoneIcon(event.data.customer.phone_number), GeneralFunctions.renderPhoneIcon(event.data.customer.phone_number),
$('<span/>', { $('<span/>', {
'class': 'd-inline-block ml-1', 'class': 'd-inline-block ms-1',
'text': event.data.customer.phone_number 'text': event.data.customer.phone_number
}), }),
$('<br/>'), $('<br/>'),
@ -658,10 +658,10 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
'class': 'd-flex justify-content-center', 'class': 'd-flex justify-content-center',
'html': [ 'html': [
$('<button/>', { $('<button/>', {
'class': 'close-popover btn btn-outline-secondary mr-2', 'class': 'close-popover btn btn-outline-secondary me-2',
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-ban mr-2' 'class': 'fas fa-ban me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.close 'text': EALang.close
@ -672,7 +672,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
'class': 'delete-popover btn btn-outline-secondary ' + displayDelete, 'class': 'delete-popover btn btn-outline-secondary ' + displayDelete,
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-trash-alt mr-2' 'class': 'fas fa-trash-alt me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.delete 'text': EALang.delete
@ -683,7 +683,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
'class': 'edit-popover btn btn-primary ' + displayEdit, 'class': 'edit-popover btn btn-primary ' + displayEdit,
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-edit mr-2' 'class': 'fas fa-edit me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.edit 'text': EALang.edit

34
assets/js/backend_calendar_table_view.js
View file

@ -349,7 +349,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
}).appendTo('#calendar'); }).appendTo('#calendar');
$('<button/>', { $('<button/>', {
'class': 'btn btn-xs btn-outline-secondary previous mr-2', 'class': 'btn btn-xs btn-outline-secondary previous me-2',
'html': [ 'html': [
$('<span/>', { $('<span/>', {
'class': 'fas fa-chevron-left' 'class': 'fas fa-chevron-left'
@ -359,7 +359,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
$('<input/>', { $('<input/>', {
'type': 'text', 'type': 'text',
'class': 'form-control d-inline-block select-date mr-2', 'class': 'form-control d-inline-block select-date me-2',
'value': GeneralFunctions.formatDate(new Date(), GlobalVariables.dateFormat, false) 'value': GeneralFunctions.formatDate(new Date(), GlobalVariables.dateFormat, false)
}).appendTo($calendarHeader); }).appendTo($calendarHeader);
@ -1190,10 +1190,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
'class': 'd-flex justify-content-center', 'class': 'd-flex justify-content-center',
'html': [ 'html': [
$('<button/>', { $('<button/>', {
'class': 'close-popover btn btn-outline-secondary mr-2', 'class': 'close-popover btn btn-outline-secondary me-2',
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-ban mr-2' 'class': 'fas fa-ban me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.close 'text': EALang.close
@ -1201,10 +1201,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
] ]
}), }),
$('<button/>', { $('<button/>', {
'class': 'delete-popover btn btn-outline-secondary mr-2 ' + displayDelete, 'class': 'delete-popover btn btn-outline-secondary me-2 ' + displayDelete,
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-trash-alt mr-2' 'class': 'fas fa-trash-alt me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.delete 'text': EALang.delete
@ -1215,7 +1215,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
'class': 'edit-popover btn btn-primary ' + displayEdit, 'class': 'edit-popover btn btn-primary ' + displayEdit,
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-edit mr-2' 'class': 'fas fa-edit me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.edit 'text': EALang.edit
@ -1291,10 +1291,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
'class': 'd-flex justify-content-center', 'class': 'd-flex justify-content-center',
'html': [ 'html': [
$('<button/>', { $('<button/>', {
'class': 'close-popover btn btn-outline-secondary mr-2', 'class': 'close-popover btn btn-outline-secondary me-2',
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-ban mr-2' 'class': 'fas fa-ban me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.close 'text': EALang.close
@ -1302,10 +1302,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
] ]
}), }),
$('<button/>', { $('<button/>', {
'class': 'delete-popover btn btn-outline-secondary mr-2 ' + displayDelete, 'class': 'delete-popover btn btn-outline-secondary me-2 ' + displayDelete,
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-trash-alt mr-2' 'class': 'fas fa-trash-alt me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.delete 'text': EALang.delete
@ -1316,7 +1316,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
'class': 'edit-popover btn btn-primary ' + displayEdit, 'class': 'edit-popover btn btn-primary ' + displayEdit,
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-edit mr-2' 'class': 'fas fa-edit me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.edit 'text': EALang.edit
@ -1423,10 +1423,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
'class': 'd-flex justify-content-center', 'class': 'd-flex justify-content-center',
'html': [ 'html': [
$('<button/>', { $('<button/>', {
'class': 'close-popover btn btn-outline-secondary mr-2', 'class': 'close-popover btn btn-outline-secondary me-2',
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-ban mr-2' 'class': 'fas fa-ban me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.close 'text': EALang.close
@ -1434,10 +1434,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
] ]
}), }),
$('<button/>', { $('<button/>', {
'class': 'delete-popover btn btn-outline-secondary mr-2 ' + displayDelete, 'class': 'delete-popover btn btn-outline-secondary me-2 ' + displayDelete,
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-trash-alt mr-2' 'class': 'fas fa-trash-alt me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.delete 'text': EALang.delete
@ -1448,7 +1448,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
'class': 'edit-popover btn btn-primary ' + displayEdit, 'class': 'edit-popover btn btn-primary ' + displayEdit,
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-edit mr-2' 'class': 'fas fa-edit me-2'
}), }),
$('<span/>', { $('<span/>', {
'text': EALang.edit 'text': EALang.edit

2
assets/js/backend_customers_helper.js
View file

@ -326,7 +326,7 @@
'href': GlobalVariables.baseUrl + '/index.php/backend/index/' + appointment.hash, 'href': GlobalVariables.baseUrl + '/index.php/backend/index/' + appointment.hash,
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-edit mr-1' 'class': 'fas fa-edit me-1'
}), }),
$('<strong/>', { $('<strong/>', {
'text': 'text':

4
assets/js/working_plan_exceptions_modal.js
View file

@ -180,7 +180,7 @@ $(function () {
'html': [ 'html': [
$('<button/>', { $('<button/>', {
'type': 'button', 'type': 'button',
'class': 'btn btn-outline-secondary btn-sm mr-2 working-plan-exceptions-edit-break', 'class': 'btn btn-outline-secondary btn-sm me-2 working-plan-exceptions-edit-break',
'title': EALang.edit, 'title': EALang.edit,
'html': [ 'html': [
$('<span/>', { $('<span/>', {
@ -200,7 +200,7 @@ $(function () {
}), }),
$('<button/>', { $('<button/>', {
'type': 'button', 'type': 'button',
'class': 'btn btn-outline-secondary btn-sm mr-2 working-plan-exceptions-save-break d-none', 'class': 'btn btn-outline-secondary btn-sm me-2 working-plan-exceptions-save-break d-none',
'title': EALang.save, 'title': EALang.save,
'html': [ 'html': [
$('<span/>', { $('<span/>', {