From 3bf421e9473606d88f50b63c376029a3a6f94b2b Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Jan 25 2016 14:42:16 +0000
Subject: move the create PR functionality for the overview to the branches list


---

diff --git a/pagure/static/koji.css b/pagure/static/koji.css
index 046d6e9..7598e3e 100644
--- a/pagure/static/koji.css
+++ b/pagure/static/koji.css
@@ -401,3 +401,14 @@ color:#aaa;
     background-repeat: no-repeat;
     min-height: 150px;
 }
+
+.repoinfo-branchlistitem
+{
+ padding:3px 5px 3px 5px;
+}
+
+.repoinfo-activebranch
+{
+  background:#eee;
+  border:1px solid #ccc;
+}
diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index edd30bf..ab491ca 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -180,7 +180,7 @@ git push -u origin master</pre>
       {% endif %}
         <div class="card">
           <div class="card-block">
-            <h5><strong>Owners</strong></h5>
+            <h5><strong title="pants">Owners</strong></h5>
             <div class="m-b-2">
               <div>
                 <a href="{{ url_for('view_user', username=repo.user.user)}}">
@@ -204,6 +204,20 @@ git push -u origin master</pre>
               </div>
               {% endfor %}
             </div>
+            <h5><strong>Branches</strong></h5>
+            <div class="m-b-2">
+            {% for branch in branches %}
+              <div id="branch-{{branch}}" class="repoinfo-branchlistitem {% if branchname == branch %}repoinfo-activebranch{%endif%}">
+                {% if not branchname == branch %}
+                <a href="{{ url_for('view_repo_branch',
+                  username=username, repo=repo.name, branchname=branch) }}">
+                {% endif %}
+                  <span class="oi" data-glyph="random"></span> {{branch}}
+                {% if not branchname == branch %}
+                </a>
+              </div>
+              {% endfor %}
+            </div>
           </div>
           <h5><strong>Branches</strong></h5>
           <div class="m-b-2">
@@ -369,10 +383,28 @@ $(function() {
                 <span class="oi" data-glyph="random"> </span> \
                 {{ head }}</span> \
                 <div id="request_pull" class="pull-xs-right"> \
-                <a class="btn btn-primary btn-sm" href="/test/diff/'
+                <a class="btn btn-primary btn-sm" href="/{{repo.name}}/diff/'
                 + '{{ head }}..' + branch + '"> Request pull </a> \
                 </div></div>';
-          $($('.bodycontent').find('.row').children()[0]).before(html)
+          /*$($('.bodycontent').find('.row').children()[0]).before(html);*/
+          {% if repo.is_fork %}
+          html2 = '<div id="request_pull" class="pull-xs-right"> \
+                <a class="small label label-sm label-primary" data-toggle="tooltip" \
+                href="/fork/{{repo.user.user}}/{{repo.name}}/diff/'
+                + '{{ head }}..' + branch + '"\
+                 title="' + branch +' contains ' + res.message[branch].length+' \
+                 commit not in the upstream project. Click to create new PR now.'+'"> New PR</a> \
+                </div></div>';
+          {% else %}
+          html2 = '<div id="request_pull" class="pull-xs-right"> \
+                <a class="small label label-sm label-primary" data-toggle="tooltip" \
+                href="/{{repo.name}}/diff/' + '{{ head }}..' + branch + '"\
+                 title="' + branch +' contains ' + res.message[branch].length+' \
+                 commit not in the main branch. Click to create new PR now.'+'"> New PR</a> \
+                </div></div>';
+          {%endif%}
+          $('#branch-'+branch).append(html2);
+          $('[data-toggle="tooltip"]').tooltip({placement : 'bottom'});
         }
       }
     }