From 02a7a0e05a16d619f4624f04ba08e19b78ff0d9b Mon Sep 17 00:00:00 2001
From: Magnus Hagander
Date: Wed, 23 Apr 2014 19:02:27 +0200
Subject: Fix removing of authors/reviewers

There's a conflict between jquery-ui and bootstrap for buttons that breaks
django-selectable. The documented workaround doesn't work, but for now we don't
have any pages that require both at the same time, so just suppress the bootstrap
javascript when jquery-ui buttons are required.
---
 pgcommitfest/commitfest/templates/base.html      | 2 +-
 pgcommitfest/commitfest/templates/base_form.html | 4 ++++
 pgcommitfest/commitfest/views.py                 | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pgcommitfest/commitfest/templates/base.html b/pgcommitfest/commitfest/templates/base.html
index 940b2bf..55b6e84 100644
--- a/pgcommitfest/commitfest/templates/base.html
+++ b/pgcommitfest/commitfest/templates/base.html
@@ -41,7 +41,7 @@
 <script src="/static/commitfest/js/bootstrap-collapse.js"></script>
 <script src="/static/commitfest/js/jquery-ui.js"></script>
 <script type="text/javascript" src="/static/selectable/js/jquery.dj.selectable.js"></script>
-<script src="/static/commitfest/js/bootstrap-button.js"></script>
+{%if not block_bootstrap_button%}<script src="/static/commitfest/js/bootstrap-button.js"></script>{%endif%}
 <script src="/static/commitfest/js/commitfest.js"></script>
 {%block morescript%}{%endblock%}
 </html>
diff --git a/pgcommitfest/commitfest/templates/base_form.html b/pgcommitfest/commitfest/templates/base_form.html
index 40e423d..d4c135a 100644
--- a/pgcommitfest/commitfest/templates/base_form.html
+++ b/pgcommitfest/commitfest/templates/base_form.html
@@ -25,6 +25,10 @@ div.controls input[type='checkbox'] {
 div.controls ul {
    margin: 0px;
 }
+div.controls ul.selectable-deck li.selectable-deck-item a.selectable-deck-remove {
+   float: none;
+   margin-left: 20px;
+}
 </style>
 <form class="form-horizontal {{extraformclass}}" method="POST" action=".">{%csrf_token%}
 {%if form.errors%}
diff --git a/pgcommitfest/commitfest/views.py b/pgcommitfest/commitfest/views.py
index 6a72b93..ba0f911 100644
--- a/pgcommitfest/commitfest/views.py
+++ b/pgcommitfest/commitfest/views.py
@@ -168,6 +168,7 @@ def patchform(request, cfid, patchid):
 		'title': 'Edit patch',
 		'breadcrumbs': [{'title': cf.name, 'href': '/%s/' % cf.pk},
 						{'title': 'View patch', 'href': '/%s/%s/' % (cf.pk, patch.pk)}],
+		'block_bootstrap_button': True,
 	}, context_instance=RequestContext(request))
 
 @login_required
-- 
cgit v1.2.3