From 6967870220531671592466664f17448035dadb54 Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Jan 27 2016 10:10:27 +0000
Subject: [PATCH 1/6] slight rework of the branches display on the overview


---

diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css
index 32e2470..9fb922e 100644
--- a/pagure/static/pagure.css
+++ b/pagure/static/pagure.css
@@ -390,6 +390,12 @@ a.notblue {
 .branch_del {
   padding: 0px 0px;
   margin: 0px 0px;
+  text-align: right;
+}
+
+.branch_del #delete_branch_form
+{
+display:inline;
 }
 
 .branch_del .btn-secondary{
diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index 5b7280b..345cbc0 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -203,29 +203,31 @@ git push -u origin master</pre>
               <div id="branch-{{branch}}" class="repoinfo-branchlistitem row">
                 <div class="branch_name{% if repo_admin %} col-md-8{% endif %}">
                   {% if not branchname == branch %}
+                  <span class="oi text-muted" data-glyph="random"></span>
                   <a class="" href="{{ url_for('view_repo_branch',
                     username=username, repo=repo.name, branchname=branch) }}"
                     title="{{ branch }}">
-                    <span class="oi" data-glyph="random"></span> {{ branch }}
+                    {{ branch }}
                   </a>
                   {% else %}
-                  <span class="oi" data-glyph="star" title="current branch">
-                  </span> {{ branch }}
+                  <span class="oi text-muted" data-glyph="random">
+                  </span> <strong title="Currently viewing branch {{branch}}" data-toggle="tooltip">{{ branch }}</strong>
                   {% endif %}
                 </div>
-                <div class="branch_del col-md-1">
+                <div class="branch_del col-md-4">
                   {% if repo_admin and branch != head %}
-                  <form action="{{
+                  <form id="delete_branch_form" action="{{
                     url_for('.delete_branch',
                             username=username, repo=repo.name, branchname=branch)
                     }}" method="post" class="inline icon del_icon"
                     onsubmit="return confirm('Are you sure you want to remove the branch: {{ branch }}?\nThis cannot be un-done!');">
                     {{ form.csrf_token }}
-                    <button class="btn btn-secondary repoinfo-branchlistitem"
-                      title="Remove branch {{ branch }}">
+                    <a title="Remove branch {{ branch }}" href="#" onclick="$('#delete_branch_form').submit();">
                       <span class="oi" data-glyph="trash"></span>
-                    </button>
+                    </a>
                   </form>
+                  {% elif repo_admin and branch == head %}
+                  <span class="oi text-muted" data-glyph="star" title="default branch">
                   {% endif %}
                 </div>
               </div>
@@ -391,21 +393,21 @@ $(function() {
                 </div></div>';
           /*$($('.bodycontent').find('.row').children()[0]).before(html);*/
           {% if repo.is_fork %}
-          html2 = '<div id="request_pull" class="col-md-2"> \
+          html2 = ' \
                 <a class="small label label-sm label-primary" data-toggle="tooltip" \
                 href="' + url + 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>';
+                </div>';
           {% else %}
-          html2 = '<div id="request_pull" class="col-md-2"> \
+          html2 = ' \
                 <a class="small label label-sm label-primary" data-toggle="tooltip" \
                 href="' + url + 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>';
+                </div>';
           {%endif%}
-          $('#branch-'+branch).append(html2);
+          $('#branch-'+branch+' .branch_del').prepend(html2);
           $('[data-toggle="tooltip"]').tooltip({placement : 'bottom'});
         }
       }

From 97bd79a61b310ba16544efebf1f47b7228aeb4c9 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jan 27 2016 10:10:27 +0000
Subject: [PATCH 2/6] Small css adjustment for my weird setup


---

diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css
index 9fb922e..7c9c806 100644
--- a/pagure/static/pagure.css
+++ b/pagure/static/pagure.css
@@ -393,9 +393,12 @@ a.notblue {
   text-align: right;
 }
 
