From 91ca3179244c4f93e823f14189151934f887e4bb Mon Sep 17 00:00:00 2001
From: Daniel <daniel@technikamateur.de>
Date: Thu, 12 Sep 2019 19:02:06 +0200
Subject: [PATCH] some ui improvements

---
 dirkules/config.py              |   2 +-
 dirkules/manager/viewManager.py |   5 +-
 dirkules/templates/pools.html   | 100 +++++++++++++++-----------------
 dirkules/views.py               |   9 +--
 4 files changed, 53 insertions(+), 63 deletions(-)

diff --git a/dirkules/config.py b/dirkules/config.py
index 2ff4d68..2a14761 100644
--- a/dirkules/config.py
+++ b/dirkules/config.py
@@ -83,7 +83,7 @@ dictConfig({
             'formatter': 'telegram',
             'token': TOKEN,
             'chat_id': CHAT_ID,
-            'level': 'WARNING',
+            'level': 'ERROR',
         }
     },
     'root': {
diff --git a/dirkules/manager/viewManager.py b/dirkules/manager/viewManager.py
index 52d4654..5333d7e 100644
--- a/dirkules/manager/viewManager.py
+++ b/dirkules/manager/viewManager.py
@@ -19,9 +19,8 @@ def create_cleaning_obj(jobname, path, active):
 
 def get_pool_health(drive_list):
     drive_split = drive_list.split(",")
-    health = True
     for drive in drive_split:
         db_drive = db.session.query(Drive).filter(Drive.name == drive).scalar()
         if db_drive.smart is not True:
-            health = False
-    return health
+            return False
+    return True
diff --git a/dirkules/templates/pools.html b/dirkules/templates/pools.html
index f02b5d5..2edd4f8 100644
--- a/dirkules/templates/pools.html
+++ b/dirkules/templates/pools.html
@@ -6,15 +6,6 @@
 {% block body %}
     <div class="topspacer"></div>
     <div class="ui container">
-        <h1 class="ui dividing header">Aktionen</h1>
-        <div class="ui container">
-            <a href="{{ url_for('add_pool') }}">
-                <div class="ui primary labeled icon button">
-                    <i class="plus icon"></i> Neuen Pool erstellen
-                </div>
-            </a>
-        </div>
-        <h1 class="ui dividing header">Übersicht</h1>
         <div class="infobox">
             <div class="ui info message">
                 <i class="close icon"></i>
@@ -27,50 +18,53 @@
                 </p>
             </div>
         </div>
-        <div class="ui segment">
-            <table class="ui very basic celled table">
-                <thead>
-                <tr>
-                    <th>Name</th>
-                    <th>Größe</th>
-                    <th>Frei</th>
-                    <th>Typ</th>
-                    <th>Dateisystem</th>
-                    <th>Mountpoint</th>
-                    <th>Disks</th>
-                    <th>Aktionen</th>
-                </tr>
-                </thead>
+        <a href="{{ url_for('add_pool') }}">
+            <div class="ui primary labeled icon button">
+                <i class="plus icon"></i> Neuen Pool erstellen
+            </div>
+        </a>
+        <table class="ui celled table">
+            <thead>
+            <tr>
+                <th>Name</th>
+                <th>Größe</th>
+                <th>Frei</th>
+                <th>Typ</th>
+                <th>Dateisystem</th>
+                <th>Mountpoint</th>
+                <th>Disks</th>
+                <th>Aktionen</th>
+            </tr>
+            </thead>
 
-                <tbody>
-                {% for pool in pools %}
-                    <tr>
-                        <td><i class="download icon"></i> {{ pool.label }}</td>
-                        <td class="right aligned">{{ pool.size|filesizeformat(true) }}</td>
-                        {% if pool.free == 2 %}
-                            <td class="right aligned">unbekannt</td>
-                        {% else %}
-                            <td class="right aligned">{{ pool.free|filesizeformat(true) }}</td>
-                        {% endif %}
-                        <td>{{ pool.data_raid }}</td>
-                        <td>{{ pool.fs }}</td>
-                        {% if pool.mountpoint|length %}
-                            <td>{{ pool.mountpoint }}</td>
-                        {% else %}
-                            <td>nicht eingehängt</td>
-                        {% endif %}
-                        <td>{{ pool.drives }}</td>
-                        <td>
-                            <a href="{{ url_for('pool', pool=(pool.id)) }}"
-                               class="ui primary basic button">
-                                <i class="eye icon"></i>
-                                Details
-                            </a>
-                        </td>
-                    </tr>
-                {% endfor %}
-                </tbody>
-            </table>
-        </div>
+            <tbody>
+            {% for pool in pools %}
+                <tr>
+                    <td><i class="download icon"></i> {{ pool.label }}</td>
+                    <td class="right aligned">{{ pool.size|filesizeformat(true) }}</td>
+                    {% if pool.free == 2 %}
+                        <td class="right aligned">unbekannt</td>
+                    {% else %}
+                        <td class="right aligned">{{ pool.free|filesizeformat(true) }}</td>
+                    {% endif %}
+                    <td>{{ pool.data_raid }}</td>
+                    <td>{{ pool.fs }}</td>
+                    {% if pool.mountpoint|length %}
+                        <td>{{ pool.mountpoint }}</td>
+                    {% else %}
+                        <td>nicht eingehängt</td>
+                    {% endif %}
+                    <td>{{ pool.drives }}</td>
+                    <td>
+                        <a href="{{ url_for('pool', pool=(pool.id)) }}"
+                           class="ui primary basic button">
+                            <i class="eye icon"></i>
+                            Details
+                        </a>
+                    </td>
+                </tr>
+            {% endfor %}
+            </tbody>
+        </table>
     </div>
 {% endblock %}
diff --git a/dirkules/views.py b/dirkules/views.py
index afce2f2..5b12bbb 100644
--- a/dirkules/views.py
+++ b/dirkules/views.py
@@ -10,12 +10,7 @@ from dirkules.config import staticDir
 
 @app.errorhandler(404)
 def page_not_found(e):
-    return render_template('404.html', error=str(e)), 404
-
-
-@app.route('/404', methods=['GET'])
-def test_404():
-    abort(404, description="Resource not found")
+    return render_template('404.html', error=str(e))
 
 
 @app.route('/', methods=['GET'])
@@ -38,6 +33,8 @@ def pools():
 @app.route('/pool/<pool>', methods=['GET'])
 def pool(pool):
     db_pool = Pool.query.get(pool)
+    if db_pool is None:
+        abort(404, description="Pool with ID {} could not be found.".format(pool))
     pool_health = viewManager.get_pool_health(db_pool.drives)
     return render_template('pool.html', pool=db_pool, health=pool_health)