[systemstatus] Put overview in tab too

3 files changed, 79 insertions, 73 deletions

diff --git a/modules-available/systemstatus/lang/de/template-tags.json b/modules-available/systemstatus/lang/de/template-tags.json
index fa50d546..f014871b 100644
--- a/modules-available/systemstatus/lang/de/template-tags.json
+++ b/modules-available/systemstatus/lang/de/template-tags.json
@@ -1,6 +1,5 @@
 {
     "lang_addressConfiguration": "Adresskonfiguration",
-    "lang_advanced": "Erweitert \/ Debug",
     "lang_attention": "Achtung!",
     "lang_average": "Durchschnitt",
     "lang_capacity": "Kapazit\u00e4t",
@@ -14,6 +13,7 @@
     "lang_notDetermined": "Konnte nicht ermittelt werden",
     "lang_occupied": "Belegt",
     "lang_onlyOS": "Nur OS",
+    "lang_overview": "\u00dcbersicht",
     "lang_ramUsage": "RAM-Nutzung",
     "lang_services": "Dienste",
     "lang_space": "Speicherplatz",
diff --git a/modules-available/systemstatus/lang/en/template-tags.json b/modules-available/systemstatus/lang/en/template-tags.json
index 69f5740c..719a1155 100644
--- a/modules-available/systemstatus/lang/en/template-tags.json
+++ b/modules-available/systemstatus/lang/en/template-tags.json
@@ -1,6 +1,5 @@
 {
     "lang_addressConfiguration": "Address Configuration",
-    "lang_advanced": "Advanced \/ Debug",
     "lang_attention": "Attention!",
     "lang_average": "Average",
     "lang_capacity": "Capacity",
@@ -14,6 +13,7 @@
     "lang_notDetermined": "Could not be determined",
     "lang_occupied": "Occupied",
     "lang_onlyOS": "OS Only",
+    "lang_overview": "Overview",
     "lang_ramUsage": "RAM Usage",
     "lang_services": "Services",
     "lang_space": "Space",
diff --git a/modules-available/systemstatus/templates/_page.html b/modules-available/systemstatus/templates/_page.html
index 7e8c0e7d..48a7e5c4 100644
--- a/modules-available/systemstatus/templates/_page.html
+++ b/modules-available/systemstatus/templates/_page.html
@@ -2,94 +2,100 @@
 <div data-tm-id="{{rebootTask}}" data-tm-log="messages">Reboot...</div>
 {{/rebootTask}}
 
-<div class="row">
+<ul class="nav nav-tabs tabs-up">
+	<li class="active">
+		<a href="#id-default_pane" id="id-default" class="active" data-toggle="tab" role="tab">
+			{{lang_overview}}
+		</a>
+	</li>
+	{{#tabs}}
+		<li>
+			<a href="#id-{{type}}_pane" class="ajax-tab" id="id-{{type}}" data-toggle="tab" role="tab">
+				{{name}}
+			</a>
+		</li>
+	{{/tabs}}
+</ul>
 
-	<div class="col-sm-6">
-		<div class="panel panel-default">
-			<div class="panel-heading">
-				{{lang_space}}
-			</div>
-			<div class="panel-body" id="diskstat">
-				<span class="glyphicon glyphicon-refresh slx-rotation"></span>
-			</div>
-		</div>
-	</div>
+<div class="tab-content">
 
-	<div class="col-sm-6">
-		<div class="panel panel-default">
-			<div class="panel-heading">
-				{{lang_services}}
+	<div class="tab-pane active" id="id-default_pane">
+		<div class="row">
+
+			<div class="col-sm-6">
+				<div class="panel panel-default">
+					<div class="panel-heading">
+						{{lang_space}}
+					</div>
+					<div class="panel-body" id="diskstat">
+						<span class="glyphicon glyphicon-refresh slx-rotation"></span>
+					</div>
+				</div>
 			</div>
-			<div class="panel-body" id="services">
-				<span class="glyphicon glyphicon-refresh slx-rotation"></span>
+
+			<div class="col-sm-6">
+				<div class="panel panel-default">
+					<div class="panel-heading">
+						{{lang_services}}
+					</div>
+					<div class="panel-body" id="services">
+						<span class="glyphicon glyphicon-refresh slx-rotation"></span>
+					</div>
+				</div>
 			</div>
-		</div>
-	</div>
 
-</div>
+		</div>
 
 
-<div class="row">
+		<div class="row">
 
-	<div class="col-md-6">
-		<div class="panel panel-default">
-			<div class="panel-heading">
-				{{lang_addressConfiguration}}
+			<div class="col-md-6">
+				<div class="panel panel-default">
+					<div class="panel-heading">
+						{{lang_addressConfiguration}}
+					</div>
+					<div class="panel-body" id="addresses">
+						<span class="glyphicon glyphicon-refresh slx-rotation"></span>
+					</div>
+				</div>
 			</div>
-			<div class="panel-body" id="addresses">
-				<span class="glyphicon glyphicon-refresh slx-rotation"></span>
-			</div>
-		</div>
-	</div>
 
-	<div class="col-md-6">
-		<div class="panel panel-default">
-			<div class="panel-heading">
-				{{lang_system}}
-			</div>
-			<div class="panel-body" id="systeminfo">
-				<span class="glyphicon glyphicon-refresh slx-rotation"></span>
+			<div class="col-md-6">
+				<div class="panel panel-default">
+					<div class="panel-heading">
+						{{lang_system}}
+					</div>
+					<div class="panel-body" id="systeminfo">
+						<span class="glyphicon glyphicon-refresh slx-rotation"></span>
+					</div>
+				</div>
 			</div>
-		</div>
-	</div>
 
-</div>
-
-<div class="row">
+		</div>
 
-	<div class="col-md-6">
-		<div class="panel panel-default">
-			<div class="panel-heading">
-				{{lang_maintenance}}
-			</div>
-			<div class="panel-body">
-				<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>
-				</form>
-				<div id="dmsd-users"></div>
+		<div class="row">
+
+			<div class="col-md-6">
+				<div class="panel panel-default">
+					<div class="panel-heading">
+						{{lang_maintenance}}
+					</div>
+					<div class="panel-body">
+						<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>
+						</form>
+						<div id="dmsd-users"></div>
+					</div>
+				</div>
 			</div>
+
 		</div>
 	</div>
 
-</div>
-
-<h3>{{lang_advanced}}</h3>
-
-<ul class="nav nav-tabs tabs-up">
-{{#tabs}}
-	<li>
-		<a href="#id-{{type}}_pane" class="ajax-tab" id="id-{{type}}" data-toggle="tab" role="tab">
-			{{name}}
-		</a>
-	</li>
-{{/tabs}}
-</ul>
-
-<div class="tab-content">
 {{#tabs}}
 	<div class="tab-pane" id="id-{{type}}_pane">
 		<span class="glyphicon glyphicon-refresh slx-rotation"></span>