Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some install stuff. Everything appears to be working!

Browse Source
This commit is contained in:
Mike Koch 2015-02-05 20:39:43 -05:00
parent bda53ff143
commit ee5acad97a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install/install.php
View File

@ -176,7 +176,7 @@ function hesk_iFinish()
<div class="alert alert-success"><strong>Success!</strong> HESK Successfully installed</div> <div class="alert alert-success"><strong>Success!</strong> HESK Successfully installed</div>
<div class="h3">Next Steps:<br/><br/></div> <div class="h3">Next Steps:<br/><br/></div>
<ol> <ol>
<li><span style="color:#ff0000">Don't forget to run the <a href="<?php echo HESK_PATH . 'install/updateModsForHesk.php'; ?>">Mods for HESK Installation</a>!</li> <li><span style="color:#ff0000">Don't forget to run the <a href="<?php echo HESK_PATH . 'install/mods-for-hesk/modsForHesk.php'; ?>">Mods for HESK Installation</a>!</li>
<li>Remember your login details:<br /> <li>Remember your login details:<br />
<pre style="font-size: 1.17em"> <pre style="font-size: 1.17em">
@ -613,6 +613,7 @@ function hesk_iSaveSettings()
} }
$set['debug_mode'] = 0; $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']) . "'" : ''; $set['notify_spam_tags'] = count($set['notify_spam_tags']) ? "'" . implode("','", $set['notify_spam_tags']) . "'" : '';
// Check if PHP version is 5.2.3+ // Check if PHP version is 5.2.3+

15
js/modsForHesk-javascript.js
View File

@ -2,7 +2,9 @@
var loadJquery = function() var loadJquery = function()
{ {
//-- Activate tooltips //-- Activate tooltips
$('[data-toggle="tooltip"]').tooltip(); $('[data-toggle="tooltip"]').tooltip({
container: 'body'
});
//-- Activate popovers //-- Activate popovers
$('[data-toggle="popover"]').popover({ $('[data-toggle="popover"]').popover({
@ -196,8 +198,6 @@ function migrateIpEmailBans(version, cssclass) {
} else { } else {
migrateComplete(); migrateComplete();
} }
//if ask user, markUpdateAsAttention and append to Attention! div
//otherwise, mark success and move to completion script.
}, },
error: function(data) { error: function(data) {
appendToInstallConsole('ERROR: ' + data.responseText); appendToInstallConsole('ERROR: ' + data.responseText);
@ -207,8 +207,13 @@ function migrateIpEmailBans(version, cssclass) {
} }
function installationFinished() { function installationFinished() {
var html = '<p>Hey! We finished!</p>'; var output = '<div class="panel-body">' +
$('#install-information').html(html); '<div class="col-md-12 text-center">' +
'<i class="fa fa-check fa-4x" style="color: #008000"></i><br><br>' +
'<h4>Awesome! The installation / upgrade has completed. Please delete the <code>install</code> directory and then proceed to your helpdesk!</h4>' +
'</div>' +
'</div>';
$('#install-information').html(output);
} }
function getContentForMigratePrompt(users) { function getContentForMigratePrompt(users) {