From 113b484542ad29f2d4fed85a460db1f189f489d4 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Sun, 28 Mar 2021 17:42:54 +0200
Subject: [PATCH] Fertig

---
 .../timemanagement_singleview.html            | 32 ++++++++++++-------
 users/templates/users/base.html               |  2 +-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/timemanagement/templates/timemanagement/timemanagement_singleview.html b/timemanagement/templates/timemanagement/timemanagement_singleview.html
index 58cc887..6d1ecf6 100644
--- a/timemanagement/templates/timemanagement/timemanagement_singleview.html
+++ b/timemanagement/templates/timemanagement/timemanagement_singleview.html
@@ -4,17 +4,27 @@
             <a type="button" class="btn btn-primary mr-1" href="{% url 'tm-management' prev_month prev_year %}" ><i class="fas fa-arrow-circle-left"></i></a>
             <button type="button" class="btn btn-primary mr-1" style="min-width: 150px !important;" onclick="javascript:fastChangeModal()">{{active_month}} {{active_year}}</button>
             <a type="button" class="btn btn-primary mr-1" href="{% url 'tm-management' next_month next_year %}"><i class="fas fa-arrow-circle-right"></i></a>
-  <span style="text-align: right !important; width: 100%; margin-top: -10px;">
-    {% loadmonthwork next_month user as monthwork %}
-    Gesamtarbeitszeit dieser Monat: {{monthwork}} Stunden<br />
-    {% loadaccounttime user as actualaccounttime %}
-    Gleitzeitkonto: 
-    {% if actualaccounttime.1 == 0 %}
-      <b><span style="color: green">+{{actualaccounttime.0}}&nbsp;Stunden</span></b>
-    {% else %}
-      <b><span style="color: red">-{{actualaccounttime.0}}&nbsp;Stunden</span></b>
-    {% endif %}
-  </span>
+      <span style="width: 100%; margin-top: -10px; float: right">
+        {% loadmonthwork next_month user as monthwork %}
+        {% loadaccounttime user as actualaccounttime %}
+      
+        <table style="float: right; " cellSpacing='-20' cellPadding='-20'>
+          <tr style="text-align: center; ">
+            <td style="font-size: 16pt; width: 120px; ">{{monthwork}}</td>
+            <td  style="font-size: 16pt;">
+              {% if actualaccounttime.1 == 0 %}
+                <span style="color: green">+{{actualaccounttime.0}}</span>
+              {% else %}
+                <span style="color: red">-{{actualaccounttime.0}}</span>
+              {% endif %}
+            </td>
+          </tr>
+          <tr style="text-align: center; font-size: 10pt;">
+            <td>Arbeitszeit</td>
+            <td>Gleitzeit</td>
+          </tr>
+        </table>
+      </span>      
 </div>
 <hr>
 <div class="table-responsive ">
diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index 043b5f1..3353711 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -284,7 +284,7 @@
       {%endif%}
         <a class="nav-link " href="{% url 'tm-management' %}" aria-expanded="true">
           <i class="far fa-clock"></i>
-          <span>Zeiterfassung&nbsp;<sup>BETA</sup></span>
+          <span>Zeiterfassung</span>
         </a>
       </li>
       {% endif %}