From c59551797f24ce7f1066e40d11946b81f4e74fab Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 27 2015 12:55:37 +0000
Subject: [PATCH 1/7] Rework the pull-request view to move the list of commits into a tab


---

diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 5bec287..38ad185 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -138,7 +138,13 @@
 </section>
 {% endif %}
 
-<section class="commit_list">
+<div class="tabs">
+  <ul>
+    <li><a href="#request_diff">Diff</a></li>
+    <li><a href="#commit_list">Commits</a></li>
+  </ul>
+
+<div class="commit_list" id="commit_list">
   <ul>
     {% for commit in diff_commits %}
     <li>
@@ -160,9 +166,9 @@
       <p class="error"> No commits found </p>
     {% endfor %}
   </ul>
-</section>
+</div>
 
-<section class="request_diff">
+<div class="request_diff" id="request_diff">
 
 {% if authenticated and pull_request %}
 <form action="{{ url_for('.pull_request_drop_comment', username=username,
@@ -171,7 +177,7 @@
 
 {% if diff %}
 {% for patch in diff %}
-<section class="commit_diff">
+<div class="commit_diff">
 <header>
     <h3>{{ patch.new_file_path }}</h3>
     <ul class="buttons">
@@ -219,11 +225,12 @@
 {% endautoescape %}
 {% endfor %}
 {% endif %}
+</div>
 {% if authenticated and pull_request %}
 {{ mergeform.csrf_token }}
 </form>
 {% endif %}
-</section>
+</div>
 
 {% if pull_request and pull_request.comments%}
 <section class="request_comment">
@@ -252,7 +259,7 @@
       (supports the <a href="http://daringfireball.net/projects/markdown/syntax"
         target="_blank">Markdown syntax</a>)
     </header>
-    <div id="tabs">
+    <div class="tabs" id="comment">
       <ul>
         <li><a href="#edit">Comment</a></li>
         <li><a href="#preview">Preview</a></li>
@@ -356,9 +363,9 @@
     }
   );
 
-  $( "#tabs" ).tabs();
+  $( ".tabs" ).tabs();
 
-  $( "#tabs" ).on('tabsactivate',
+  $( "#comment" ).on('tabsactivate',
     function(event, ui) {
       if (ui.newPanel.selector == '#preview') {
         var _text = $( "#comment" ).val();

From d446f00156b1034b08b49008aac7ab4de5d44ec3 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 27 2015 12:55:37 +0000
Subject: [PATCH 2/7] Precise the number of commits considered in the tab


---

diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 38ad185..79c622a 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -141,7 +141,7 @@
 <div class="tabs">
   <ul>
     <li><a href="#request_diff">Diff</a></li>
-    <li><a href="#commit_list">Commits</a></li>
+    <li><a href="#commit_list">Commits ({{ diff_commits|length }})</a></li>
   </ul>
 
 <div class="commit_list" id="commit_list">

From 3f0c6271b8b9b429acc9efa58ca9367e06ed2316 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 27 2015 12:55:37 +0000
Subject: [PATCH 3/7] Close the div earlier


---

diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 79c622a..87b5737 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -231,6 +231,7 @@
 </form>
 {% endif %}
 </div>
+</div>
 
 {% if pull_request and pull_request.comments%}
 <section class="request_comment">

From b793f07fbf15301013b0c0bd4fcfc87162fca44b Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 27 2015 12:55:37 +0000
Subject: [PATCH 4/7] More HTML fixes to make the PR page look good


---

diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 87b5737..a8224b2 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -177,7 +177,7 @@
 
 {% if diff %}
 {% for patch in diff %}
-<div class="commit_diff">
+<section class="commit_diff">
 <header>
     <h3>{{ patch.new_file_path }}</h3>
     <ul class="buttons">
@@ -224,15 +224,18 @@
             index=loop.index)}}
 {% endautoescape %}
 {% endfor %}
+</section>
 {% endif %}
-</div>
+
 {% if authenticated and pull_request %}
 {{ mergeform.csrf_token }}
 </form>
 {% endif %}
+
 </div>
 </div>
 
+
 {% if pull_request and pull_request.comments%}
 <section class="request_comment">
 <form action="{{ url_for('.pull_request_drop_comment', username=username,

From a2a055279401e47dde2b43acde235b1c54c1c8ad Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 27 2015 12:55:37 +0000
Subject: [PATCH 5/7] Override the jquery css to ensure the color of the text used is what we want


---

diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css
index 170b5b4..9113495 100644
--- a/pagure/static/pagure.css
+++ b/pagure/static/pagure.css
@@ -850,3 +850,7 @@ span.CONFLICTS {
   padding-left: 20px;
   background: url(/static/red.png) 0 50% no-repeat;
 }
+
+.ui-widget-content {
+    color: #666!important;
+}

From 25d2bb0ed7e690fcfd8ef2c578a6ab47f9ab0125 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 27 2015 12:55:37 +0000
Subject: [PATCH 6/7] Enforce the order to be sure we always pass the test


---

diff --git a/tests/test_progit_lib.py b/tests/test_progit_lib.py
index a66b927..2462518 100644
--- a/tests/test_progit_lib.py
+++ b/tests/test_progit_lib.py
@@ -978,7 +978,8 @@ class PagureLibtests(tests.Modeltests):
         """ Test the get_issue_statuses of pagure.lib. """
         statuses = pagure.lib.get_issue_statuses(self.session)
         self.assertEqual(
-            statuses, ['Open', 'Invalid', 'Insufficient data', 'Fixed'])
+            sorted(statuses),
+            ['Fixed', 'Insufficient data', 'Invalid', 'Open'])
 
     def test_set_up_user(self):
         """ Test the set_up_user of pagure.lib. """

From c6341debc7d8c43e9579d7d95123e61cae702139 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 27 2015 13:11:19 +0000
Subject: [PATCH 7/7] More CSS fixes to reduce the impact of the jquery css within the tabs


---

diff --git a/pagure/static/koji.css b/pagure/static/koji.css
index 97833dc..ed22541 100644
--- a/pagure/static/koji.css
+++ b/pagure/static/koji.css
@@ -13,12 +13,12 @@ body {
     padding: 0px;
     font-size: small;
     font-family: Cantarell, sans-serif;
-    color: #666;
+    color: #666!important;
     background: #fff url(header-bg.png) repeat-x;
 }
 
 a, a:visited, a:hover {
-    color: #0066CC;
+    color: #0066CC!important;
     text-decoration: none;
 }
 
diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css
index 9113495..ac554e2 100644
--- a/pagure/static/pagure.css
+++ b/pagure/static/pagure.css
@@ -544,6 +544,7 @@ request_comment p {
     background: -ms-linear-gradient(top, #ededed 0%,#fff 100%); /* IE10+ */
     background: linear-gradient(to bottom, #ededed 0%,#fff 100%); /* W3C */
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ededed', endColorstr='#fff',GradientType=0 ); /* IE6-9 */
+    font-family: Cantarell,sans-serif;
 }
 
 .issue_action,