Only show the git version in case it is different

In the common case it is the same, so avoid showing it twice
msys2 · Jul 22, 2024 · da40892 · da40892
1 parent 1436216
commit da40892
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/app/templates/base.html b/app/templates/base.html
@@ -65,16 +65,7 @@ <h4 class="card-title">Base Package: <a href="{{ s.name }}">{{ s.name }}</a></h4
       </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
@@ -61,7 +61,7 @@ <h6 class="card-subtitle mb-2 text-muted">
                 </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
@@ -59,16 +59,7 @@ <h4 class="card-title">Package: <a href="{{ package_url(p) }}">{{ p.name }}</a><
       <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">