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

Overall UX/UI complete. Need to test the actual migrations

Browse Source
This commit is contained in:
Mike Koch 2017-10-12 22:11:51 -04:00
parent d007792f3a
commit 97e4f4ae4f
No known key found for this signature in database
GPG Key ID: 9BA5D7F8391455ED
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
install/index.php
View File

@ -130,15 +130,24 @@ if (hesk_dbNumRows($tableSql) > 0) {
</table> </table>
</div> </div>
<div data-step="install-or-update" class="text-center" style="display: none"> <div data-step="install-or-update" class="text-center" style="display: none">
<i class="fa fa-spin fa-spinner fa-4x"></i> <div id="spinner">
<i class="fa fa-check-circle fa-4x" style="color: green; display: none" id="finished-install"></i> <i class="fa fa-spin fa-spinner fa-4x"></i>
<h4>Initializing...</h4>
</div>
<div id="progress-bar" class="progress" style="display: none"> <div id="progress-bar" class="progress" style="display: none">
<div class="progress-bar progress-bar-success progress-bar-striped active" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" <div class="progress-bar progress-bar-success progress-bar-striped active" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"
style="width: 0"> style="width: 0">
</div> </div>
</div> </div>
<br>
<input type="hidden" name="starting-migration-number" value="<?php echo $startingMigrationNumber; ?>"> <input type="hidden" name="starting-migration-number" value="<?php echo $startingMigrationNumber; ?>">
</div> </div>
<div data-step="complete" class="text-center" style="display: none">
<i class="fa fa-check-circle fa-4x" style="color: green"></i><br><br>
<h4>Make sure to delete your <code>/install</code> folder and then proceed to your
<a href="<?php echo $hesk_settings['hesk_url']; ?>">help desk</a>.</h4>
<br>
</div>
<?php // END INSTALL SCREENS ?> <?php // END INSTALL SCREENS ?>
<div id="buttons"> <div id="buttons">
<div class="btn btn-primary" id="back-button" style="display: none;"><i class="fa fa-chevron-left"></i>&nbsp;&nbsp;&nbsp;Back</div> <div class="btn btn-primary" id="back-button" style="display: none;"><i class="fa fa-chevron-left"></i>&nbsp;&nbsp;&nbsp;Back</div>

19
install/js/install-script.js
View File

@ -7,7 +7,6 @@ var steps = [
{ {
name: 'db-confirm', name: 'db-confirm',
text: 'Confirm the information below', text: 'Confirm the information below',
showBack: true,
callback: undefined callback: undefined
}, },
{ {
@ -47,13 +46,6 @@ function goToStep(step) {
} else { } else {
$('#tools-button').hide(); $('#tools-button').hide();
$('#back-button').show(); $('#back-button').show();
if (!steps[step].showBack) {
$('#back-button').hide();
}
if (!steps[step].showNext) {
$('#next-button').hide();
}
} }
if (step === steps.length - 1) { if (step === steps.length - 1) {
@ -62,6 +54,15 @@ function goToStep(step) {
$('#next-button').show(); $('#next-button').show();
} }
// Back/Next button overrides
if (steps[step].showBack !== undefined && !steps[step].showBack) {
$('#back-button').hide();
}
if (steps[step].showNext !== undefined && !steps[step].showNext) {
console.log('hiding this');
$('#next-button').hide();
}
$('#header-text').text(steps[step].text); $('#header-text').text(steps[step].text);
if (steps[step].callback !== undefined) { if (steps[step].callback !== undefined) {
@ -80,7 +81,7 @@ function installOrUpdate() {
success: function(data) { success: function(data) {
data = JSON.parse(data); data = JSON.parse(data);
$('[data-step="install-or-update"] > .fa-spinner').hide(); $('[data-step="install-or-update"] > #spinner').hide();
$('[data-step="install-or-update"] > .progress').show(); $('[data-step="install-or-update"] > .progress').show();
// Recursive call that will increment by 1 each time // Recursive call that will increment by 1 each time