#5184 Add history button to the tree view (fixes #5173)
Opened 6 months ago by abitrolly. Modified a month ago
abitrolly/pagure tree-history  into  master

file modified
+25 -18
@@ -16,7 +16,9 @@ 

  </style>

  {% endblock %}

  

+ 

  {% block repo %}

+   <!-- template: file.html -->

is there a reason for this?

    <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,7 @@ 

          {% endif %}

      </div>

    </div>

-   </div>

+     <!-- .card -->

      <div class="card mb-3">

        <div class="card-header">

          <ol class="breadcrumb p-0 bg-transparent mb-0">
@@ -94,12 +95,12 @@ 

          </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 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','binary','image','markup') %}

+             <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',
@@ -121,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,
@@ -178,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>
@@ -209,10 +208,18 @@ 

            </a>

          </p>

      {% endif %}

-   </div>

    {% else %}

-       <div class="card-body p-0">

-           <table class="table table-sm mb-0">

+       <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 %}

              <tr>
@@ -243,10 +250,8 @@ 

            {% endfor %}

          </tbody>

        </table>

-       </div>

    {% endif %}

- {% else %}

- No content found in this repository

+   </div>

  {% endif %}

   </div> <!-- end .card-->

  
@@ -262,8 +267,10 @@ 

   {% endif %}

  </div>

  </div>

+ <!-- /template: file.html -->

  {% endblock %}

  

+ 

  {% block jscripts %}

  {{ super() }}

  <script type="text/javascript" nonce="{{ g.nonce }}" src="{{

rebased onto 941676bb953a8afa6f4ecc2a23ccff2ab16e4f53

6 months ago

rebased onto 056a9ec

6 months ago

Tests pass on fedora-rpms-py3 so I'm going to merge it :)

Arg, wrong PR, sorry :(

is there a reason for this?

is there a reason for this?

To see where template starts and ends in rendered HTML. Which is needed to find out which template to edit.

Metadata