From 36ae891283213008924630aecbcaba682f65cf6c Mon Sep 17 00:00:00 2001
From: Andrea Lepori <alepori@student.ethz.ch>
Date: Wed, 5 Jan 2022 11:21:39 +0100
Subject: edit password working

---
 client/templates/client/about.html | 16 +++++++++-------
 client/views.py                    |  4 ++++
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'client')

diff --git a/client/templates/client/about.html b/client/templates/client/about.html
index dfeab99..4ace6d3 100644
--- a/client/templates/client/about.html
+++ b/client/templates/client/about.html
@@ -1,22 +1,24 @@
-{% extends 'registration/base_client.html' %}
+{% extends 'registration/base_simple.html' %}
 
 {% block title %}About{% endblock %}
 
-{%block breadcrumb%}
-  <a class="breadcrumb hide-on-med-and-down">Informazioni</a>
-{% endblock%}
-
 {% block content %}
+  <div class="fixed-action-btn">
+    <a class="btn-floating btn-large {{color}}" href='/'>
+      <i class="large material-icons">home</i>
+    </a>
+  </div>
+
   <div class="row">
     <div class="col l6 offset-l3 m8 offset-m2 s12">
       <div class="card">
         <div class="card-content">
           <p>
-            Versione software {{version}}<br>Commit ID: <a href="https://git.thearcway.org/mafaldo/scout-subs/commit/?id={{commitid}}">{{commitid}}</a>
+            Versione: {{version}}<br>Commit ID: <a href="https://git.thearcway.org/mafaldo/scout-subs/commit/?id={{commitid}}">{{commitid}}</a>
           </p>
           <h5>Licenza</h5>
           <blockquote>
-            Copyright (C) 2020-21 Andrea Lepori<br><br>
+            Copyright (C) 2020-22 Andrea Lepori<br><br>
 
             This program is free software: you can redistribute it and/or modify
             it under the terms of the GNU General Public License as published by
diff --git a/client/views.py b/client/views.py
index 41bb3dd..44820be 100644
--- a/client/views.py
+++ b/client/views.py
@@ -304,6 +304,10 @@ def about(request):
     version = version[version.find("=")+1:]
     version = version.replace("\n", " ").replace("=", " ")
 
+    # get branch
+    branch = check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"]).decode()
+    version += " (" + branch[:-1] + ")"
+
     if version.startswith("0"):
         version = "Beta " + version
 
-- 
cgit v1.2.1