mirrors/easyappointments
1
0
Fork 1
mirror of https://github.com/alextselegidis/easyappointments.git synced 2024-11-08 17:12:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Miscellaneous fixes on view files, required after merging the bootstrap 4 codebase

Browse source
This commit is contained in:
Alex Tselegidis 2020-08-31 13:23:10 +03:00
parent 6d6dc9b19c
commit 8f618c3339
13 changed files with 179 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
application/views/appointments/book.php
View file

@ -71,16 +71,17 @@
</div> </div>
<?php endif; ?> <?php endif; ?>
<?php <?php if (isset($exceptions)): ?>
if (isset($exceptions)) { <div style="margin: 10px">
echo '<div style="margin: 10px">'; <h4><?= lang('unexpected_issues') ?></h4>
echo '<h4>' . lang('unexpected_issues') . '</h4>';
foreach($exceptions as $exception) { <?php foreach($exceptions as $exception): ?>
echo exceptionToHtml($exception); <?= exceptionToHtml($exception) ?>
} <?php endforeach ?>
echo '</div>'; </div>
} <?php endif ?>
?>
<!-- SELECT SERVICE AND PROVIDER --> <!-- SELECT SERVICE AND PROVIDER -->
@ -162,7 +163,7 @@
</div> </div>
<div class="command-buttons"> <div class="command-buttons">
<button type="button" id="button-next-1" class="btn button-next btn-info" <button type="button" id="button-next-1" class="btn button-next btn-primary"
data-step_index="1"> data-step_index="1">
<?= lang('next') ?> <?= lang('next') ?>
<i class="fas fa-long-arrow-alt-right"></i> <i class="fas fa-long-arrow-alt-right"></i>
@ -197,7 +198,7 @@
<i class="fas fa-long-arrow-alt-left"></i> <i class="fas fa-long-arrow-alt-left"></i>
<?= lang('back') ?> <?= lang('back') ?>
</button> </button>
<button type="button" id="button-next-2" class="btn button-next btn-info" <button type="button" id="button-next-2" class="btn button-next btn-primary"
data-step_index="2"> data-step_index="2">
<?= lang('next') ?> <?= lang('next') ?>
<i class="fas fa-long-arrow-alt-right"></i> <i class="fas fa-long-arrow-alt-right"></i>
@ -290,7 +291,7 @@
data-step_index="3"><i class="fas fa-long-arrow-alt-left"></i> data-step_index="3"><i class="fas fa-long-arrow-alt-left"></i>
<?= lang('back') ?> <?= lang('back') ?>
</button> </button>
<button type="button" id="button-next-3" class="btn button-next btn-info" <button type="button" id="button-next-3" class="btn button-next btn-primary"
data-step_index="3"> data-step_index="3">
<?= lang('next') ?> <?= lang('next') ?>
<i class="fas fa-long-arrow-alt-right"></i> <i class="fas fa-long-arrow-alt-right"></i>

60
application/views/appointments/book_success.php
View file

@ -21,36 +21,40 @@
<div class="col-xs-12"> <div class="col-xs-12">
<img id="success-icon" class="mt-0 mb-2" src="<?= base_url('assets/img/success.png') ?>" /> <img id="success-icon" class="mt-0 mb-2" src="<?= base_url('assets/img/success.png') ?>" />
</div> </div>
<div class="col-xs-12 col"> <div class="col-xs-12">
<?php <h3><?= lang('appointment_registered') ?></h3>
echo '
<h3>' . lang('appointment_registered') . '</h3>
<p>' . lang('appointment_details_was_sent_to_you') . '</p>
<p><strong>' . lang('check_spam_folder') . '</strong></p>
<a href="' . site_url() . '" class="btn btn-success btn-large">
<i class="far fa-calendar-alt"></i> ' .
lang('go_to_booking_page') . '
</a>
';
if (config('google_sync_feature')) { <p>
echo ' <?= lang('appointment_details_was_sent_to_you') ?>
<button id="add-to-google-calendar" class="btn btn-primary"> </p>
<i class="fas fa-plus"></i>
' . lang('add_to_google_calendar') . '
</button>';
}
// Display exceptions (if any). <p>
if (isset($exceptions)) { <strong>
echo '<div class="col-xs-12" style="margin:10px">'; <?= lang('check_spam_folder') ?>
echo '<h4>Unexpected Errors</h4>'; </strong>
foreach($exceptions as $exception) { </p>
echo exceptionToHtml($exception);
} <a href="<?= site_url() ?>" class="btn btn-success btn-large">
echo '</div>'; <i class="far fa-calendar-alt"></i>
} <?= lang('go_to_booking_page') ?>
?> </a>
<?php if(config('google_sync_feature')): ?>
<button id="add-to-google-calendar" class="btn btn-primary">
<i class="fas fa-plus"></i>
<?= lang('add_to_google_calendar') ?>
</button>
<?php endif ?>
<?php if (isset($exceptions)): ?>
<div class="col-xs-12" style="margin:10px">
<h4><?= lang('unexpected_issues') ?></h4>
<?php foreach($exceptions as $exception): ?>
<?= exceptionToHtml($exception) ?>
<?php endforeach ?>
</div>
<?php endif ?>
</div> </div>
</div> </div>
</div> </div>

