paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #919 from mailcow/master 

Update base branch
master
Phoenix Eve Aspacio 2018-01-16 22:18:25 +08:00 committed by GitHub
parent b383391e2c 24d757d7db
commit d171da35de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/web/inc/footer.inc.php
View File

@ -186,6 +186,7 @@ $(document).ready(function() {
$(this).prop("disabled",true); $(this).prop("disabled",true);
$(this).html('<span class="glyphicon glyphicon-refresh glyphicon-spin"></span> '); $(this).html('<span class="glyphicon glyphicon-refresh glyphicon-spin"></span> ');
$('#statusTriggerRestartContainer').text('Restarting container, this may take a while... '); $('#statusTriggerRestartContainer').text('Restarting container, this may take a while... ');
$('#statusTriggerRestartContainer2').text('Reloading webpage... ');
$.ajax({ $.ajax({
method: 'get', method: 'get',
url: '/inc/ajax/container_ctrl.php', url: '/inc/ajax/container_ctrl.php',
@ -200,6 +201,9 @@ $(document).ready(function() {
success: function(data) { success: function(data) {
$('#statusTriggerRestartContainer').append(data); $('#statusTriggerRestartContainer').append(data);
$('#triggerRestartContainer').html('<span class="glyphicon glyphicon-ok"></span> '); $('#triggerRestartContainer').html('<span class="glyphicon glyphicon-ok"></span> ');
$('#statusTriggerRestartContainer2').append(data);
$('#triggerRestartContainer').html('<span class="glyphicon glyphicon-ok"></span> ');
location.reload();
} }
}); });
}); });

1
data/web/modals/footer.php
View File

@ -196,6 +196,7 @@ if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == 'admi
<button class="btn btn-md btn-primary" id="triggerRestartContainer"><?= $lang['footer']['restart_now']; ?></button> <button class="btn btn-md btn-primary" id="triggerRestartContainer"><?= $lang['footer']['restart_now']; ?></button>
<br><br> <br><br>
<div id="statusTriggerRestartContainer"></div> <div id="statusTriggerRestartContainer"></div>
<div id="statusTriggerRestartContainer2"></div>
</div> </div>
</div> </div>
</div> </div>