From da40892968e90c6622669dce8bf005f4136b550e Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 22 Jul 2024 23:47:27 +0200
Subject: [PATCH] Only show the git version in case it is different

In the common case it is the same, so avoid showing it twice
---
 app/templates/base.html      | 11 +----------
 app/templates/outofdate.html |  2 +-
 app/templates/package.html   | 11 +----------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/app/templates/base.html b/app/templates/base.html
index 47c5db9..43cc906 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -65,16 +65,7 @@
       </dd>
 
       <dt class="col-sm-3 text-sm-end">Version:</dt>
-      <dd class="col-sm-9">{{ s.version }}</dd>
-
-      <dt class="col-sm-3 text-sm-end">GIT Version:</dt>
-      <dd class="col-sm-9">
-        {% if s.git_version %}
-        <a href="{{ s.source_url }}">{{ s.git_version }}</a>
-        {% else %}
-        -
-        {% endif%}
-      </dd>
+      <dd class="col-sm-9">{{ s.version }}{% if s.version != s.git_version %} <span class="text-muted small align-text-bottom ps-1">(<a href="{{ s.source_url }}">{{ s.git_version }}</a> in git)</span>{% endif %}</dd>
 
       <dt class="col-sm-3 text-sm-end mb-2">External:</dt>
       <dd class="col-sm-9">
diff --git a/app/templates/outofdate.html b/app/templates/outofdate.html
index e504ee8..7625b88 100644
--- a/app/templates/outofdate.html
+++ b/app/templates/outofdate.html
@@ -61,7 +61,7 @@
                 </template>
             </td>
             <td><a href="{{ url_for('base', base_name=s.name) }}">{{ s.name }}</a></td>
-            <td class="text-version">{{ myver }}{% if gitver %} <span class="text-muted small px-2">({{ gitver }} in git)</span>{% endif %}</td>
+            <td class="text-version">{{ myver }}{% if gitver %} <span class="text-muted small align-text-bottom ps-1">({{ gitver }} in git)</span>{% endif %}</td>
             <td>→</td>
             <td class="text-version"><a href="{{ url }}">{{ ver }}</a></td>
             {% if s.active_vulnerabilities %}
diff --git a/app/templates/package.html b/app/templates/package.html
index 1284ea5..2c56892 100644
--- a/app/templates/package.html
+++ b/app/templates/package.html
@@ -59,16 +59,7 @@
       <dd class="col-sm-9">{{ licenses_to_html(p.licenses)|safe }}</dd>
 
       <dt class="col-sm-3 text-sm-end">Version:</dt>
-      <dd class="col-sm-9">{{ p.version }}</dd>
-
-      <dt class="col-sm-3 text-sm-end">GIT Version:</dt>
-      <dd class="col-sm-9">
-        {% if s.git_version %}
-        <a href="{{ s.source_url }}">{{ s.git_version }}</a>
-        {% else %}
-        -
-        {% endif%}
-      </dd>
+      <dd class="col-sm-9">{{ p.version }}{% if p.version != s.git_version %} <span class="text-muted small align-text-bottom ps-1">(<a href="{{ s.source_url }}">{{ s.git_version }}</a> in git)</span>{% endif %}</dd>
 
       <dt class="col-sm-3 text-sm-end mb-2">External:</dt>
       <dd class="col-sm-9">