[systemstatus] fixed inconsistencies

3 files changed, 25 insertions, 3 deletions

diff --git a/modules-available/systemstatus/lang/de/template-tags.json b/modules-available/systemstatus/lang/de/template-tags.json
index 1333fb7d..94488d89 100644
--- a/modules-available/systemstatus/lang/de/template-tags.json
+++ b/modules-available/systemstatus/lang/de/template-tags.json
@@ -1,5 +1,6 @@
 {
     "lang_addressConfiguration": "Adresskonfiguration",
+    "lang_areYouSureNoUndo": "Sind Sie sicher? Diese Aktion kann nicht r\u00fcckg\u00e4ngig gemacht werden.",
     "lang_attention": "Achtung!",
     "lang_average": "Durchschnitt",
     "lang_capacity": "Kapazit\u00e4t",
@@ -12,11 +13,13 @@
     "lang_iAmSure": "Ja, ich bin sicher",
     "lang_logicCPUs": "Logische CPUs",
     "lang_maintenance": "Maintenance",
+    "lang_moduleHeading": "System-Status",
     "lang_notDetermined": "Konnte nicht ermittelt werden",
     "lang_occupied": "Belegt",
     "lang_onlyOS": "Nur OS",
     "lang_overview": "\u00dcbersicht",
     "lang_ramUsage": "RAM-Nutzung",
+    "lang_serverReboot": "Server neustarten",
     "lang_services": "Dienste",
     "lang_space": "Speicherplatz",
     "lang_storeMissingExpected": "VM-Store nicht eingebunden. Erwartet:",
diff --git a/modules-available/systemstatus/lang/en/template-tags.json b/modules-available/systemstatus/lang/en/template-tags.json
index 46b7e18b..3e5a4433 100644
--- a/modules-available/systemstatus/lang/en/template-tags.json
+++ b/modules-available/systemstatus/lang/en/template-tags.json
@@ -1,5 +1,6 @@
 {
     "lang_addressConfiguration": "Address Configuration",
+    "lang_areYouSureNoUndo": "Are you sure? This cannot be undone!",
     "lang_attention": "Attention!",
     "lang_average": "Average",
     "lang_capacity": "Capacity",
@@ -12,11 +13,13 @@
     "lang_iAmSure": "Yes, I am sure",
     "lang_logicCPUs": "Logic CPUs",
     "lang_maintenance": "Maintenance",
+    "lang_moduleHeading": "System Status",
     "lang_notDetermined": "Could not be determined",
     "lang_occupied": "Occupied",
     "lang_onlyOS": "OS Only",
     "lang_overview": "Overview",
     "lang_ramUsage": "RAM Usage",
+    "lang_serverReboot": "Reboot Server",
     "lang_services": "Services",
     "lang_space": "Space",
     "lang_storeMissingExpected": "VM store not mounted. Expected:",
diff --git a/modules-available/systemstatus/templates/_page.html b/modules-available/systemstatus/templates/_page.html
index 48a7e5c4..dbacbda2 100644
--- a/modules-available/systemstatus/templates/_page.html
+++ b/modules-available/systemstatus/templates/_page.html
@@ -1,3 +1,5 @@
+<h1>{{lang_moduleHeading}}</h1>
+
 {{#rebootTask}}
 <div data-tm-id="{{rebootTask}}" data-tm-log="messages">Reboot...</div>
 {{/rebootTask}}
@@ -84,9 +86,23 @@
 						<form class="form-adduser" action="?do=SystemStatus" method="post">
 							<input type="hidden" name="token" value="{{token}}">
 							<input type="hidden" name="action" value="reboot">
-							<div>Server Reboot</div>
-							<label><input type="checkbox" name="confirm" value="yep"> {{lang_iAmSure}}</label>
-							<button class="btn btn-warning btn-xs" type="submit">Reboot</button>
+							<button class="btn btn-warning" type="button" data-toggle="modal" data-target="#rebootServerModal"><span class="glyphicon glyphicon-repeat"></span> {{lang_serverReboot}}</button>
+
+
+							<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-body">
+											{{lang_areYouSureNoUndo}}
+										</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" name="deletelocation" value="{{locationid}}"><span class="glyphicon glyphicon-repeat"></span> {{lang_serverReboot}}</button>
+										</div>
+									</div>
+								</div>
+							</div>
+
 						</form>
 						<div id="dmsd-users"></div>
 					</div>