diff options
Diffstat (limited to 'modules-available/systemstatus')
4 files changed, 14 insertions, 5 deletions
diff --git a/modules-available/systemstatus/lang/de/template-tags.json b/modules-available/systemstatus/lang/de/template-tags.json index fcf836ec..89066257 100644 --- a/modules-available/systemstatus/lang/de/template-tags.json +++ b/modules-available/systemstatus/lang/de/template-tags.json @@ -1,7 +1,7 @@ { "lang_OK": "OK", "lang_addressConfiguration": "Adresskonfiguration", - "lang_areYouSureNoUndo": "Sind Sie sicher? Diese Aktion kann nicht r\u00fcckg\u00e4ngig gemacht werden.", + "lang_areYouSureReboot": "Server jetzt neustarten?", "lang_attention": "Achtung!", "lang_average": "Durchschnitt", "lang_capacity": "Kapazit\u00e4t", diff --git a/modules-available/systemstatus/lang/en/template-tags.json b/modules-available/systemstatus/lang/en/template-tags.json index 159ae59d..5f6ad898 100644 --- a/modules-available/systemstatus/lang/en/template-tags.json +++ b/modules-available/systemstatus/lang/en/template-tags.json @@ -1,7 +1,7 @@ { "lang_OK": "OK", "lang_addressConfiguration": "Address Configuration", - "lang_areYouSureNoUndo": "Are you sure? This cannot be undone!", + "lang_areYouSureReboot": "Reboot server now?", "lang_attention": "Attention!", "lang_average": "Average", "lang_capacity": "Capacity", diff --git a/modules-available/systemstatus/page.inc.php b/modules-available/systemstatus/page.inc.php index c1c52af0..8a0e5f87 100644 --- a/modules-available/systemstatus/page.inc.php +++ b/modules-available/systemstatus/page.inc.php @@ -231,7 +231,12 @@ class Page_SystemStatus extends Page $data = array('services' => array()); $tasks = array(); - foreach (['dmsd', 'dnbd3-server', 'atftpd'] as $svc) { + $todo = ['dmsd', 'atftpd']; + if (Module::isAvailable('dnbd3') && Dnbd3::isEnabled()) { + $todo[] = 'dnbd3-server'; + } + + foreach ($todo as $svc) { $tasks[] = array( 'name' => $svc, 'task' => Taskmanager::submit('Systemctl', ['service' => $svc, 'operation' => 'is-active']) diff --git a/modules-available/systemstatus/templates/_page.html b/modules-available/systemstatus/templates/_page.html index ca3e6fd2..0de94cad 100644 --- a/modules-available/systemstatus/templates/_page.html +++ b/modules-available/systemstatus/templates/_page.html @@ -92,12 +92,16 @@ <div class ="modal fade" id="rebootServerModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> <div class="modal-dialog" style="width: 400px" role="document"> <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal">×</button> + <b>{{lang_serverReboot}}</b> + </div> <div class="modal-body"> - {{lang_areYouSureNoUndo}} + {{lang_areYouSureReboot}} </div> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button> - <button type="submit" class="btn btn-sm btn-warning"><span class="glyphicon glyphicon-repeat"></span> {{lang_serverReboot}}</button> + <button type="submit" class="btn btn-warning"><span class="glyphicon glyphicon-repeat"></span> {{lang_serverReboot}}</button> </div> </div> </div> |