maket
/
MaketRandevu
1
1
Fork 0
Code Issues 15 Pull Requests Packages Projects Releases 4 Wiki Activity

Restructured the view/js/css files (flatter file structure)

This commit is contained in:
Alex Tselegidis 2021-12-06 09:00:02 +01:00
parent e034404937
commit f1849e3a16
90 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Admins.php
View File

@ -52,7 +52,7 @@ class Admins extends EA_Controller {
$role_slug = session('role_slug');
$this->load->view('pages/admins/admins_page', [
$this->load->view('pages/admins_page', [
'page_title' => lang('admins'),
'active_menu' => PRIV_USERS,
'user_display_name' => $this->accounts->get_user_display_name($user_id),

12
application/controllers/Backend.php
View File

@ -105,7 +105,7 @@ class Backend extends EA_Controller {
$view['edit_appointment'] = NULL;
}
$this->load->view('pages/calendar/calendar_page', $view);
$this->load->view('pages/calendar_page', $view);
}
/**
@ -208,7 +208,7 @@ class Backend extends EA_Controller {
$this->set_user_data($view);
$this->load->view('pages/customers/customers_page', $view);
$this->load->view('pages/customers_page', $view);
}
/**
@ -241,7 +241,7 @@ class Backend extends EA_Controller {
$view['timezones'] = $this->timezones->to_array();
$this->set_user_data($view);
$this->load->view('pages/services/services_page', $view);
$this->load->view('pages/services_page', $view);
}
/**
@ -276,7 +276,7 @@ class Backend extends EA_Controller {
$view['working_plan_exceptions'] = '{}';
$this->set_user_data($view);
$this->load->view('pages/users/users_page', $view);
$this->load->view('pages/users_page', $view);
}
/**
@ -320,7 +320,7 @@ class Backend extends EA_Controller {
$this->set_user_data($view);
$this->load->view('pages/settings/settings_page', $view);
$this->load->view('pages/settings_page', $view);
}
/**
@ -350,6 +350,6 @@ class Backend extends EA_Controller {
$view = ['success' => FALSE, 'exception' => $e->getMessage()];
}
$this->load->view('pages/instance/instance_update_page', $view);
$this->load->view('pages/instance_update_page', $view);
}
}

10
application/controllers/Booking.php
View File

@ -110,7 +110,7 @@ class Booking extends EA_Controller {
if (empty($results))
{
// The requested appointment was not found in the database.
$this->load->view('pages/booking/booking_message_page', [
$this->load->view('pages/booking_message_page', [
'message_title' => lang('appointment_not_found'),
'message_text' => lang('appointment_does_not_exist_in_db'),
'message_icon' => base_url('assets/img/error.png')
@ -130,7 +130,7 @@ class Booking extends EA_Controller {
$hours = floor($book_advance_timeout / 60);
$minutes = ($book_advance_timeout % 60);
$this->load->view('pages/booking/booking_message_page', [
$this->load->view('pages/booking_message_page', [
'message_title' => lang('appointment_locked'),
'message_text' => strtr(lang('appointment_locked_message'), [
'{$limit}' => sprintf('%02d:%02d', $hours, $minutes)
@ -163,7 +163,7 @@ class Booking extends EA_Controller {
$customer = [];
}
$this->load->view('pages/booking/booking_page', [
$this->load->view('pages/booking_page', [
'available_services' => $available_services,
'available_providers' => $available_providers,
'company_name' => $company_name,
@ -238,7 +238,7 @@ class Booking extends EA_Controller {
$exceptions[] = $e;
}
$this->load->view('pages/booking/booking_message_page', [
$this->load->view('pages/booking_message_page', [
'message_title' => lang('appointment_cancelled_title'),
'message_text' => lang('appointment_cancelled'),
'message_icon' => base_url('assets/img/success.png'),
@ -278,7 +278,7 @@ class Booking extends EA_Controller {
$exceptions = $this->session->flashdata('book_success') ?? [];
$this->load->view('pages/booking/booking_success_page', [
$this->load->view('pages/booking_success_page', [
'page_title' => lang('success'),
'appointment_data' => $appointment,
'provider_data' => [

2
application/controllers/Calendar.php
View File

@ -95,7 +95,7 @@ class Calendar extends EA_Controller {
$this->appointments_model->load($edit_appointment, ['customer']);
}
$this->load->view('pages/calendar/calendar_page', [
$this->load->view('pages/calendar_page', [
'page_title' => lang('calendar'),
'active_menu' => PRIV_APPOINTMENTS,
'user_display_name' => $this->accounts->get_user_display_name($user_id),

2
application/controllers/Customers.php
View File

@ -53,7 +53,7 @@ class Customers extends EA_Controller {
$role_slug = session('role_slug');
$this->load->view('pages/customers/customers_page', [
$this->load->view('pages/customers_page', [
'page_title' => lang('customers'),
'active_menu' => PRIV_CUSTOMERS,
'user_display_name' => $this->accounts->get_user_display_name($user_id),

2
application/controllers/Installation.php
View File

@ -46,7 +46,7 @@ class Installation extends EA_Controller {
return;
}
$this->load->view('pages/instance/instance_installation_page', [
$this->load->view('pages/instance_installation_page', [
'base_url' => config('base_url')
]);
}

2
application/controllers/Providers.php
View File

@ -53,7 +53,7 @@ class Providers extends EA_Controller {
$role_slug = session('role_slug');
$this->load->view('pages/providers/providers_page', [
$this->load->view('pages/providers_page', [
'page_title' => lang('providers'),
'active_menu' => PRIV_USERS,
'user_display_name' => $this->accounts->get_user_display_name($user_id),

2
application/controllers/Secretaries.php
View File

@ -53,7 +53,7 @@ class Secretaries extends EA_Controller {
$role_slug = session('role_slug');
$this->load->view('pages/secretaries/secretaries_page', [
$this->load->view('pages/secretaries_page', [
'page_title' => lang('secretaries'),
'active_menu' => PRIV_USERS,
'user_display_name' => $this->accounts->get_user_display_name($user_id),

2
application/controllers/Service_categories.php
View File

@ -52,7 +52,7 @@ class Service_categories extends EA_Controller {
$role_slug = session('role_slug');
$this->load->view('pages/service_categories/service_categories_page', [
$this->load->view('pages/service_categories_page', [
'page_title' => lang('services'),
'active_menu' => PRIV_SERVICES,
'user_display_name' => $this->accounts->get_user_display_name($user_id),

2
application/controllers/Services.php
View File

@ -52,7 +52,7 @@ class Services extends EA_Controller {
$role_slug = session('role_slug');
$this->load->view('pages/services/services_page', [
$this->load->view('pages/services_page', [
'page_title' => lang('services'),
'active_menu' => PRIV_SERVICES,
'user_display_name' => $this->accounts->get_user_display_name($user_id),

8
application/controllers/User.php
View File

@ -43,7 +43,7 @@ class User extends EA_Controller {
*/
public function login()
{
$this->load->view('pages/account/account_login_page', [
$this->load->view('pages/account_login_page', [
'base_url' => config('base_url'),
'company_name' => setting('company_name'),
'dest_url' => session('dest_url', site_url('backend'))
@ -57,7 +57,7 @@ class User extends EA_Controller {
{
$this->session->sess_destroy();
$this->load->view('pages/account/account_logout_page', [
$this->load->view('pages/account_logout_page', [
'base_url' => config('base_url'),
'company_name' => setting('company_name')
]);
@ -68,7 +68,7 @@ class User extends EA_Controller {
*/
public function forgot_password()
{
$this->load->view('pages/account/account_recovery_page', [
$this->load->view('pages/account_recovery_page', [
'base_url' => config('base_url'),
'company_name' => setting('company_name')
]);
@ -79,7 +79,7 @@ class User extends EA_Controller {
*/
public function no_permissions()
{
$this->load->view('user/no_privileges', [
$this->load->view('pages/account_no_permissions_page', [
'base_url' => config('base_url'),
'company_name' => setting('company_name')
]);

2
application/controllers/settings/About.php
View File

@ -68,7 +68,7 @@ class About extends EA_Controller {
$role_slug = session('role_slug');
$this->load->view('pages/settings/about/about_page', [
$this->load->view('pages/settings/about_page', [
'page_title' => lang('settings'),
'active_menu' => PRIV_SYSTEM_SETTINGS,
'user_display_name' => $this->accounts->get_user_display_name($user_id),

2
application/controllers/settings/Business_logic.php
View File

@ -68,7 +68,7 @@ class Business_logic extends EA_Controller {
$role_slug = session('role_slug');
$this->load->view('pages/settings/business_logic/business_logic_page', [
$this->load->view('pages/settings/business_logic_page', [
'page_title' => lang('settings'),
'active_menu' => PRIV_SYSTEM_SETTINGS,
'user_display_name' => $this->accounts->get_user_display_name($user_id),

2
application/controllers/settings/Client_form.php
View File

@ -68,7 +68,7 @@ class Client_form extends EA_Controller {
$role_slug = session('role_slug');
$this->load->view('pages/settings/client_form/client_form_page', [
$this->load->view('pages/settings/client_form_page', [
'page_title' => lang('settings'),
'active_menu' => PRIV_SYSTEM_SETTINGS,
'user_display_name' => $this->accounts->get_user_display_name($user_id),

2
application/controllers/settings/Current_user.php
View File

@ -68,7 +68,7 @@ class Current_user extends EA_Controller {
$role_slug = session('role_slug');
$this->load->view('pages/settings/current_user/current_user_page', [
$this->load->view('pages/settings/current_user_page', [
'page_title' => lang('settings'),
'active_menu' => PRIV_SYSTEM_SETTINGS,
'user_display_name' => $this->accounts->get_user_display_name($user_id),

2
application/controllers/settings/General.php
View File

@ -68,7 +68,7 @@ class General extends EA_Controller {
$role_slug = session('role_slug');
$this->load->view('pages/settings/general/general_page', [
$this->load->view('pages/settings/general_page', [
'page_title' => lang('settings'),
'active_menu' => PRIV_SYSTEM_SETTINGS,
'user_display_name' => $this->accounts->get_user_display_name($user_id),

2
application/controllers/settings/Legal_contents.php
View File

@ -68,7 +68,7 @@ class Legal_contents extends EA_Controller {
$role_slug = session('role_slug');
$this->load->view('pages/settings/legal_contents/legal_contents_page', [
$this->load->view('pages/settings/legal_contents_page', [
'page_title' => lang('settings'),
'active_menu' => PRIV_SYSTEM_SETTINGS,
'user_display_name' => $this->accounts->get_user_display_name($user_id),

6
application/migrations/001_specific_calendar_sync.php
View File

@ -232,7 +232,7 @@ class Migration_Specific_calendar_sync extends EA_Migration {
]);
$this->dbforge->add_key('id', TRUE);
$this->dbforge->add_key('id_service_categories');
$this->dbforge->create_table('service_categories', TRUE, ['engine' => 'InnoDB']);
$this->dbforge->create_table('Categories', TRUE, ['engine' => 'InnoDB']);
$this->dbforge->add_field([
'id' => [
@ -395,7 +395,7 @@ class Migration_Specific_calendar_sync extends EA_Migration {
$this->db->query('
ALTER TABLE `' . $this->db->dbprefix('services') . '`
ADD CONSTRAINT `' . $this->db->dbprefix('services') . '_ibfk_1` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('service_categories') . '` (`id`) ON DELETE SET NULL ON UPDATE CASCADE;
ADD CONSTRAINT `' . $this->db->dbprefix('services') . '_ibfk_1` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('Categories') . '` (`id`) ON DELETE SET NULL ON UPDATE CASCADE;
');
$this->db->query('
@ -494,7 +494,7 @@ class Migration_Specific_calendar_sync extends EA_Migration {
$this->dbforge->drop_table('roles');
$this->dbforge->drop_table('secretaries_providers');
$this->dbforge->drop_table('services');
$this->dbforge->drop_table('service_categories');
$this->dbforge->drop_table('Categories');
$this->dbforge->drop_table('services_providers');
$this->dbforge->drop_table('settings');
$this->dbforge->drop_table('user_settings');

8
application/migrations/009_change_column_types.php
View File

@ -157,7 +157,7 @@ class Migration_Change_column_types extends EA_Migration {
]
];
$this->dbforge->modify_column('service_categories', $fields);
$this->dbforge->modify_column('Categories', $fields);
// Settings
$fields = [
@ -210,7 +210,7 @@ class Migration_Change_column_types extends EA_Migration {
ADD CONSTRAINT `fk_' . $this->db->dbprefix('secretaries_providers') . '_2` FOREIGN KEY (`id_users_provider`) REFERENCES `' . $this->db->dbprefix('users') . '` (`id`) ON DELETE CASCADE ON UPDATE CASCADE');
$this->db->query('ALTER TABLE `' . $this->db->dbprefix('services') . '`
ADD CONSTRAINT `' . $this->db->dbprefix('services') . '_ibfk_1` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('service_categories') . '` (`id`) ON DELETE SET NULL ON UPDATE CASCADE');
ADD CONSTRAINT `' . $this->db->dbprefix('services') . '_ibfk_1` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('Categories') . '` (`id`) ON DELETE SET NULL ON UPDATE CASCADE');
$this->db->query('ALTER TABLE `' . $this->db->dbprefix('services_providers') . '`
ADD CONSTRAINT `' . $this->db->dbprefix('services_providers') . '_ibfk_1` FOREIGN KEY (`id_users`) REFERENCES `' . $this->db->dbprefix('users') . '` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
@ -371,7 +371,7 @@ class Migration_Change_column_types extends EA_Migration {
]
];
$this->dbforge->modify_column('service_categories', $fields);
$this->dbforge->modify_column('Categories', $fields);
// Settings
$fields = [
@ -424,7 +424,7 @@ class Migration_Change_column_types extends EA_Migration {
ADD CONSTRAINT `fk_' . $this->db->dbprefix('secretaries_providers') . '_2` FOREIGN KEY (`id_users_provider`) REFERENCES `' . $this->db->dbprefix('users') . '` (`id`) ON DELETE CASCADE ON UPDATE CASCADE');
$this->db->query('ALTER TABLE `' . $this->db->dbprefix('services') . '`
ADD CONSTRAINT `' . $this->db->dbprefix('services') . '_ibfk_1` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('service_categories') . '` (`id`) ON DELETE SET NULL ON UPDATE CASCADE');
ADD CONSTRAINT `' . $this->db->dbprefix('services') . '_ibfk_1` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('Categories') . '` (`id`) ON DELETE SET NULL ON UPDATE CASCADE');
$this->db->query('ALTER TABLE `' . $this->db->dbprefix('services_providers') . '`
ADD CONSTRAINT `' . $this->db->dbprefix('services_providers') . '_ibfk_1` FOREIGN KEY (`id_users`) REFERENCES `' . $this->db->dbprefix('users') . '` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,

4
application/migrations/011_remove_prefix_from_fkey_constraints.php
View File

@ -50,7 +50,7 @@ class Migration_Remove_prefix_from_fkey_constraints extends EA_Migration {
ON UPDATE CASCADE');
$this->db->query('ALTER TABLE `' . $this->db->dbprefix('services') . '`
ADD CONSTRAINT `services_service_categories` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('service_categories') . '` (`id`)
ADD CONSTRAINT `services_service_categories` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('Categories') . '` (`id`)
ON DELETE SET NULL
ON UPDATE CASCADE');
@ -101,7 +101,7 @@ class Migration_Remove_prefix_from_fkey_constraints extends EA_Migration {
ADD CONSTRAINT `fk_' . $this->db->dbprefix('secretaries_providers') . '_2` FOREIGN KEY (`id_users_provider`) REFERENCES `' . $this->db->dbprefix('users') . '` (`id`) ON DELETE CASCADE ON UPDATE CASCADE');
$this->db->query('ALTER TABLE `' . $this->db->dbprefix('services') . '`
ADD CONSTRAINT `' . $this->db->dbprefix('services') . '_ibfk_1` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('service_categories') . '` (`id`) ON DELETE SET NULL ON UPDATE CASCADE');
ADD CONSTRAINT `' . $this->db->dbprefix('services') . '_ibfk_1` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('Categories') . '` (`id`) ON DELETE SET NULL ON UPDATE CASCADE');
$this->db->query('ALTER TABLE `' . $this->db->dbprefix('services_providers') . '`
ADD CONSTRAINT `' . $this->db->dbprefix('services_providers') . '_ibfk_1` FOREIGN KEY (`id_users`) REFERENCES `' . $this->db->dbprefix('users') . '` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,

2
application/views/layouts/account/account_layout.php → application/views/layouts/account_layout.php
View File

@ -18,7 +18,7 @@
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/jquery-ui-dist/jquery-ui.min.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/bootstrap.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/layouts/account/account_layout.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/layouts/account_layout.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/general.css') ?>">
<link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">

0
application/views/layouts/backend/backend_footer.php → application/views/layouts/backend_footer.php
View File

0
application/views/layouts/backend/backend_header.php → application/views/layouts/backend_header.php
View File

4
application/views/layouts/backend/backend_layout.php → application/views/layouts/backend_layout.php
View File

@ -20,7 +20,7 @@
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/trumbowyg/trumbowyg.min.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/select2/select2.min.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/bootstrap.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/layouts/backend/backend_layout.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/layouts/backend_layout.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/general.css') ?>">
<link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">
<link rel="icon" sizes="192x192" href="<?= asset_url('assets/img/logo.png') ?>">
@ -47,7 +47,7 @@
<script src="<?= asset_url('assets/vendor/@fortawesome-fontawesome-free/solid.min.js') ?>"></script>
</head>
<body>
<script src="<?= asset_url('assets/js/layouts/backend/backend.js') ?>"></script>
<script src="<?= asset_url('assets/js/layouts/backend.js') ?>"></script>
<script src="<?= asset_url('assets/js/utils/general_functions.js') ?>"></script>
<?php require 'backend_header.php' ?>

0
application/views/layouts/booking/booking_footer.php → application/views/layouts/booking_footer.php
View File

0
application/views/layouts/booking/booking_header.php → application/views/layouts/booking_header.php
View File

6
application/views/layouts/booking/booking_layout.php → application/views/layouts/booking_layout.php
View File

@ -32,7 +32,7 @@
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/jquery-ui-dist/jquery-ui.min.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/cookieconsent/cookieconsent.min.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/bootstrap.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/layouts/booking/booking_layout.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/layouts/booking_layout.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/general.css') ?>">
<link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">
@ -100,8 +100,8 @@
<script src="<?= asset_url('assets/vendor/moment/moment.min.js') ?>"></script>
<script src="<?= asset_url('assets/vendor/moment-timezone/moment-timezone-with-data.min.js') ?>"></script>
<script src="<?= asset_url('assets/js/utils/general_functions.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/booking/frontend_book_api.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/booking/frontend_book.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/frontend_book_api.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/frontend_book.js') ?>"></script>
<script>
$(function () {

2
application/views/layouts/message/message_layout.php → application/views/layouts/message_layout.php
View File

@ -15,7 +15,7 @@
<link rel="icon" href="<?= asset_url('assets/img/logo.png') ?>" sizes="192x192" type="image/png">
<title><?= $page_title ?> | Easy!Appointments</title>
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/bootstrap.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/layouts/booking/booking_layout.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/layouts/booking_layout.css') ?>">
<?php slot('meta') ?>

4
application/views/pages/account/account_login_page.php → application/views/pages/account_login_page.php
View File

@ -5,7 +5,7 @@
*/
?>
<?php extend('layouts/account/account_layout') ?>
<?php extend('layouts/account_layout') ?>
<?php section('content') ?>
@ -51,6 +51,6 @@
<script src="<?= asset_url('assets/vendor/@fortawesome-fontawesome-free/fontawesome.min.js') ?>"></script>
<script src="<?= asset_url('assets/vendor/@fortawesome-fontawesome-free/solid.min.js') ?>"></script>
<script src="<?= asset_url('assets/js/utils/general_functions.js') ?>"></script>
<script src="<?= asset_url('assets/js/login.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/login.js') ?>"></script>
<?php section('scripts') ?>

2
application/views/pages/account/account_logout_page.php → application/views/pages/account_logout_page.php
View File

@ -1,4 +1,4 @@
<?php extend('layouts/account/account_layout') ?>
<?php extend('layouts/account_layout') ?>
<?php section('content') ?>

2
application/views/pages/account/account_no_permissions_page.php → application/views/pages/account_no_permissions_page.php
View File

@ -1,4 +1,4 @@
<?php extend('layouts/account/account_layout') ?>
<?php extend('layouts/account_layout') ?>
<?php section('content') ?>

2
application/views/pages/account/account_recovery_page.php → application/views/pages/account_recovery_page.php
View File

@ -1,4 +1,4 @@
<?php extend('layouts/account/account_layout') ?>
<?php extend('layouts/account_layout') ?>
<?php section('content') ?>

6
application/views/pages/admins/admins_page.php → application/views/pages/admins_page.php
View File

@ -5,12 +5,12 @@
*/
?>
<?php extend('layouts/backend/backend_layout') ?>
<?php extend('layouts/backend_layout') ?>
<?php section('content') ?>
<script src="<?= asset_url('assets/js/pages/admins/backend_admins_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/admins/backend_admins.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_admins_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_admins.js') ?>"></script>
<script>
var GlobalVariables = {
csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,

0
application/views/pages/booking/booking_cancellation.php → application/views/pages/booking_cancellation.php
View File

2
application/views/pages/booking/booking_message_page.php → application/views/pages/booking_message_page.php
View File

@ -6,7 +6,7 @@
*/
?>
<?php extend('layouts/message/message_layout') ?>
<?php extend('layouts/message_layout') ?>
<?php section('content') ?>

2
application/views/pages/booking/booking_page.php → application/views/pages/booking_page.php
View File

@ -20,7 +20,7 @@
*/
?>
<?php extend('layouts/booking/booking_layout') ?>
<?php extend('layouts/booking_layout') ?>
<?php section('content') ?>

0
application/views/pages/booking/booking_step_1.php → application/views/pages/booking_step_1.php
View File

0
application/views/pages/booking/booking_step_2.php → application/views/pages/booking_step_2.php
View File

0
application/views/pages/booking/booking_step_3.php → application/views/pages/booking_step_3.php
View File

0
application/views/pages/booking/booking_step_4.php → application/views/pages/booking_step_4.php
View File

2
application/views/pages/booking/booking_success_page.php → application/views/pages/booking_success_page.php
View File

@ -8,7 +8,7 @@
*/
?>
<?php extend('layouts/message/message_layout') ?>
<?php extend('layouts/message_layout') ?>
<?php section('content') ?>

16
application/views/pages/calendar/calendar_page.php → application/views/pages/calendar_page.php
View File

@ -19,7 +19,7 @@
*/
?>
<?php extend('layouts/backend/backend_layout') ?>
<?php extend('layouts/backend_layout') ?>
<?php section('styles') ?>
@ -33,13 +33,13 @@
<script src="<?= asset_url('assets/vendor/jquery-jeditable/jquery.jeditable.min.js') ?>"></script>
<script src="<?= asset_url('assets/vendor/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js') ?>"></script>
<script src="<?= asset_url('assets/js/components/working_plan_exceptions_modal.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/calendar/backend_calendar.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/calendar/backend_calendar_default_view.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/calendar/backend_calendar_table_view.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/calendar/backend_calendar_google_sync.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/calendar/backend_calendar_appointments_modal.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/calendar/backend_calendar_unavailability_events_modal.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/calendar/backend_calendar_api.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_calendar.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_calendar_default_view.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_calendar_table_view.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_calendar_google_sync.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_calendar_appointments_modal.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_calendar_unavailability_events_modal.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_calendar_api.js') ?>"></script>
<script>
var GlobalVariables = {
csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,

6
application/views/pages/customers/customers_page.php → application/views/pages/customers_page.php
View File

@ -5,13 +5,13 @@
*/
?>
<?php extend('layouts/backend/backend_layout') ?>
<?php extend('layouts/backend_layout') ?>
<?php section('content') ?>
<script src="<?= asset_url('assets/vendor/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/customers/backend_customers_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/customers/backend_customers.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_customers_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_customers.js') ?>"></script>
<script>
var GlobalVariables = {
csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,

2
application/views/pages/instance/instance_installation_page.php → application/views/pages/instance_installation_page.php
View File

@ -8,7 +8,7 @@
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/bootstrap/bootstrap.min.css') ?>">
<link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/jquery-ui-dist/jquery-ui.min.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/pages/instance/instance_installation_page.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/instance_installation_page.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/general.css') ?>">
</head>
<body>

2
application/views/pages/instance/instance_update_page.php → application/views/pages/instance_update_page.php
View File

@ -15,7 +15,7 @@
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/bootstrap/bootstrap.min.css') ?>">
<link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/jquery-ui-dist/jquery-ui.min.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/pages/update.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/update.css') ?>">
<link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/general.css') ?>">
</head>
<body>

6
application/views/pages/providers/providers_page.php → application/views/pages/providers_page.php
View File

@ -6,12 +6,12 @@
*/
?>
<?php extend('layouts/backend/backend_layout') ?>
<?php extend('layouts/backend_layout') ?>
<?php section('content') ?>
<script src="<?= asset_url('assets/js/pages/providers/backend_providers_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/providers/backend_providers.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_providers_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_providers.js') ?>"></script>
<script src="<?= asset_url('assets/js/utils/working_plan.js') ?>"></script>
<script src="<?= asset_url('assets/js/components/working_plan_exceptions_modal.js') ?>"></script>
<script src="<?= asset_url('assets/vendor/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js') ?>"></script>

6
application/views/pages/secretaries/secretaries_page.php → application/views/pages/secretaries_page.php
View File

@ -6,12 +6,12 @@
*/
?>
<?php extend('layouts/backend/backend_layout') ?>
<?php extend('layouts/backend_layout') ?>
<?php section('content') ?>
<script src="<?= asset_url('assets/js/pages/secretaries/backend_secretaries_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/secretaries/backend_secretaries.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_secretaries_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_secretaries.js') ?>"></script>
<script>
var GlobalVariables = {
csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,

6
application/views/pages/service_categories/service_categories_page.php → application/views/pages/service_categories_page.php
View File

@ -5,12 +5,12 @@
*/
?>
<?php extend('layouts/backend/backend_layout') ?>
<?php extend('layouts/backend_layout') ?>
<?php section('content') ?>
<script src="<?= asset_url('assets/js/pages/service_categories/backend_categories_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/service_categories/backend_categories.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_categories_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_categories.js') ?>"></script>
<script>
var GlobalVariables = {
csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,

6
application/views/pages/services/services_page.php → application/views/pages/services_page.php
View File

@ -5,12 +5,12 @@
*/
?>
<?php extend('layouts/backend/backend_layout') ?>
<?php extend('layouts/backend_layout') ?>
<?php section('content') ?>
<script src="<?= asset_url('assets/js/pages/services/backend_services_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/services/backend_services.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_services_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_services.js') ?>"></script>
<script>
var GlobalVariables = {
csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,

2
application/views/pages/settings/about/about_page.php → application/views/pages/settings/about_page.php
View File

@ -4,7 +4,7 @@
*/
?>
<?php extend('layouts/backend/backend_layout') ?>
<?php extend('layouts/backend_layout') ?>
<?php section('content') ?>

6
application/views/pages/settings/business_logic/business_logic_page.php → application/views/pages/settings/business_logic_page.php
View File

@ -7,12 +7,12 @@
*/
?>
<?php extend('layouts/backend/backend_layout') ?>
<?php extend('layouts/backend_layout') ?>
<?php section('content') ?>
<script src="<?= asset_url('assets/js/pages/settings/backend_settings_business_logic_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/settings/backend_settings_business_logic.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_settings_business_logic_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_settings_business_logic.js') ?>"></script>
<script src="<?= asset_url('assets/js/utils/working_plan.js') ?>"></script>
<script src="<?= asset_url('assets/vendor/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js') ?>"></script>
<script src="<?= asset_url('assets/vendor/jquery-jeditable/jquery.jeditable.min.js') ?>"></script>

6
application/views/pages/settings/client_form/client_form_page.php → application/views/pages/settings/client_form_page.php
View File

@ -7,12 +7,12 @@
*/
?>
<?php extend('layouts/backend/backend_layout') ?>
<?php extend('layouts/backend_layout') ?>
<?php section('content') ?>
<script src="<?= asset_url('assets/js/pages/settings/backend_settings_client_form_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/settings/backend_settings_client_form.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_settings_client_form_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_settings_client_form.js') ?>"></script>
<script>
var GlobalVariables = {
csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,

6
application/views/pages/settings/current_user/current_user_page.php → application/views/pages/settings/current_user_page.php
View File

@ -7,12 +7,12 @@
*/
?>
<?php extend('layouts/backend/backend_layout') ?>
<?php extend('layouts/backend_layout') ?>
<?php section('content') ?>
<script src="<?= asset_url('assets/js/pages/settings/backend_settings_current_user_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/settings/backend_settings_current_user.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_settings_current_user_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_settings_current_user.js') ?>"></script>
<script>
var GlobalVariables = {
csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,

6
application/views/pages/settings/general/general_page.php → application/views/pages/settings/general_page.php
View File

@ -7,12 +7,12 @@
*/
?>
<?php extend('layouts/backend/backend_layout') ?>
<?php extend('layouts/backend_layout') ?>
<?php section('content') ?>
<script src="<?= asset_url('assets/js/pages/settings/backend_settings_general_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/settings/backend_settings_general.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_settings_general_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_settings_general.js') ?>"></script>
<script>
var GlobalVariables = {
csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,

6
application/views/pages/settings/legal_contents/legal_contents_page.php → application/views/pages/settings/legal_contents_page.php
View File

@ -5,12 +5,12 @@
*/
?>
<?php extend('layouts/backend/backend_layout') ?>
<?php extend('layouts/backend_layout') ?>
<?php section('content') ?>
<script src="<?= asset_url('assets/js/pages/settings/backend_settings_legal_contents_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/settings/backend_settings_legal_contents.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_settings_legal_contents_helper.js') ?>"></script>
<script src="<?= asset_url('assets/js/pages/backend_settings_legal_contents.js') ?>"></script>
<script>
var GlobalVariables = {
csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,

2
application/views/pages/users/users_page.php → application/views/users_page.php
View File

@ -20,7 +20,7 @@
*/
?>
<?php extend('layouts/backend/backend_layout') ?>
<?php extend('layouts/backend_layout') ?>
<?php section('content') ?>

0
assets/css/layouts/account/account_layout.scss → assets/css/layouts/account_layout.scss
View File

8
assets/css/layouts/backend/backend_layout.scss → assets/css/layouts/backend_layout.scss
View File

@ -370,7 +370,7 @@ body legend {
}
#calendar-page #calendar .fc-unavailable {
background-image: url('../../../img/unavailable.jpg');
background-image: url('../../img/unavailable.jpg');
font-size: 14px;
border-radius: 0;
font-weight: bold;
@ -389,11 +389,11 @@ body legend {
}
#calendar-page #calendar .fc-break {
background-image: url('../../../img/break.jpg');
background-image: url('../../img/break.jpg');
}
#calendar-page #calendar .fc-custom {
background-image: url('../../../img/custom.jpg');
background-image: url('../../img/custom.jpg');
}
#calendar-page .fc-header {
@ -533,7 +533,7 @@ body .form-horizontal .controls {
}
#calendar .fc-unavailable {
background: #eaeaea url('../../../img/unavailable.jpg');
background: #eaeaea url('../../img/unavailable.jpg');
}
#calendar .calendar-view .date-column .provider-column {

0
assets/css/layouts/booking/booking_layout.scss → assets/css/layouts/booking_layout.scss
View File

0
assets/css/layouts/message/message_layout.scss → assets/css/layouts/message_layout.scss
View File

0
assets/css/pages/admins/admins_page.scss → assets/css/pages/admins_page.scss
View File

0
assets/css/pages/instance/instance_installation_page.scss → assets/css/pages/instance_installation_page.scss
View File

0
assets/css/pages/instance/instance_update_page.scss → assets/css/pages/instance_update_page.scss
View File

0
assets/js/layouts/backend/backend.js → assets/js/layouts/backend.js
View File

0
assets/js/pages/admins/backend_admins.js → assets/js/pages/backend_admins.js
View File

0
assets/js/pages/admins/backend_admins_helper.js → assets/js/pages/backend_admins_helper.js
View File

0
assets/js/pages/calendar/backend_calendar.js → assets/js/pages/backend_calendar.js
View File

0
assets/js/pages/calendar/backend_calendar_api.js → assets/js/pages/backend_calendar_api.js
View File

0
assets/js/pages/calendar/backend_calendar_appointments_modal.js → assets/js/pages/backend_calendar_appointments_modal.js
View File

0
assets/js/pages/calendar/backend_calendar_default_view.js → assets/js/pages/backend_calendar_default_view.js
View File

0
assets/js/pages/calendar/backend_calendar_google_sync.js → assets/js/pages/backend_calendar_google_sync.js
View File

0
assets/js/pages/calendar/backend_calendar_table_view.js → assets/js/pages/backend_calendar_table_view.js
View File

0
assets/js/pages/calendar/backend_calendar_unavailability_events_modal.js → assets/js/pages/backend_calendar_unavailability_events_modal.js
View File

0
assets/js/pages/calendar/backend_calendar_working_plan_exceptions_modal.js → assets/js/pages/backend_calendar_working_plan_exceptions_modal.js
View File

0
assets/js/pages/service_categories/backend_categories.js → assets/js/pages/backend_categories.js
View File

0
assets/js/pages/service_categories/backend_categories_helper.js → assets/js/pages/backend_categories_helper.js
View File

0
assets/js/pages/customers/backend_customers.js → assets/js/pages/backend_customers.js
View File

0
assets/js/pages/customers/backend_customers_helper.js → assets/js/pages/backend_customers_helper.js
View File

0
assets/js/pages/providers/backend_providers.js → assets/js/pages/backend_providers.js
View File

0
assets/js/pages/providers/backend_providers_helper.js → assets/js/pages/backend_providers_helper.js
View File

0
assets/js/pages/secretaries/backend_secretaries.js → assets/js/pages/backend_secretaries.js
View File

0
assets/js/pages/secretaries/backend_secretaries_helper.js → assets/js/pages/backend_secretaries_helper.js
View File

0
assets/js/pages/services/backend_services.js → assets/js/pages/backend_services.js
View File

0
assets/js/pages/services/backend_services_helper.js → assets/js/pages/backend_services_helper.js
View File

0
assets/js/pages/account/forgot_password.js → assets/js/pages/forgot_password.js
View File

0
assets/js/pages/booking/frontend_book.js → assets/js/pages/frontend_book.js
View File

2
assets/js/pages/booking/frontend_book_api.js → assets/js/pages/frontend_book_api.js
View File

@ -207,7 +207,7 @@ window.FrontendBookApi = window.FrontendBookApi || {};
}
window.location.href =
GlobalVariables.baseUrl + '/index.php/appointments/book_success/' + response.appointment_hash;
GlobalVariables.baseUrl + '/index.php/booking/book_success/' + response.appointment_hash;
})
.fail(function (jqxhr, textStatus, errorThrown) {
$('.captcha-title button').trigger('click');

0
assets/js/pages/booking/frontend_book_success.js → assets/js/pages/frontend_book_success.js
View File

0
assets/js/pages/instance/installation.js → assets/js/pages/installation.js
View File

0
assets/js/pages/account/login.js → assets/js/pages/login.js
View File