From ee5acad97ad2c9a9673ec59e18fddfe9252ec2b0 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 5 Feb 2015 20:39:43 -0500 Subject: [PATCH] Fix some install stuff. Everything appears to be working! --- install/install.php | 3 ++- js/modsForHesk-javascript.js | 15 ++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/install/install.php b/install/install.php index f516c62b..514cecef 100644 --- a/install/install.php +++ b/install/install.php @@ -176,7 +176,7 @@ function hesk_iFinish()
Success! HESK Successfully installed
Next Steps:

    -
  1. Don't forget to run the Mods for HESK Installation!
  2. +
  3. Don't forget to run the Mods for HESK Installation!
  4. Remember your login details:
    @@ -613,6 +613,7 @@ function hesk_iSaveSettings()
     	}
     	$set['debug_mode'] = 0;
     
    +    $set['email_providers'] = count($set['email_providers']) ?  "'" . implode("','", $set['email_providers']) . "'" : '';
         $set['notify_spam_tags'] = count($set['notify_spam_tags']) ?  "'" . implode("','", $set['notify_spam_tags']) . "'" : '';
     
         // Check if PHP version is 5.2.3+
    diff --git a/js/modsForHesk-javascript.js b/js/modsForHesk-javascript.js
    index 62c911bd..0b0924c0 100644
    --- a/js/modsForHesk-javascript.js
    +++ b/js/modsForHesk-javascript.js
    @@ -2,7 +2,9 @@
     var loadJquery = function()
     {
         //-- Activate tooltips
    -    $('[data-toggle="tooltip"]').tooltip();
    +    $('[data-toggle="tooltip"]').tooltip({
    +        container: 'body'
    +    });
     
         //-- Activate popovers
         $('[data-toggle="popover"]').popover({
    @@ -196,8 +198,6 @@ function migrateIpEmailBans(version, cssclass) {
                 } else {
                     migrateComplete();
                 }
    -            //if ask user, markUpdateAsAttention and append to Attention! div
    -            //otherwise, mark success and move to completion script.
             },
             error: function(data) {
                 appendToInstallConsole('ERROR: ' + data.responseText);
    @@ -207,8 +207,13 @@ function migrateIpEmailBans(version, cssclass) {
     }
     
     function installationFinished() {
    -    var html = '

    Hey! We finished!

    '; - $('#install-information').html(html); + var output = '
    ' + + '
    ' + + '

    ' + + '

    Awesome! The installation / upgrade has completed. Please delete the install directory and then proceed to your helpdesk!

    ' + + '
    ' + + '
    '; + $('#install-information').html(output); } function getContentForMigratePrompt(users) {