From 9616562a76dfdac4e8f03254bf074e90d5b25435 Mon Sep 17 00:00:00 2001
From: Virgil Grigoras <v.grigoras@vg-dev.de>
Date: Sun, 9 Sep 2018 14:18:56 +0200
Subject: [PATCH] Revert change from #10478594240d17f2bd73cda597439ade665a1e5c
 (move general information back to configuration block)

---
 cps/templates/admin.html | 77 +++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 41 deletions(-)

diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index c0b103b2..20e5ec29 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -1,47 +1,6 @@
 {% extends "layout.html" %}
 {% block body %}
 <div class="container-fluid">
-  <div class="row">
-    <div class="col">
-      <h2>{{_('Overview')}}</h2>
-      <div class="col-xs-12 col-sm-6">
-        <div class="row">
-            <div class="col-xs-6 col-sm-6">{{_('Calibre DB dir')}}</div>
-            <div class="col-xs-6 col-sm-6">{{config.config_calibre_dir}}</div>
-        </div>
-        <div class="row">
-            <div class="col-xs-6 col-sm-6">{{_('Log level')}}</div>
-            <div class="col-xs-6 col-sm-6">{{config.get_Log_Level()}}</div>
-        </div>
-        <div class="row">
-            <div class="col-xs-6 col-sm-6">{{_('Port')}}</div>
-            <div class="col-xs-6 col-sm-6">{{config.config_port}}</div>
-        </div>
-      </div>
-      <div class="col-xs-12 col-sm-6">
-        <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Books per page')}}</div>
-            <div class="col-xs-6 col-sm-5">{{config.config_books_per_page}}</div>
-        </div>
-        <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Uploading')}}</div>
-            <div class="col-xs-6 col-sm-5">{% if config.config_uploading %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
-        </div>
-        <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Anonymous browsing')}}</div>
-            <div class="col-xs-6 col-sm-5">{% if config.config_anonbrowse %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
-        </div>
-        <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Public registration')}}</div>
-            <div class="col-xs-6 col-sm-5">{% if config.config_public_reg %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
-        </div>
-        <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Remote login')}}</div>
-            <div class="col-xs-6 col-sm-5">{% if config.config_remote_login %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
-        </div>
-      </div>
-    </div>
-  </div>
   <div class="row">
     <div class="col">
       <h2>{{_('User list')}}</h2>
@@ -101,6 +60,42 @@
   <div class="row">
     <div class="col">
       <h2>{{_('Configuration')}}</h2>
+      <div class="col-xs-12 col-sm-6">
+        <div class="row">
+            <div class="col-xs-6 col-sm-6">{{_('Calibre DB dir')}}</div>
+            <div class="col-xs-6 col-sm-6">{{config.config_calibre_dir}}</div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-sm-6">{{_('Log level')}}</div>
+            <div class="col-xs-6 col-sm-6">{{config.get_Log_Level()}}</div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-sm-6">{{_('Port')}}</div>
+            <div class="col-xs-6 col-sm-6">{{config.config_port}}</div>
+        </div>
+      </div>
+      <div class="col-xs-12 col-sm-6">
+        <div class="row">
+            <div class="col-xs-6 col-sm-7">{{_('Books per page')}}</div>
+            <div class="col-xs-6 col-sm-5">{{config.config_books_per_page}}</div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-sm-7">{{_('Uploading')}}</div>
+            <div class="col-xs-6 col-sm-5">{% if config.config_uploading %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-sm-7">{{_('Anonymous browsing')}}</div>
+            <div class="col-xs-6 col-sm-5">{% if config.config_anonbrowse %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-sm-7">{{_('Public registration')}}</div>
+            <div class="col-xs-6 col-sm-5">{% if config.config_public_reg %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-sm-7">{{_('Remote login')}}</div>
+            <div class="col-xs-6 col-sm-5">{% if config.config_remote_login %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
+        </div>
+      </div>
       <div class="btn btn-default"><a href="{{url_for('configuration')}}">{{_('Basic Configuration')}}</a></div>
       <div class="btn btn-default"><a href="{{url_for('view_configuration')}}">{{_('UI Configuration')}}</a></div>
     </div>