From 80ff43b12eab7d82f88842233854cabcde9016d7 Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Jan 11 2016 08:50:22 +0000
Subject: [PATCH 1/3] finished editing the PR list page


---

diff --git a/pagure/templates/requests.html b/pagure/templates/requests.html
index adddb9d..1e60ba2 100644
--- a/pagure/templates/requests.html
+++ b/pagure/templates/requests.html
@@ -22,34 +22,17 @@
                repo=repo.name) }}?status=0">Closed</a>
   </span>
 </div>
-  {% if status|lower == 'open' %}
-    <a href="{{ url_for('request_pulls', username=username,
-               repo=repo.name) }}?status=0">
-      ({{ oth_requests }} Closed)</a>
-  {% else %}
-    <a href="{{ url_for('request_pulls', username=username,
-                 repo=repo.name) }}">
-      ({{ oth_requests }} Open)</a>
-  {% endif %}
-
-  <aside id="issue_action">
-      <a class="btn_reset" href="{{ url_for('request_pulls', username=username,
-                 repo=repo.name) }}">
-        <button>Reset all filters</button>
-      </a>
-    </aside>
 </div>
-<div class="card">
-<table class="table table-hover table-striped m-b-0">
-    <thead>
+<div class="card m-t-1">
+<table id="pagure-issues-list" class="table table-hover table-striped m-b-0">
+    <thead class="thead-default">
         <tr>
-            <th>#</th>
-            <th class="stretch-table-column">Title</th>
+            <th class="stretch-table-column">Pull Request</th>
+            <th class="open_date nowrap">Opened</th>
             <th class="open_by">
               Reporter(<a href="{{ url_for('request_pulls', username=username,
                 repo=repo.name, assignee=assignee, status=status) }}">reset</a>)
             </th>
-            <th class="open_date nowrap">Opened date</th>
             <th class="assigned">
               Assignee(<a href="{{ url_for('request_pulls', username=username,
                 repo=repo.name, author=author, status=status) }}">reset</a>)
@@ -61,14 +44,17 @@
     <tbody>
     {% for request in requests %}
         <tr>
-            <td>#{{ request.id }}</td>
             <td>
               <a href="{{ url_for('request_pull', username=username,
                   repo=repo.name, requestid=request.id) }}">
-                {{ request.title | noJS("img") | safe }}
+                <span class="label label-default">PR#{{ request.id }}</span> {% if status|lower != 'open' %}<span class="label {% if request.status|lower == 'merged' %}label-success{%elif request.status|lower == 'closed'%}label-danger{%endif%}">{{request.status}}</span>{%endif%} {{ request.title | noJS("img") | safe }}
               </a>
             </td>
-            <td>
+            <td class="nowrap">
+                    <span title="{{request.date_created.strftime('%Y-%m-%d %H:%M:%S')}}">{{
+                        request.date_created | humanize}}</span>
+            </td>
+            <td class="nowrap">
               <a href="{{ url_for('request_pulls', username=username,
                   repo=repo.name, author=request.user.user,
                   assignee=assignee, status=status) }}"
@@ -77,10 +63,7 @@
                 {{ request.user.user }}
               </a>
             </td>
-            <td>
-                {{ request.date_created.strftime('%Y-%m-%d %H:%M:%S') }}
-            </td>
-            <td>
+            <td class="nowrap">
               {% if request.assignee %}
               <a href="{{ url_for('request_pulls', username=username,
                 repo=repo.name, assignee=request.assignee.username,
@@ -97,7 +80,7 @@
         </tr>
     {% else %}
         <tr>
-            <td colspan="5" class="noresult">No pull-request found</td>
+            <td colspan="5" class="noresult">No Pull Requests found</td>
         </tr>
     {% endfor %}
     </tbody>

From 7518cd174914d9ef9a26ada1dc5c2814207ec5c9 Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Jan 11 2016 08:50:22 +0000
Subject: [PATCH 2/3] replaced the clear filters button


---

diff --git a/pagure/templates/requests.html b/pagure/templates/requests.html
index 1e60ba2..d512a9c 100644
--- a/pagure/templates/requests.html
+++ b/pagure/templates/requests.html
@@ -21,6 +21,8 @@
       <a class="btn {% if status|lower == 'open' %}btn-secondary{%else%}btn-primary{%endif%} btn-sm" href="{{ url_for('request_pulls', username=username,
                repo=repo.name) }}?status=0">Closed</a>
   </span>
+  <a class="btn btn-secondary btn-sm pull-xs-right" href="{{ url_for('request_pulls', 
+  username=username, repo=repo.name) }}">Reset Filters</a>
 </div>
 </div>
 <div class="card m-t-1">

From 8cc0a817f23b9690a74f44a03780e9fb9de7e160 Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Jan 11 2016 08:51:20 +0000
Subject: [PATCH 3/3] fix tests


---

diff --git a/tests/test_progit_flask_ui_fork.py b/tests/test_progit_flask_ui_fork.py
index 5fb889b..83ddef5 100644
--- a/tests/test_progit_flask_ui_fork.py
+++ b/tests/test_progit_flask_ui_fork.py
@@ -678,7 +678,13 @@ class PagureFlaskForktests(tests.Modeltests):
         self.assertIn(
             'Pull Requests <span class="label label-default">0</span>',
             output.data)
-        self.assertIn('(0 Closed)</a>', output.data)
+        # Open is primary
+        self.assertIn(
+            '<a class="btn btn-primary btn-sm" '
+            'href="/test/pull-requests">Open</a>', output.data)
+        self.assertIn(
+            '<a class="btn btn-secondary btn-sm" '
+            'href="/test/pull-requests?status=0">Closed</a>', output.data)
 
         self.set_up_git_repo(new_project=None, branch_from='feature')
 
@@ -687,21 +693,39 @@ class PagureFlaskForktests(tests.Modeltests):
         self.assertIn(
             'Pull Requests <span class="label label-default">1</span>',
             output.data)
-        self.assertIn('(0 Closed)</a>', output.data)
+        # Open is primary
+        self.assertIn(
+            '<a class="btn btn-primary btn-sm" '
+            'href="/test/pull-requests">Open</a>', output.data)
+        self.assertIn(
+            '<a class="btn btn-secondary btn-sm" '
+            'href="/test/pull-requests?status=0">Closed</a>', output.data)
 
         output = self.app.get('/test/pull-requests?status=Closed')
         self.assertEqual(output.status_code, 200)
         self.assertIn(
             'Closed Pull Requests <span class="label label-default">0</span>',
             output.data)
-        self.assertIn('(1 Open)</a>', output.data)
+        # Close is primary
+        self.assertIn(
+            '<a class="btn btn-secondary btn-sm" '
+            'href="/test/pull-requests">Open</a>', output.data)
+        self.assertIn(
+            '<a class="btn btn-primary btn-sm" '
+            'href="/test/pull-requests?status=0">Closed</a>', output.data)
 
         output = self.app.get('/test/pull-requests?status=0')
         self.assertEqual(output.status_code, 200)
         self.assertIn(
             'Closed/Merged Pull Requests <span class="label label-default">0</span>',
             output.data)
-        self.assertIn('(1 Open)</a>', output.data)
+        # Close is primary
+        self.assertIn(
+            '<a class="btn btn-secondary btn-sm" '
+            'href="/test/pull-requests">Open</a>', output.data)
+        self.assertIn(
+            '<a class="btn btn-primary btn-sm" '
+            'href="/test/pull-requests?status=0">Closed</a>', output.data)
 
         # Project w/o pull-request
         repo = pagure.lib.get_project(self.session, 'test')