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

Solved problem with loading spinner in installation page (fixes #136).

Browse source
This commit is contained in:
Alex Tselegidis 2016-07-16 17:36:33 +02:00
parent 8c0d8a76cf
commit f51b4cbe8d
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/application/views/general/installation.php
View file

@ -11,7 +11,7 @@
href="<?php echo $base_url; ?>/assets/img/favicon.ico"> href="<?php echo $base_url; ?>/assets/img/favicon.ico">
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css"
href="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery-ui/jquery-ui.min.css"> href="<?php echo $base_url ?>/assets/ext/jquery-ui/jquery-ui.min.css">
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css"
href="<?php echo $base_url; ?>/assets/css/general.css"> href="<?php echo $base_url; ?>/assets/css/general.css">
@ -72,13 +72,13 @@
<p> <p>
This page will help you set the main settings of your Easy!Appointments installation. This page will help you set the main settings of your Easy!Appointments installation.
You will be able to edit these settings and many more in the backend session of your You will be able to edit these settings and many more in the backend session of your
system. Remember to use the <strong class="text-primary"><?php echo site_url('backend'); ?>/strong> system. Remember to use the <strong class="text-primary"><?php echo site_url('backend'); ?></strong>
url to connect to the backend section of Easy!Appointments. url to connect to the backend section of Easy!Appointments.
If you face any problems during the usage of Easy!Appointments you can always check If you face any problems during the usage of Easy!Appointments you can always check the
the official <a href="https://github.com/alextselegidis/easyappointments/wiki">Wiki Pages</a> <a href="https://github.com/alextselegidis/easyappointments/tree/master/doc">GitHub Documentation</a>
and <a href="http://groups.google.com/group/easy-appointments">Support Group</a> and <a href="http://groups.google.com/group/easy-appointments">Support Group</a> for getting help. You
for getting help. You may also submit new issues on may also submit new issues on
<a href="https://github.com/alextselegidis/easyappointments/issues">GitHub Issues</a> <a href="https://github.com/alextselegidis/easyappointments/issues">GitHub Issues</a>
in order to help our development process. in order to help our development process.
</p> </p>

22
src/assets/js/installation.js
View file

@ -12,16 +12,16 @@
$(document).ready(function() { $(document).ready(function() {
'use strict'; 'use strict';
var MIN_PASSWORD_LENGTH = 7, var MIN_PASSWORD_LENGTH = 7;
AJAX_SUCCESS = 'SUCCESS', var AJAX_SUCCESS = 'SUCCESS';
AJAX_FAILURE = 'FAILURE'; var AJAX_FAILURE = 'FAILURE';
$(document).ajaxStart(function() { $(document).ajaxStart(function() {
$('#loading').show(); $('#loading').removeClass('hidden');
}); });
$(document).ajaxStop(function() { $(document).ajaxStop(function() {
$('#loading').hide(); $('#loading').addClass('hidden');
}); });
/** /**
@ -32,12 +32,12 @@ $(document).ready(function() {
return; return;
} }
var postUrl = GlobalVariables.baseUrl + '/index.php/installation/ajax_install', var postUrl = GlobalVariables.baseUrl + '/index.php/installation/ajax_install';
postData = { var postData = {
csrfToken: GlobalVariables.csrfToken, csrfToken: GlobalVariables.csrfToken,
admin: JSON.stringify(getAdminData()), admin: JSON.stringify(getAdminData()),
company: JSON.stringify(getCompanyData()) company: JSON.stringify(getCompanyData())
}; };
$.ajax({ $.ajax({
url: postUrl, url: postUrl,