From 6967870220531671592466664f17448035dadb54 Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Jan 27 2016 10:10:27 +0000
Subject: 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'});
         }
       }