From 05882e8ab484a4aacb94f1fe1f170c99f436eede Mon Sep 17 00:00:00 2001
From: Anatoli Babenia <anatoli@rainforce.org>
Date: Apr 19 2024 20:36:34 +0000
Subject: [PATCH 1/4] file.html: Add comment with template name, simplify markup


---

diff --git a/pagure/templates/file.html b/pagure/templates/file.html
index adcfc42..de7d46f 100644
--- a/pagure/templates/file.html
+++ b/pagure/templates/file.html
@@ -16,7 +16,9 @@
 </style>
 {% endblock %}
 
+
 {% block repo %}
+  <!-- template: file.html -->
   <div class="row">
     <div class="col-2">
         {% block overviewtabs %}{{ super() }}{% endblock %}
@@ -29,14 +31,13 @@
     </h3>
     </div>
 
-    <div class="col-sm-6">
-      <div class="float-right">
+    <div class="col-sm-6 text-right">
         {% if branchname in g.branches %}
           <div class="btn-group">
             <a href="#" class="btn btn-outline-light border-secondary text-dark btn-sm dropdown-toggle"
                     data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <span class="fa fa-random fa-fw"></span> Branch: <span class="font-weight-bold">{{ branchname }}</span>
-          </a>
+            </a>
             <div class="dropdown-menu dropdown-menu-right">
               {% for branch in g.branches %}
                   <a class="dropdown-item pl-1 {{'active' if branchname == branch}}" href="{{ url_for(
@@ -58,7 +59,6 @@
         {% endif %}
     </div>
   </div>
-  </div>
     <div class="card mb-3">
       <div class="card-header">
         <ol class="breadcrumb p-0 bg-transparent mb-0">
@@ -262,8 +262,10 @@ No content found in this repository
  {% endif %}
 </div>
 </div>
+<!-- /template: file.html -->
 {% endblock %}
 
+
 {% block jscripts %}
 {{ super() }}
 <script type="text/javascript" nonce="{{ g.nonce }}" src="{{

From 3f30ed2206dbdd9499edc3c26b3164d3641bff85 Mon Sep 17 00:00:00 2001
From: Anatoli Babenia <anatoli@rainforce.org>
Date: Apr 19 2024 20:36:34 +0000
Subject: [PATCH 2/4] file.html: Simplify template


---

diff --git a/pagure/templates/file.html b/pagure/templates/file.html
index de7d46f..cc67018 100644
--- a/pagure/templates/file.html
+++ b/pagure/templates/file.html
@@ -59,6 +59,7 @@
         {% endif %}
     </div>
   </div>
+    <!-- .card -->
     <div class="card mb-3">
       <div class="card-header">
         <ol class="breadcrumb p-0 bg-transparent mb-0">
@@ -94,9 +95,11 @@
         </ol>
       </div>
 
-{% if content is not none %}
-  {% if output_type in ('file','binary','image','markup') %}
+{% if content is none %}
+  No content found in this repository
+{% else %}
   <div class="card-body p-0">
+  {% if output_type in ('file','binary','image','markup') %}
         {% if content is not none %}
           {% if output_type in ('file','binary','image','markup') %}
             <div class="bg-light border text-right pr-2">
@@ -209,10 +212,8 @@
           </a>
         </p>
     {% endif %}
-  </div>
   {% else %}
-      <div class="card-body p-0">
-          <table class="table table-sm mb-0">
+      <table class="table table-sm mb-0">
         <tbody>
           {% for entry in content %}
             <tr>
@@ -243,10 +244,8 @@
           {% endfor %}
         </tbody>
       </table>
-      </div>
   {% endif %}
-{% else %}
-No content found in this repository
+  </div>
 {% endif %}
  </div> <!-- end .card-->
 

From 4b846908f3455584202c0e47e9264b2abd7ca5d5 Mon Sep 17 00:00:00 2001
From: Anatoli Babenia <anatoli@rainforce.org>
Date: Apr 19 2024 20:36:34 +0000
Subject: [PATCH 3/4] Remove duplicate condition


---

diff --git a/pagure/templates/file.html b/pagure/templates/file.html
index cc67018..22cad88 100644
--- a/pagure/templates/file.html
+++ b/pagure/templates/file.html
@@ -100,8 +100,6 @@
 {% else %}
   <div class="card-body p-0">
   {% if output_type in ('file','binary','image','markup') %}
-        {% if content is not none %}
-          {% if output_type in ('file','binary','image','markup') %}
             <div class="bg-light border text-right pr-2">
                 {% if output_type in ('file','markup') and g.repo_admin %}
                 <a class="btn btn-sm btn-secondary" href="{{ url_for(
@@ -181,8 +179,6 @@
                     identifier=branchname,
                     filename=filename) | unicode }}" title="View as raw">Raw</a>
             </div>
-          {% endif %}
-        {% endif %}
 
     {% if output_type=='file' %}
         <pre class="syntaxhighlightblock"><code class="{{filename|syntax_alias}}">{{ content }}</code></pre>

From 065aed559ffa6c84d36b562400f6f95bab232751 Mon Sep 17 00:00:00 2001
From: Anatoli Babenia <anatoli@rainforce.org>
Date: Apr 19 2024 20:36:34 +0000
Subject: [PATCH 4/4] Add history button to the tree view (fixes #5173)


---

diff --git a/pagure/templates/file.html b/pagure/templates/file.html
index 22cad88..a59be7d 100644
--- a/pagure/templates/file.html
+++ b/pagure/templates/file.html
@@ -100,7 +100,7 @@
 {% else %}
   <div class="card-body p-0">
   {% if output_type in ('file','binary','image','markup') %}
-            <div class="bg-light border text-right pr-2">
+            <div class="bg-light border text-right pr-2 py-1">
                 {% if output_type in ('file','markup') and g.repo_admin %}
                 <a class="btn btn-sm btn-secondary" href="{{ url_for(
                     'ui_ns.edit_file',
@@ -122,7 +122,7 @@
                         )
                     )
                 %}
-                <form class="btn btn-sm" method="POST" name="fork_project"
+                <form class="d-inline mx-2" method="POST" name="fork_project"
                     action="{{ url_for('ui_ns.fork_edit_file',
                         repo=repo.name,
                         username=username,
@@ -209,6 +209,16 @@
         </p>
     {% endif %}
   {% else %}
+      <div class="bg-light border text-right pr-2 py-1">
+          <a class="btn btn-secondary btn-sm" href="{{ url_for(
+                    'ui_ns.view_history_file',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    identifier=branchname,
+                    filename=filename) | unicode }}" title="View git log for this path">History</a>
+
+      </div>
       <table class="table table-sm mb-0">
         <tbody>
           {% for entry in content %}