From f2a31319d27bf00b9d7aefa66d42db00b3d80e89 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jan 26 2016 15:38:20 +0000
Subject: [PATCH 1/3] Bring back the links to delete a branch from the overview page


---

diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css
index 73d9e5d..4b4c0eb 100644
--- a/pagure/static/pagure.css
+++ b/pagure/static/pagure.css
@@ -342,7 +342,7 @@ btn-group-vertical > .btn-group::after, .btn-group-vertical > .btn-group::before
 {
   font-family: "Open Sans";
   background: transparent;
-padding:0;
+  padding: 0;
 }
 
 .card pre
@@ -357,12 +357,12 @@ a.notblue {
 
 #headerSearch .selectize-control.single .selectize-input::after
 {
-content: "\e08f";
-font-family: "Icons";
-border:none;
-top:30%;
-right:22px;
-color:#aaa;
+  content: "\e08f";
+  font-family: "Icons";
+  border:none;
+  top:30%;
+  right:22px;
+  color:#aaa;
 }
 
 .footer a, .footer a:hover { color: #d9d9d9; }
@@ -379,6 +379,22 @@ color:#aaa;
  padding:3px 5px 3px 5px;
 }
 
+.branch_name {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.branch_del {
+  padding: 0px 0px;
+  margin: 0px 0px;
+}
+
+.branch_del .btn-secondary{
+  border: 0px;
+  color: #0275d8;
+}
+
 .repoinfo-activebranch
 {
   background:#eee;
diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index f853927..cef9031 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -200,31 +200,34 @@ git push -u origin master</pre>
             <h5><strong>Branches</strong></h5>
             <div class="m-b-2">
             {% for branch in branches %}
-              <div id="branch-{{branch}}" class="repoinfo-branchlistitem">
-                {% if not branchname == branch %}
-                <a href="{{ url_for('view_repo_branch',
-                  username=username, repo=repo.name, branchname=branch) }}">
-                  <span class="oi" data-glyph="random"></span> {{ branch }}
-                </a>
-                {% else %}
-                <span class="oi" data-glyph="star" title="current branch">
-                </span> {{ branch }}
-                {% endif %}
-                {#
-                {% if repo_admin and branchname and branchname != head %}
-                <form action="{{
-                  url_for('.delete_branch',
-                          username=username, repo=repo.name, branchname=branchname)
-                  }}" method="post" class="inline icon del_icon">
-                  {{ form.csrf_token }}
-                  <button class="btn btn-secondary repoinfo-branchlistitem"
-                      onclick="return confirm('Are you sure you want to remove this branch?\nThis cannot be un-done!');"
-                    title="Remove branch {{ branchname }}">
-                    <span class="oi" data-glyph="trash"></span>
-                  </button>
-                </form>
-                {% endif %}
-                #}
+              <div id="branch-{{branch}}" class="repoinfo-branchlistitem row">
+                <div class="branch_name col-md-8">
+                  {% if not branchname == branch %}
+                  <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 }}
+                  </a>
+                  {% else %}
+                  <span class="oi" data-glyph="star" title="current branch">
+                  </span> {{ branch }}
+                  {% endif %}
+                </div>
+                <div class="branch_del col-md-1">
+                  {% if repo_admin and branch != head %}
+                  <form action="{{
+                    url_for('.delete_branch',
+                            username=username, repo=repo.name, branchname=branch)
+                    }}" method="post" class="inline icon del_icon">
+                    {{ form.csrf_token }}
+                    <button class="btn btn-secondary repoinfo-branchlistitem"
+                        onclick="return confirm('Are you sure you want to remove the branch: {{ branch }}?\nThis cannot be un-done!');"
+                      title="Remove branch {{ branch }}">
+                      <span class="oi" data-glyph="trash"></span>
+                    </button>
+                  </form>
+                  {% endif %}
+                </div>
               </div>
               {% endfor %}
             </div>
@@ -383,19 +386,19 @@ $(function() {
                 <span class="pr-toplabel"> \
                 <span class="oi" data-glyph="random"> </span> \
                 {{ head }}</span> \
-                <div id="request_pull" class="pull-xs-right"> \
+                <div id="request_pull" class="col-md-2"> \
                 <a class="btn btn-primary btn-sm" href="' + url + branch + '"> Request pull </a> \
                 </div></div>';
           /*$($('.bodycontent').find('.row').children()[0]).before(html);*/
           {% if repo.is_fork %}
-          html2 = '<div id="request_pull" class="pull-xs-right"> \
+          html2 = '<div id="request_pull" class="col-md-2"> \
                 <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>';
           {% else %}
-          html2 = '<div id="request_pull" class="pull-xs-right"> \
+          html2 = '<div id="request_pull" class="col-md-2"> \
                 <a class="small label label-sm label-primary" data-toggle="tooltip" \
                 href="' + url + branch + '"\
                  title="' + branch +' contains ' + res.message[branch].length+' \

From 341322ecda3706bfad4cf6c5d2213c52f7a5fde1 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jan 26 2016 15:56:47 +0000
Subject: [PATCH 2/3] Only split the line in columns if there is more than one column


---

diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index cef9031..1aed123 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -201,7 +201,7 @@ git push -u origin master</pre>
             <div class="m-b-2">
             {% for branch in branches %}
               <div id="branch-{{branch}}" class="repoinfo-branchlistitem row">
-                <div class="branch_name col-md-8">
+                <div class="branch_name{% if repo_admin %} col-md-8{% endif %}">
                   {% if not branchname == branch %}
                   <a class="" href="{{ url_for('view_repo_branch',
                     username=username, repo=repo.name, branchname=branch) }}"

From 81ea61bad39a4d916b581025a2258e279e6d3fe3 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jan 26 2016 18:44:19 +0000
Subject: [PATCH 3/3] Use an onsubmit() instead of an onclick() to ask the user to confirm the action


---

diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index 1aed123..5b7280b 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -218,10 +218,10 @@ git push -u origin master</pre>
                   <form action="{{
                     url_for('.delete_branch',
                             username=username, repo=repo.name, branchname=branch)
-                    }}" method="post" class="inline icon del_icon">
+                    }}" 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"
-                        onclick="return confirm('Are you sure you want to remove the branch: {{ branch }}?\nThis cannot be un-done!');"
                       title="Remove branch {{ branch }}">
                       <span class="oi" data-glyph="trash"></span>
                     </button>