-.branch_del #delete_branch_form
-{
-display:inline;
+.branch_del .label{
+  padding: 0.25em 0.3em;
+}
+
+.branch_del #delete_branch_form {
+  display:inline;
 }
 
 .branch_del .btn-secondary{

From 850df76220b61c0aac9d162a2942bb2993a41844 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jan 27 2016 10:32:34 +0000
Subject: [PATCH 3/6] Use an arrow for the default branch


---

diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index 345cbc0..ea7f16b 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -202,16 +202,19 @@ git push -u origin master</pre>
             {% for branch in branches %}
               <div id="branch-{{branch}}" class="repoinfo-branchlistitem row">
                 <div class="branch_name{% if repo_admin %} col-md-8{% endif %}">
-                  {% if not branchname == branch %}
+                  {% if repo_admin and branch == head %}
+                  <span class="oi text-muted" data-glyph="arrow-right"></span>
+                  {% else %}
                   <span class="oi text-muted" data-glyph="random"></span>
+                  {% endif %}
+                  {% if not branchname == branch %}
                   <a class="" href="{{ url_for('view_repo_branch',
                     username=username, repo=repo.name, branchname=branch) }}"
                     title="{{ branch }}">
                     {{ branch }}
                   </a>
                   {% else %}
-                  <span class="oi text-muted" data-glyph="random">
-                  </span> <strong title="Currently viewing branch {{branch}}" data-toggle="tooltip">{{ branch }}</strong>
+                  <strong title="Currently viewing branch {{branch}}" data-toggle="tooltip">{{ branch }}</strong>
                   {% endif %}
                 </div>
                 <div class="branch_del col-md-4">
@@ -226,8 +229,6 @@ git push -u origin master</pre>
                       <span class="oi" data-glyph="trash"></span>
                     </a>
                   </form>
-                  {% elif repo_admin and branch == head %}
-                  <span class="oi text-muted" data-glyph="star" title="default branch">
                   {% endif %}
                 </div>
               </div>

From 69b8655c4d78e1159b6680e2ca1e9c37d64f2749 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jan 27 2016 10:34:19 +0000
Subject: [PATCH 4/6] Add a title to the arrow


---

diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index ea7f16b..1ea2c4d 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -203,7 +203,8 @@ git push -u origin master</pre>
               <div id="branch-{{branch}}" class="repoinfo-branchlistitem row">
                 <div class="branch_name{% if repo_admin %} col-md-8{% endif %}">
                   {% if repo_admin and branch == head %}
-                  <span class="oi text-muted" data-glyph="arrow-right"></span>
+                  <span class="oi text-muted" data-glyph="arrow-right"
+                  title="Default branch"></span>
                   {% else %}
                   <span class="oi text-muted" data-glyph="random"></span>
                   {% endif %}

From aac28151144046527631a5a869bf5e4d76202c2d Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jan 27 2016 11:53:17 +0000
Subject: [PATCH 5/6] Put head at the top


---

diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index 1ea2c4d..4a25116 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -199,16 +199,35 @@ git push -u origin master</pre>
             </div>
             <h5><strong>Branches</strong></h5>
             <div class="m-b-2">
-            {% for branch in branches %}
+              {% if head %}
+              <div id="branch-{{ head }}" class="repoinfo-branchlistitem row">
+                <div class="branch_name col-md-10">
+                  {% if branchname == head %}
+                  <span class="oi text-muted" data-glyph="random"
+                    title="Default branch"></span>
+                  <strong title="Currently viewing branch {{ head }}" data-toggle="tooltip">{{ head }}</strong>
+                  {% else  %}
+                  <span class="oi text-muted" data-glyph="random"
+                    title="Default branch"></span>
+                  <a class="" href="{{ url_for('view_repo_branch',
+                    username=username, repo=repo.name, branchname=head) }}"
+                    title="{{ head }}">
+                    {{ head }}
+                  </a>
+                  {% endif %}
+                </div>
+                <div class="branch_del col-md-2">
+                  <span class="oi text-muted" data-glyph="star"
+                    title="Default branch"></span>
+                </div>
+              </div>
+              {% endif %}
+
+            {% for branch in branches if branch != head%}
               <div id="branch-{{branch}}" class="repoinfo-branchlistitem row">
