From f51b4cbe8d117a24d00c5d06e097da6008d3cfdf Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Sat, 16 Jul 2016 17:36:33 +0200
Subject: [PATCH] Solved problem with loading spinner in installation page
 (fixes #136).

---
 .../views/general/installation.php            | 12 +++++-----
 src/assets/js/installation.js                 | 22 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/application/views/general/installation.php b/src/application/views/general/installation.php
index 10199977..0397e661 100755
--- a/src/application/views/general/installation.php
+++ b/src/application/views/general/installation.php
@@ -11,7 +11,7 @@
         href="<?php echo $base_url; ?>/assets/img/favicon.ico">
 
     <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"
         href="<?php echo $base_url; ?>/assets/css/general.css">
@@ -72,13 +72,13 @@
             <p>
                 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
-                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.
 
-                If you face any problems during the usage of Easy!Appointments you can always check
-                the official <a href="https://github.com/alextselegidis/easyappointments/wiki">Wiki Pages</a>
-                and <a href="http://groups.google.com/group/easy-appointments">Support Group</a>
-                for getting help. You may also submit new issues on
+                If you face any problems during the usage of Easy!Appointments you can always check the 
+                <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> for getting help. You 
+                may also submit new issues on
                 <a href="https://github.com/alextselegidis/easyappointments/issues">GitHub Issues</a>
                 in order to help our development process.
             </p>
diff --git a/src/assets/js/installation.js b/src/assets/js/installation.js
index b50ab7ca..36e6fa7c 100644
--- a/src/assets/js/installation.js
+++ b/src/assets/js/installation.js
@@ -12,16 +12,16 @@
 $(document).ready(function() {
     'use strict';
 
-    var MIN_PASSWORD_LENGTH = 7,
-        AJAX_SUCCESS = 'SUCCESS',
-        AJAX_FAILURE = 'FAILURE';
+    var MIN_PASSWORD_LENGTH = 7;
+    var AJAX_SUCCESS = 'SUCCESS';
+    var AJAX_FAILURE = 'FAILURE';
 
     $(document).ajaxStart(function() {
-        $('#loading').show();
+        $('#loading').removeClass('hidden');
     });
 
     $(document).ajaxStop(function() {
-        $('#loading').hide();
+        $('#loading').addClass('hidden');
     });
 
     /**
@@ -32,12 +32,12 @@ $(document).ready(function() {
             return;
         }
 
-        var postUrl = GlobalVariables.baseUrl + '/index.php/installation/ajax_install',
-            postData = {
-                csrfToken: GlobalVariables.csrfToken,
-                admin: JSON.stringify(getAdminData()),
-                company: JSON.stringify(getCompanyData())
-            };
+        var postUrl = GlobalVariables.baseUrl + '/index.php/installation/ajax_install';
+        var postData = {
+            csrfToken: GlobalVariables.csrfToken,
+            admin: JSON.stringify(getAdminData()),
+            company: JSON.stringify(getCompanyData())
+        };
 
         $.ajax({
             url: postUrl,