From 3fb285242ef3ff9b8eb9ffcaa8f36ae069f53155 Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Jan 21 2016 03:31:45 +0000
Subject: added more information to the commit list page


now shows the project and branch name at the top of the content
area, so the user knows what branch they are looking at for sure.

also, provides a alert box at the top if the branch being browsed
has commits ahead of the main branch / upstream project. the alert
box also has a collapsed area that shows just the commits that are
different from the upstream / main branch.

---

diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index 203d14f..1358c0d 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -33,29 +33,81 @@ git push -u origin master</pre>
       </div>
     {% else %}
       {% if origin == 'view_commits' %}
+      <h3>Commits <span class="label label-default"> {{number_of_commits}}</span></h3>
+      <div class="m-b-1">
+        Displaying {{number_of_commits}} commits in
+        <span class="pr-toplabel">{%
+            if repo.is_fork %}<span class="oi" data-glyph="fork"></span> {%
+            else %}<span class="oi" data-glyph="document"></span> {%
+            endif %}{{ repo.fullname }}</span>
+        <span class="pr-toplabel">
+          <span class="oi" data-glyph="random"> </span>
+          {{branchname}}
+        </span>
+      </div>
 
-        {% if diff_commits and authenticated and repo.settings.get('pull_requests', True) %}
-        <span id="request_pull" class="inline_it">
-            <a href="{{ url_for('new_request_pull',
+      {% if diff_commits|count > 0 %}
+      <div class="alert alert-info" role="alert">
+        This branch contains <a href="#" id="diff_commits_link">{{
+            diff_commits|count }} commits</a> not in {%
+            if repo.is_fork %}the upstream project
+              <span class="pr-toplabel">
+                <span class="oi" data-glyph="document"></span>
+                {{ repo.name }}
+              </span> {%
+            else %}the main branch{%
+            endif %}
+            <span class="pr-toplabel">
+              <span class="oi" data-glyph="random"> </span>
+              {{head}}
+            </span>
+
+        {% if diff_commits and authenticated and (repo.is_fork or repo.settings.get('pull_requests', True)) %}
+        <div id="request_pull" class="pull-xs-right">
+            <a class="btn btn-primary btn-sm" href="{{ url_for('new_request_pull',
         username=username, repo=repo.name,
         branch_to=head, branch_from=branchname or 'master') }}">
       {% if repo_admin %}Request pull{% else %}Compare{% endif %}
             </a>
-        </span>
-        {% elif authenticated and repo.settings.get('pull_requests', True) %}
+        </div>
+        {#{% elif authenticated and repo.settings.get('pull_requests', True) %}
         <span id="request_pull" class="inline_it">
             <a href="{{ url_for('new_remote_request_pull',
         username=username, repo=repo.name) }}">
       Open a remote pull-request
             </a>
-        </span>
+        </span>#}
         {% endif %}
+        <div id="diff_commits" class="list-group m-t-1" style="display:none;">
+          {% for diff_commit_full in diff_commits_full %}
+             <a href="{{ url_for('view_commit', username=username,
+                        repo=repo.name, commitid=diff_commit_full.hex) }}" class="list-group-item">
+              <h5>
+                <strong>{{ diff_commit_full.message.split('\n')[0] }}</strong>
+                <div class="pull-xs-right">
+                  <span class="commitdate" title="{{ diff_commit_full.commit_time|format_ts }}">
+                    {{ diff_commit_full.commit_time|humanize }}
+                  </span>
+                </div>
+              </h5>
+              {{ diff_commit_full.author | author2avatar(20) | safe }} {{ diff_commit_full.author.name }}
+              <div class="pull-xs-right">
+                <span class="label label-default">{{ diff_commit_full.hex|short }}</span>
+              </div>
+            </a>
+          {% endfor %}
+        </div>
+
+       </div>
+      {%endif%}
 
-        <div class="list-group">
+        <div class="list-group m-t-1">
           {% for commit in last_commits %}
-            <a href="{{ url_for('view_commit', username=username, repo=repo.name, commitid=commit.hex) }}" class="list-group-item {% if diff_commits and commit.oid.hex in diff_commits %}p-l-3{% endif %}" style="position:relative;">
+            <a href="{{ url_for('view_commit', username=username, repo=repo.name, commitid=commit.hex) }}"
+                class="list-group-item {% if diff_commits and commit.oid.hex in diff_commits %}p-l-3{% endif %}" style="position:relative;">
               {% if diff_commits and commit.oid.hex in diff_commits %}
-                <div title="This commit is not in the main branch of this Repo" style="position:absolute; left:0; top:0; padding:5px; padding-top:20px; height:100%; background:#eee; vertical-align:middle;">
+                <div title="This commit is not in the main branch of this Repo"
+                    style="position:absolute; left:0; top:0; padding:5px; padding-top:20px; height:100%; background:#eee; vertical-align:middle;">
                   <span class="oi" data-glyph="arrow-thick-right"></span>
                 </div>
               {% endif %}
@@ -255,6 +307,8 @@ git push -u origin master</pre>
 $(document).ready(function() {
     $(".extra_gits").hide();
 });
+
+
 $(function() {
     $( "#more_gits" ).click(
       function() {
@@ -271,4 +325,15 @@ $(function() {
     );
 });
 </script>
+
+{% if origin == 'view_commits' %}
+<script type="text/javascript">
+  $(function(){
+    $('#diff_commits_link').click(function(){
+      $('#diff_commits').toggle();
+    });
+  });
+</script>
+{% endif %}
+
 {% endblock %}
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index bd5b290..576e84c 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -306,6 +306,7 @@ def view_commits(repo, branchname=None, username=None):
     total_page = int(ceil(n_commits / float(limit)))
 
     diff_commits = []
+    diff_commits_full = []
     if repo.is_fork:
         parentname = os.path.join(
             APP.config['GIT_FOLDER'], repo.parent.path)
@@ -343,6 +344,7 @@ def view_commits(repo, branchname=None, username=None):
                 if commit.oid.hex in compare_commits:
                     break
                 diff_commits.append(commit.oid.hex)
+                diff_commits_full.append(commit)
 
     return flask.render_template(
         'repo_info.html',
@@ -356,6 +358,8 @@ def view_commits(repo, branchname=None, username=None):
         branchname=branchname,
         last_commits=last_commits,
         diff_commits=diff_commits,
+        diff_commits_full=diff_commits_full,
+        number_of_commits=n_commits,
         page=page,
         total_page=total_page,
         repo_admin=is_repo_admin(repo),