-                <div class="branch_name{% if repo_admin %} col-md-8{% endif %}">
-                  {% if repo_admin and branch == head %}
-                  <span class="oi text-muted" data-glyph="arrow-right"
-                  title="Default branch"></span>
-                  {% else %}
+                <div class="branch_name col-md-8">
                   <span class="oi text-muted" data-glyph="random"></span>
-                  {% endif %}
-                  {% if not branchname == branch %}
+                  {% if branchname != branch %}
                   <a class="" href="{{ url_for('view_repo_branch',
                     username=username, repo=repo.name, branchname=branch) }}"
                     title="{{ branch }}">
@@ -217,6 +236,7 @@ git push -u origin master</pre>
                   {% else %}
                   <strong title="Currently viewing branch {{branch}}" data-toggle="tooltip">{{ branch }}</strong>
                   {% endif %}
+
                 </div>
                 <div class="branch_del col-md-4">
                   {% if repo_admin and branch != head %}

From 30742198b587ba562fac4be2a89e54390122adfd Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jan 27 2016 11:58:20 +0000
Subject: [PATCH 6/6] Fix HTML


---

diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index 4a25116..b3379df 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -266,14 +266,14 @@ git push -u origin master</pre>
             <div>
               <div class="form-group">
                 <div class="input-group input-group-sm">
-                  <div class="input-group-addon">SSH</span></div>
+                  <div class="input-group-addon">SSH</div>
                   <input class="form-control" type="text" value="{{
                     config.get('GIT_URL_SSH') }}{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git" readonly>
                 </div>
               </div>
               <div class="form-group">
                 <div class="input-group input-group-sm">
-                  <div class="input-group-addon">GIT</span></div>
+                  <div class="input-group-addon">GIT</div>
                   <input class="form-control" type="text" value="{{
                     config.get('GIT_URL_GIT') }}{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git" readonly>
                 </div>
@@ -286,7 +286,7 @@ git push -u origin master</pre>
                 {% if authenticated and repo_admin %}
                 <div class="form-group">
                   <div class="input-group input-group-sm">
-                    <div class="input-group-addon">SSH</span></div>
+                    <div class="input-group-addon">SSH</div>
                     <input class="form-control" type="text" value="{{
                       config.get('GIT_URL_SSH') }}docs/{{ repo.fullname }}.git" readonly>
                   </div>
@@ -294,7 +294,7 @@ git push -u origin master</pre>
                 {% endif %}
                 <div class="form-group">
                   <div class="input-group input-group-sm">
-                    <div class="input-group-addon">GIT</span></div>
+                    <div class="input-group-addon">GIT</div>
                     <input class="form-control" type="text" value="{{
                       config.get('GIT_URL_GIT') }}docs/{{ repo.fullname }}.git" readonly>
                   </div>
@@ -305,7 +305,7 @@ git push -u origin master</pre>
                 <h5><strong>Issues GIT URLs</strong></h5>
                 <div class="form-group">
                   <div class="input-group input-group-sm">
-                    <div class="input-group-addon">SSH</span></div>
+                    <div class="input-group-addon">SSH</div>
                     <input class="form-control" type="text" value="{{
                       config.get('GIT_URL_SSH') }}tickets/{{ repo.fullname }}.git" readonly>
                   </div>
@@ -314,7 +314,7 @@ git push -u origin master</pre>
                 <h5><strong>Pull Requests GIT URLs</strong></h5>
                 <div class="form-group">
                   <div class="input-group input-group-sm">
-                    <div class="input-group-addon">SSH</span></div>
+                    <div class="input-group-addon">SSH</div>
                     <input class="form-control" type="text" value="{{
                       config.get('GIT_URL_SSH') }}requests/{{ repo.fullname }}.git" readonly>
                   </div>
@@ -364,6 +364,7 @@ git push -u origin master</pre>
         </div>
         {% endif %}
       </div>
+    </div>
 
   {% endif %}