15
application/views/appointments/message.php
View file

@ -26,19 +26,13 @@
<body> <body>
<div id="main" class="container"> <div id="main" class="container">
<div class="wrapper row"> <div class="wrapper row d-md-flex align-items-center justify-content-center">
<div id="message-frame" class="frame-container col-xs-12 d-md-flex">
<div id="message-frame" class="frame-container <div class="col-xs-12">
col-xs-12
col-sm-offset-1 col-sm-10
col-md-offset-2 col-md-8
col-lg-offset-2 col-lg-8">
<div class="col-xs-12 col-sm-2">
<img id="message-icon" src="<?= $message_icon ?>" alt="warning"> <img id="message-icon" src="<?= $message_icon ?>" alt="warning">
</div> </div>
<div class="col-xs-12 col-sm-10"> <div class="col-xs-12">
<h3><?= $message_title ?></h3> <h3><?= $message_title ?></h3>
<p><?= $message_text ?></p> <p><?= $message_text ?></p>
@ -52,7 +46,6 @@
<?php endif ?> <?php endif ?>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

179
application/views/backend/calendar.php
View file

@ -13,36 +13,36 @@
<script src="<?= asset_url('assets/js/backend_calendar_api.js') ?>"></script> <script src="<?= asset_url('assets/js/backend_calendar_api.js') ?>"></script>
<script> <script>
var GlobalVariables = { var GlobalVariables = {
'csrfToken' : <?= json_encode($this->security->get_csrf_hash()) ?>, 'csrfToken': <?= json_encode($this->security->get_csrf_hash()) ?>,
'availableProviders' : <?= json_encode($available_providers) ?>, 'availableProviders': <?= json_encode($available_providers) ?>,
'availableServices' : <?= json_encode($available_services) ?>, 'availableServices': <?= json_encode($available_services) ?>,
'baseUrl' : <?= json_encode($base_url) ?>, 'baseUrl': <?= json_encode($base_url) ?>,
'bookAdvanceTimeout' : <?= $book_advance_timeout ?>, 'bookAdvanceTimeout': <?= $book_advance_timeout ?>,
'dateFormat' : <?= json_encode($date_format) ?>, 'dateFormat': <?= json_encode($date_format) ?>,
'timeFormat' : <?= json_encode($time_format) ?>, 'timeFormat': <?= json_encode($time_format) ?>,
'firstWeekday' : <?= json_encode($first_weekday) ?>, 'firstWeekday': <?= json_encode($first_weekday) ?>,
'editAppointment' : <?= json_encode($edit_appointment) ?>, 'editAppointment': <?= json_encode($edit_appointment) ?>,
'customers' : <?= json_encode($customers) ?>, 'customers': <?= json_encode($customers) ?>,
'secretaryProviders' : <?= json_encode($secretary_providers) ?>, 'secretaryProviders': <?= json_encode($secretary_providers) ?>,
'calendarView' : <?= json_encode($calendar_view) ?>, 'calendarView': <?= json_encode($calendar_view) ?>,
'timezones' : <?= json_encode($timezones) ?>, 'timezones': <?= json_encode($timezones) ?>,
'user' : { 'user': {
'id' : <?= $user_id ?>, 'id': <?= $user_id ?>,
'email' : <?= json_encode($user_email) ?>, 'email': <?= json_encode($user_email) ?>,
'timezone' : <?= json_encode($timezone) ?>, 'timezone': <?= json_encode($timezone) ?>,
'role_slug' : <?= json_encode($role_slug) ?>, 'role_slug': <?= json_encode($role_slug) ?>,
'privileges': <?= json_encode($privileges) ?>, 'privileges': <?= json_encode($privileges) ?>,
} }
}; };
$(document).ready(function() { $(document).ready(function () {
BackendCalendar.initialize(GlobalVariables.calendarView); BackendCalendar.initialize(GlobalVariables.calendarView);
}); });
</script> </script>
<div id="calendar-page" class="container-fluid"> <div id="calendar-page" class="container-fluid">
<div id="calendar-toolbar" class="d-md-flex"> <div id="calendar-toolbar">
<div id="calendar-filter" class="col-12 col-md-5 d-flex"> <div id="calendar-filter" class="col-12 col-md-5">
<div class="form-group calendar-filter-items"> <div class="form-group calendar-filter-items">
<label for="select-filter-item" class="mr-3"><?= lang('display_calendar') ?></label> <label for="select-filter-item" class="mr-3"><?= lang('display_calendar') ?></label>
<select id="select-filter-item" class="form-control col" title="<?= lang('select_filter_item_hint') ?>"> <select id="select-filter-item" class="form-control col" title="<?= lang('select_filter_item_hint') ?>">
@ -52,8 +52,8 @@
<div id="calendar-actions" class="col-12 col-md-7"> <div id="calendar-actions" class="col-12 col-md-7">
<?php if (($role_slug == DB_SLUG_ADMIN || $role_slug == DB_SLUG_PROVIDER) <?php if (($role_slug == DB_SLUG_ADMIN || $role_slug == DB_SLUG_PROVIDER)
&& config('google_sync_feature') == TRUE): ?> && config('google_sync_feature') == TRUE): ?>
<button id="google-sync" class="btn btn-info" <button id="google-sync" class="btn btn-primary"
title="<?= lang('trigger_google_sync_hint') ?>"> title="<?= lang('trigger_google_sync_hint') ?>">
<i class="fas fa-sync-alt"></i> <i class="fas fa-sync-alt"></i>
<span><?= lang('synchronize') ?></span> <span><?= lang('synchronize') ?></span>
@ -67,26 +67,26 @@
<?php endif ?> <?php endif ?>
<?php if ($privileges[PRIV_APPOINTMENTS]['add'] == TRUE): ?> <?php if ($privileges[PRIV_APPOINTMENTS]['add'] == TRUE): ?>
<div class="btn-group" role="group" aria-label="Button group with nested dropdown"> <div class="btn-group">
<button class="btn btn-light" type="button" id="insert-appointment"> <button class="btn btn-light" id="insert-appointment">
<i class="fas fa-plus"></i> <i class="fas fa-plus"></i>
<?= lang('appointment') ?> <?= lang('appointment') ?>
</button> </button>
<button type="button" id="insert-dropdown" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span> <button class="btn btn-light dropdown-toggle" id="insert-dropdown" data-toggle="dropdown">
<span class="sr-only">Toggle Dropdown</span> <span class="caret"></span>
</button> <span class="sr-only">Toggle Dropdown</span>
<ul class="dropdown-menu"> </button>
<li>
<a href="#" id="insert-unavailable"> <div class="dropdown-menu">
<?= lang('unavailable') ?> <a class="dropdown-item" href="#" id="insert-unavailable">
</a> <?= lang('unavailable') ?>
<a class="dropdown-item" href="#" id="insert-extra-period"> </a>
<?= lang('extra_period') ?> <a class="dropdown-item" href="#" id="insert-extra-period">
</a> <?= lang('extra_period') ?>
</div> </a>
</div>
</div> </div>
</div>
<?php endif ?> <?php endif ?>
<button id="reload-appointments" class="btn btn-light" title="<?= lang('reload_appointments_hint') ?>"> <button id="reload-appointments" class="btn btn-light" title="<?= lang('reload_appointments_hint') ?>">
@ -106,16 +106,13 @@
<i class="fas fa-calendar-alt"></i> <i class="fas fa-calendar-alt"></i>
</a> </a>
<?php endif ?> <?php endif ?>
<button id="toggle-fullscreen" class="btn btn-light">
<i class="fas fa-expand-arrows-alt"></i>
</button>
</div> </div>
</div> </div>
<div id="calendar"><!-- Dynamically Generated Content --></div> <div id="calendar"><!-- Dynamically Generated Content --></div>
</div> </div>
<!-- MANAGE APPOINTMENT MODAL --> <!-- MANAGE APPOINTMENT MODAL -->
<div id="manage-appointment" class="modal fade" data-keyboard="true" tabindex="-1"> <div id="manage-appointment" class="modal fade" data-keyboard="true" tabindex="-1">
@ -123,7 +120,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h3 class="modal-title"><?= lang('edit_appointment_title') ?></h3> <h3 class="modal-title"><?= lang('edit_appointment_title') ?></h3>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
@ -144,20 +141,26 @@
// Group services by category, only if there is at least one service // Group services by category, only if there is at least one service
// with a parent category. // with a parent category.
$has_category = FALSE; $has_category = FALSE;
foreach($available_services as $service) { foreach ($available_services as $service)
if ($service['category_id'] != NULL) { {
if ($service['category_id'] != NULL)
{
$has_category = TRUE; $has_category = TRUE;
break; break;
} }
} }
if ($has_category) { if ($has_category)
$grouped_services = array(); {
$grouped_services = [];
foreach($available_services as $service) { foreach ($available_services as $service)
if ($service['category_id'] != NULL) { {
if (!isset($grouped_services[$service['category_name']])) { if ($service['category_id'] != NULL)
$grouped_services[$service['category_name']] = array(); {
if ( ! isset($grouped_services[$service['category_name']]))
{
$grouped_services[$service['category_name']] = [];
} }
$grouped_services[$service['category_name']][] = $service; $grouped_services[$service['category_name']][] = $service;
@ -166,28 +169,36 @@
// We need the uncategorized services at the end of the list so // We need the uncategorized services at the end of the list so
// we will use another iteration only for the uncategorized services. // we will use another iteration only for the uncategorized services.
$grouped_services['uncategorized'] = array(); $grouped_services['uncategorized'] = [];
foreach($available_services as $service) { foreach ($available_services as $service)
if ($service['category_id'] == NULL) { {
if ($service['category_id'] == NULL)
{
$grouped_services['uncategorized'][] = $service; $grouped_services['uncategorized'][] = $service;
} }
} }
foreach($grouped_services as $key => $group) { foreach ($grouped_services as $key => $group)
{
$group_label = ($key != 'uncategorized') $group_label = ($key != 'uncategorized')
? $group[0]['category_name'] : 'Uncategorized'; ? $group[0]['category_name'] : 'Uncategorized';
if (count($group) > 0) { if (count($group) > 0)
{
echo '<optgroup label="' . $group_label . '">'; echo '<optgroup label="' . $group_label . '">';
foreach($group as $service) { foreach ($group as $service)
{
echo '<option value="' . $service['id'] . '">' echo '<option value="' . $service['id'] . '">'
. $service['name'] . '</option>'; . $service['name'] . '</option>';
} }
echo '</optgroup>'; echo '</optgroup>';
} }
} }
} else { }
foreach($available_services as $service) { else
{
foreach ($available_services as $service)
{
echo '<option value="' . $service['id'] . '">' echo '<option value="' . $service['id'] . '">'
. $service['name'] . '</option>'; . $service['name'] . '</option>';
} }
@ -202,7 +213,8 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="appointment-location" class="control-label"><?= lang('location') ?></label> <label for="appointment-location"
class="control-label"><?= lang('location') ?></label>
<input id="appointment-location" class="form-control"> <input id="appointment-location" class="form-control">
</div> </div>
@ -214,7 +226,8 @@
<div class="col-12 col-sm-6"> <div class="col-12 col-sm-6">
<div class="form-group"> <div class="form-group">
<label for="start-datetime" class="control-label"><?= lang('start_date_time') ?></label> <label for="start-datetime"
class="control-label"><?= lang('start_date_time') ?></label>
<input id="start-datetime" class="required form-control"> <input id="start-datetime" class="required form-control">
</div> </div>
@ -250,13 +263,13 @@
<fieldset> <fieldset>
<legend> <legend>
<?= lang('customer_details_title') ?> <?= lang('customer_details_title') ?>
<button id="new-customer" class="btn btn-light btn-xs" <button id="new-customer" class="btn btn-light btn-sm" type="button"
title="<?= lang('clear_fields_add_existing_customer_hint') ?>" title="<?= lang('clear_fields_add_existing_customer_hint') ?>">
type="button"><?= lang('new') ?> <?= lang('new') ?>
</button> </button>
<button id="select-customer" class="btn btn-info btn-xs" <button id="select-customer" class="btn btn-primary btn-sm" type="button"
title="<?= lang('pick_existing_customer_hint') ?>" title="<?= lang('pick_existing_customer_hint') ?>">
type="button"><?= lang('select') ?> <?= lang('select') ?>
</button> </button>
<input id="filter-existing-customers" <input id="filter-existing-customers"
placeholder="<?= lang('type_to_filter_customers') ?>" placeholder="<?= lang('type_to_filter_customers') ?>"
@ -284,7 +297,8 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="phone-number" class="control-label"><?= lang('phone_number') ?> *</label> <label for="phone-number" class="control-label"><?= lang('phone_number') ?>
*</label>
<input id="phone-number" class="required form-control"> <input id="phone-number" class="required form-control">
</div> </div>
</div> </div>
@ -315,8 +329,9 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button id="save-appointment" class="btn btn-info"><?= lang('save') ?></button> <button id="save-appointment" class="btn btn-primary"><?= lang('save') ?></button>
<button id="cancel-appointment" class="btn btn-light" data-dismiss="modal"><?= lang('cancel') ?></button> <button id="cancel-appointment" class="btn btn-light"
data-dismiss="modal"><?= lang('cancel') ?></button>
</div> </div>
</div> </div>
</div> </div>
@ -329,7 +344,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h3 class="modal-title"><?= lang('new_unavailable_title') ?></h3> <h3 class="modal-title"><?= lang('new_unavailable_title') ?></h3>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="modal-message alert d-none"></div> <div class="modal-message alert d-none"></div>
@ -380,8 +395,9 @@
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button id="save-unavailable" class="btn btn-info"><?= lang('save') ?></button> <button id="save-unavailable" class="btn btn-primary"><?= lang('save') ?></button>
<button id="cancel-unavailable" class="btn btn-light" data-dismiss="modal"><?= lang('cancel') ?></button> <button id="cancel-unavailable" class="btn btn-light"
data-dismiss="modal"><?= lang('cancel') ?></button>
</div> </div>
</div> </div>
</div> </div>
@ -394,7 +410,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h3 class="modal-title"><?= lang('new_extra_period_title') ?></h3> <h3 class="modal-title"><?= lang('new_extra_period_title') ?></h3>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="modal-message alert d-none"></div> <div class="modal-message alert d-none"></div>
@ -453,17 +469,18 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3 class="modal-title"><?= lang('select_google_calendar') ?></h3> <h3 class="modal-title"><?= lang('select_google_calendar') ?></h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="form-group"> <div class="form-group">
<label for="google-calendar" class="control-label"><?= lang('select_google_calendar_prompt') ?></label> <label for="google-calendar"
class="control-label"><?= lang('select_google_calendar_prompt') ?></label>
<select id="google-calendar" class="form-control"></select> <select id="google-calendar" class="form-control"></select>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button id="select-calendar" class="btn btn-info"><?= lang('select') ?></button> <button id="select-calendar" class="btn btn-primary"><?= lang('select') ?></button>
<button id="close-calendar" class="btn btn-light" data-dismiss="modal"><?= lang('close') ?></button> <button id="close-calendar" class="btn btn-light" data-dismiss="modal"><?= lang('close') ?></button>
</div> </div>
</div> </div>

4
application/views/backend/customers.php
View file

@ -54,7 +54,7 @@
<div class="btn-toolbar mb-4"> <div class="btn-toolbar mb-4">
<div id="add-edit-delete-group" class="btn-group"> <div id="add-edit-delete-group" class="btn-group">
<?php if ($privileges[PRIV_CUSTOMERS]['add'] === TRUE): ?> <?php if ($privileges[PRIV_CUSTOMERS]['add'] === TRUE): ?>
<button id="add-customer" class="btn btn-info"> <button id="add-customer" class="btn btn-primary">
<i class="fas fa-plus"></i> <i class="fas fa-plus"></i>
<?= lang('add') ?> <?= lang('add') ?>
</button> </button>
@ -76,7 +76,7 @@
</div> </div>
<div id="save-cancel-group" class="btn-group" style="display:none;"> <div id="save-cancel-group" class="btn-group" style="display:none;">
<button id="save-customer" class="btn btn-info"> <button id="save-customer" class="btn btn-primary">
<i class="far fa-check-circle"></i> <i class="far fa-check-circle"></i>
<?= lang('save') ?> <?= lang('save') ?>
</button> </button>

8
application/views/backend/services.php
View file

@ -61,7 +61,7 @@
<div class="record-details column col-xs-12 col-md-5"> <div class="record-details column col-xs-12 col-md-5">
<div class="btn-toolbar mb-4"> <div class="btn-toolbar mb-4">
<div class="add-edit-delete-group btn-group"> <div class="add-edit-delete-group btn-group">
<button id="add-service" class="btn btn-info"> <button id="add-service" class="btn btn-primary">
<i class="fas fa-plus"></i> <i class="fas fa-plus"></i>
<?= lang('add') ?> <?= lang('add') ?>
</button> </button>
@ -76,7 +76,7 @@
</div> </div>
<div class="save-cancel-group btn-group" style="display:none;"> <div class="save-cancel-group btn-group" style="display:none;">
<button id="save-service" class="btn btn-info"> <button id="save-service" class="btn btn-primary">
<i class="far fa-check-circle"></i> <i class="far fa-check-circle"></i>
<?= lang('save') ?> <?= lang('save') ?>
</button> </button>
@ -181,7 +181,7 @@
<div class="record-details col-xs-12 col-md-5"> <div class="record-details col-xs-12 col-md-5">
<div class="btn-toolbar mb-4"> <div class="btn-toolbar mb-4">
<div class="add-edit-delete-group btn-group"> <div class="add-edit-delete-group btn-group">
<button id="add-category" class="btn btn-info"> <button id="add-category" class="btn btn-primary">
<i class="fas fa-plus"></i> <i class="fas fa-plus"></i>
<?= lang('add') ?> <?= lang('add') ?>
</button> </button>
@ -196,7 +196,7 @@
</div> </div>
<div class="save-cancel-group btn-group" style="display:none;"> <div class="save-cancel-group btn-group" style="display:none;">
<button id="save-category" class="btn btn-info"> <button id="save-category" class="btn btn-primary">
<i class="far fa-check-circle"></i> <i class="far fa-check-circle"></i>
<?= lang('save') ?> <?= lang('save') ?>
</button> </button>

12
application/views/backend/settings.php
View file

@ -69,7 +69,7 @@
<legend class="border-bottom mb-4"> <legend class="border-bottom mb-4">
<?= lang('general_settings') ?> <?= lang('general_settings') ?>
<?php if ($privileges[PRIV_SYSTEM_SETTINGS]['edit'] == TRUE): ?> <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['edit'] == TRUE): ?>
<button type="button" class="save-settings btn btn-info btn-xs mb-2" <button type="button" class="save-settings btn btn-primary btn-sm mb-2"
title="<?= lang('save') ?>"> title="<?= lang('save') ?>">
<i class="far fa-save"></i> <i class="far fa-save"></i>
<?= lang('save') ?> <?= lang('save') ?>
@ -149,7 +149,7 @@
<div class="form-group"> <div class="form-group">
<label for="google-analytics-code"> <label for="google-analytics-code">
Google Analytics ID</label> Google Analytics ID</label>
<input id="google-analytics-code" placeholder="UA-XXXXXXXX-X" <input id="google-analytics-code" placeholder="UA-XXXXXXXX-XX"
data-field="google_analytics_code" class="form-control"> data-field="google_analytics_code" class="form-control">
<span class="help-block"> <span class="help-block">
<?= lang('google_analytics_code_hint') ?> <?= lang('google_analytics_code_hint') ?>
@ -228,7 +228,7 @@
<legend class="border-bottom mb-4"> <legend class="border-bottom mb-4">
<?= lang('business_logic') ?> <?= lang('business_logic') ?>
<?php if ($privileges[PRIV_SYSTEM_SETTINGS]['edit'] == TRUE): ?> <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['edit'] == TRUE): ?>
<button type="button" class="save-settings btn btn-info btn-xs mb-2" <button type="button" class="save-settings btn btn-primary btn-sm mb-2"
title="<?= lang('save') ?>"> title="<?= lang('save') ?>">
<i class="far fa-save"></i> <i class="far fa-save"></i>
<?= lang('save') ?> <?= lang('save') ?>
@ -280,7 +280,7 @@
</span> </span>
<div class="mt-2"> <div class="mt-2">
<button type="button" class="add-break btn btn-info"> <button type="button" class="add-break btn btn-primary">
<i class="fas fa-plus"></i> <i class="fas fa-plus"></i>
<?= lang('add_break');?> <?= lang('add_break');?>
</button> </button>
@ -314,7 +314,7 @@
<legend class="border-bottom mb-4"> <legend class="border-bottom mb-4">
<?= lang('legal_contents') ?> <?= lang('legal_contents') ?>
<?php if ($privileges[PRIV_SYSTEM_SETTINGS]['edit'] == TRUE): ?> <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['edit'] == TRUE): ?>
<button type="button" class="save-settings btn btn-info btn-xs mb-2" <button type="button" class="save-settings btn btn-primary btn-sm mb-2"
title="<?= lang('save') ?>"> title="<?= lang('save') ?>">
<i class="far fa-save"></i> <i class="far fa-save"></i>
<?= lang('save') ?> <?= lang('save') ?>
@ -393,7 +393,7 @@
<legend class="border-bottom mb-4"> <legend class="border-bottom mb-4">
<?= lang('personal_information') ?> <?= lang('personal_information') ?>
<?php if ($privileges[PRIV_USER_SETTINGS]['edit'] == TRUE): ?> <?php if ($privileges[PRIV_USER_SETTINGS]['edit'] == TRUE): ?>
<button type="button" class="save-settings btn btn-info btn-xs mb-2" <button type="button" class="save-settings btn btn-primary btn-sm mb-2"
title="<?= lang('save') ?>"> title="<?= lang('save') ?>">
<i class="far fa-save"></i> <i class="far fa-save"></i>
<?= lang('save') ?> <?= lang('save') ?>

18
application/views/backend/users.php
View file

@ -73,7 +73,7 @@
<div class="record-details column col-xs-12 col-md-7"> <div class="record-details column col-xs-12 col-md-7">
<div class="float-md-left mb-4"> <div class="float-md-left mb-4">
<div class="add-edit-delete-group btn-group"> <div class="add-edit-delete-group btn-group">
<button id="add-provider" class="btn btn-info"> <button id="add-provider" class="btn btn-primary">
<i class="fas fa-plus"></i> <i class="fas fa-plus"></i>
<?= lang('add') ?> <?= lang('add') ?>
</button> </button>
@ -88,7 +88,7 @@
</div> </div>
<div class="save-cancel-group btn-group" style="display:none;"> <div class="save-cancel-group btn-group" style="display:none;">
<button id="save-provider" class="btn btn-info"> <button id="save-provider" class="btn btn-primary">
<i class="far fa-check-circle"></i> <i class="far fa-check-circle"></i>
<?= lang('save') ?> <?= lang('save') ?>
</button> </button>
@ -212,7 +212,7 @@
<div class="working-plan-view provider-view" style="display: none;"> <div class="working-plan-view provider-view" style="display: none;">
<h3><?= lang('working_plan') ?></h3> <h3><?= lang('working_plan') ?></h3>
<button id="reset-working-plan" class="btn btn-info" <button id="reset-working-plan" class="btn btn-primary"
title="<?= lang('reset_working_plan') ?>"> title="<?= lang('reset_working_plan') ?>">
<i class="fas fa-redo-alt"></i> <i class="fas fa-redo-alt"></i>
<?= lang('reset_plan') ?></button> <?= lang('reset_plan') ?></button>
@ -236,7 +236,7 @@
</span> </span>
<div> <div>
<button type="button" class="add-break btn btn-info"> <button type="button" class="add-break btn btn-primary">
<i class="fas fa-plus"></i> <i class="fas fa-plus"></i>
<?= lang('add_break') ?> <?= lang('add_break') ?>
</button> </button>
@ -265,7 +265,7 @@
</span> </span>
<div> <div>
<button type="button" class="add-extra-periods btn btn-info"> <button type="button" class="add-extra-periods btn btn-primary">
<i class="fas fa-plus"></i> <i class="fas fa-plus"></i>
<?= lang('add_extra_period') ?> <?= lang('add_extra_period') ?>
</button> </button>
@ -319,7 +319,7 @@
<div class="record-details column col-xs-12 col-md-7"> <div class="record-details column col-xs-12 col-md-7">
<div class="btn-toolbar mb-4"> <div class="btn-toolbar mb-4">
<div class="add-edit-delete-group btn-group"> <div class="add-edit-delete-group btn-group">
<button id="add-secretary" class="btn btn-info"> <button id="add-secretary" class="btn btn-primary">
<i class="fas fa-plus"></i> <i class="fas fa-plus"></i>
<?= lang('add') ?> <?= lang('add') ?>
</button> </button>
@ -334,7 +334,7 @@
</div> </div>
<div class="save-cancel-group btn-group" style="display:none;"> <div class="save-cancel-group btn-group" style="display:none;">
<button id="save-secretary" class="btn btn-info"> <button id="save-secretary" class="btn btn-primary">
<i class="far fa-check-circle"></i> <i class="far fa-check-circle"></i>
<?= lang('save') ?> <?= lang('save') ?>
</button> </button>
@ -479,7 +479,7 @@
<div class="record-details column col-xs-12 col-md-7"> <div class="record-details column col-xs-12 col-md-7">
<div class="btn-toolbar mb-4"> <div class="btn-toolbar mb-4">
<div class="add-edit-delete-group btn-group"> <div class="add-edit-delete-group btn-group">
<button id="add-admin" class="btn btn-info"> <button id="add-admin" class="btn btn-primary">
<i class="fas fa-plus"></i> <i class="fas fa-plus"></i>
<?= lang('add') ?> <?= lang('add') ?>
</button> </button>
@ -494,7 +494,7 @@
</div> </div>
<div class="save-cancel-group btn-group" style="display:none;"> <div class="save-cancel-group btn-group" style="display:none;">
<button id="save-admin" class="btn btn-info"> <button id="save-admin" class="btn btn-primary">
<i class="far fa-check-circle"></i> <i class="far fa-check-circle"></i>
<?= lang('save') ?> <?= lang('save') ?>
</button> </button>

2
application/views/user/login.php
View file

@ -82,7 +82,7 @@
</div> </div>
<br> <br>
<button type="submit" id="login" class="btn btn-info"> <button type="submit" id="login" class="btn btn-primary">
<?= lang('login') ?> <?= lang('login') ?>
</button> </button>

12
assets/css/backend.css
View file

@ -20,8 +20,7 @@ root {
/* BACKEND GENERAL ELEMENTS /* BACKEND GENERAL ELEMENTS
-------------------------------------------------------------------- */ -------------------------------------------------------------------- */
#header { #header {
background-color: #39c678; background-color: #429a82;
border-bottom: 4px solid #c0f1d6;
box-shadow: none; box-shadow: none;
border-radius: 0; border-radius: 0;
margin-bottom: 15px; margin-bottom: 15px;
@ -249,7 +248,7 @@ body legend {
.backend-page .filter-records .results .entry.selected { .backend-page .filter-records .results .entry.selected {
background-color: #F4F4F4; background-color: #F4F4F4;
border-right: 5px solid #39c678; border-right: 5px solid #429a82;
} }
.backend-page .filter-records .results hr { .backend-page .filter-records .results hr {
@ -514,13 +513,8 @@ body .form-horizontal .controls {
margin-right: 20px; margin-right: 20px;
} }
#calendar .calendar-view .date-column .provider-column .not-working { #calendar .fc-unavailable {
width: 115px;
border-radius: 3px;
padding: 10px;
text-align: center;
background: #eaeaea url('../img/unavailable.jpg'); background: #eaeaea url('../img/unavailable.jpg');
opacity: 0.7;
} }
#calendar .calendar-view .date-column .provider-column { #calendar .calendar-view .date-column .provider-column {

1
assets/css/frontend.css
View file

@ -232,6 +232,7 @@ body {
#message-frame #message-icon, #message-frame #message-icon,
#success-frame #success-icon { #success-frame #success-icon {
margin-top: 20px; margin-top: 20px;
margin-right: 20px;
} }
#message-frame .alert, #message-frame .alert,

2
assets/js/backend_calendar_default_view.js
View file

@ -1542,7 +1542,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
$selectFilterItem.find('option:selected').attr('type'), $selectFilterItem.find('option:selected').attr('type'),
$calendar.fullCalendar('getView').start, $calendar.fullCalendar('getView').start,
$calendar.fullCalendar('getView').end); $calendar.fullCalendar('getView').end);
}, 10000); }, 30000);
}; };
})(window.BackendCalendarDefaultView); })(window.BackendCalendarDefaultView);

8
assets/js/backend_settings_system.js
View file

@ -76,22 +76,22 @@
settings.push({ settings.push({
name: 'customer_notifications', name: 'customer_notifications',
value: $('#customer-notifications').hasClass('active') === true ? '1' : '0' value: $('#customer-notifications').hasClass('active') ? '1' : '0'
}); });
settings.push({ settings.push({
name: 'require_captcha', name: 'require_captcha',
value: $('#require-captcha').hasClass('active') === true ? '1' : '0' value: $('#require-captcha').hasClass('active') ? '1' : '0'
}); });
settings.push({ settings.push({
name: 'require_phone_number', name: 'require_phone_number',
value: $('#require-phone-number').hasClass('active') === true ? '1' : '0' value: $('#require-phone-number').hasClass('active') ? '1' : '0'
}); });
settings.push({ settings.push({
name: 'display_any_provider', name: 'display_any_provider',
value: $('#display-any-provider').hasClass('active') === true ? '1' : '0' value: $('#display-any-provider').hasClass('active') ? '1' : '0'
}); });