From c59d2cab2724a28cc54a71e97a61785228f52fa9 Mon Sep 17 00:00:00 2001
From: Ross Mountjoy <ross.mountjoy@gmail.com>
Date: Wed, 12 Feb 2020 08:59:07 -0500
Subject: [PATCH] fixed https://git.wolf-house.net/ross/DashMachine/issues/32
 and https://git.wolf-house.net/ross/DashMachine/issues/31

---
 dashmachine/main/routes.py           |  4 +++-
 dashmachine/templates/main/base.html |  2 +-
 dashmachine/templates/main/home.html | 12 ++++++++++--
 dashmachine/version.py               |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/dashmachine/main/routes.py b/dashmachine/main/routes.py
index fbb4e0f..dc12a50 100755
--- a/dashmachine/main/routes.py
+++ b/dashmachine/main/routes.py
@@ -76,7 +76,9 @@ def app_view(app_id):
     if not check_groups(settings.home_access_groups, current_user):
         return redirect(url_for("user_system.login"))
     app_db = Apps.query.filter_by(id=app_id).first()
-    return render_template("main/app-view.html", url=f"{app_db.prefix}{app_db.url}")
+    return render_template(
+        "main/app-view.html", url=f"{app_db.prefix}{app_db.url}", title=app_db.name
+    )
 
 
 @main.route("/load_data_source", methods=["GET"])
diff --git a/dashmachine/templates/main/base.html b/dashmachine/templates/main/base.html
index b35a682..68f68e8 100644
--- a/dashmachine/templates/main/base.html
+++ b/dashmachine/templates/main/base.html
@@ -21,7 +21,7 @@
     content="Another web application bookmark dashboard, with fun features.">
   <meta name="author" content="rmountjoy">
   {% if title %}
-  <title>DashMachine - {{ title }}</title>
+  <title>{{ title }} - DashMachine</title>
   {% else %}
   <title>DashMachine</title>
   {% endif %}
diff --git a/dashmachine/templates/main/home.html b/dashmachine/templates/main/home.html
index d36bb1c..0b4595a 100644
--- a/dashmachine/templates/main/home.html
+++ b/dashmachine/templates/main/home.html
@@ -69,9 +69,17 @@
                                 {% endif %}
                             </div>
                             <div class="card-action center-align scrollbar" style="max-height: 127px; min-height: 127px; scrollbar-width: none;">
-                                <h5>{{ app.name }}
+                                <h5 class="app-name-{{ app.id }}">{{ app.name }}
                                 </h5>
-                                <span class="theme-secondary-text">{{ app.description }}</span>
+                                {% if app.description %}
+                                    <span class="theme-secondary-text">{{ app.description }}</span>
+                                {% else %}
+                                    <style>
+                                        .app-name-{{ app.id }} {
+                                            margin-top: 35px;
+                                        }
+                                    </style>
+                                {% endif %}
                             </div>
                         </div>
                     </div>
diff --git a/dashmachine/version.py b/dashmachine/version.py
index 1ab9ee6..280f0eb 100755
--- a/dashmachine/version.py
+++ b/dashmachine/version.py
@@ -1 +1 @@
-version = "v0.31"
+version = "v0.32"