<div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr">Thomas De Schampheleire <<a href="mailto:patrickdepinguin@gmail.com">patrickdepinguin@gmail.com</a>> schrieb am Di., 30. Jan. 2018 um 15:21 Uhr:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Dominik,<br>
<br>
2018-01-29 20:42 GMT+01:00 Dominik Ruf <<a href="mailto:dominikruf@gmail.com" target="_blank">dominikruf@gmail.com</a>>:<br>
> There are a few things left.<br>
> <a href="https://kallithea-scm.org/repos/kallithea/pull-request/126/_/remaining_bootstrap_related_stuff_v2_v4" rel="noreferrer" target="_blank">https://kallithea-scm.org/repos/kallithea/pull-request/126/_/remaining_bootstrap_related_stuff_v2_v4</a><br>
><br>
> Namely:<br>
> - fix for 2way diff you mentioned<br>
> - grid system for changeset graph<br>
> - override some bootstrap variables<br>
> - watch:less for developers<br>
> - theme.less<br>
> - some cleanup<br>
<br>
Thanks for clarifying.<br>
<br>
I found another issue related to bootstrap changes, caused by commit<br>
<br>
# HG changeset patch<br>
# User domruf <<a href="mailto:dominikruf@gmail.com" target="_blank">dominikruf@gmail.com</a>><br>
# Date 1498592973 -7200<br>
#      Tue Jun 27 21:49:33 2017 +0200<br>
# Node ID 3fca87aa2b15e3267d6ec08d35e6aafced6f9027<br>
# Parent  91182a358fb3b3e913e9d3f7e207474e5f8511ab<br>
templates: don't use ordinary elements as links or buttons by adding btn styling<br>
<br>
<br>
In these changes, there seems to be one problematic one:<br>
<br>
diff --git a/kallithea/templates/pullrequests/pullrequest_data.html<br>
b/kallithea/templates/pullrequests/pullrequest_data.html<br>
--- a/kallithea/templates/pullrequests/pullrequest_data.html<br>
+++ b/kallithea/templates/pullrequests/pullrequest_data.html<br>
@@ -61,7 +61,7 @@<br>
       <td><br>
         %if pr.owner_id == request.authuser.user_id:<br>
           ${h.form(url('pullrequest_delete',<br>
repo_name=pr.other_repo.repo_name,<br>
pull_request_id=pr.pull_request_id))}<br>
-          <div class="btn btn-default btn-xs"<br>
+          <button type="button" class="btn btn-default btn-xs"<br>
                   id="remove_${pr.pull_request_id}"<br>
                   name="remove_${pr.pull_request_id}"<br>
                   title="${_('Delete Pull Request')}"<br>
@@ -69,8 +69,8 @@<br>
                       && ((${len(pr.comments)} == 0) ||<br>
                           confirm('${_('Confirm again to delete this<br>
pull request with %s comments') % len(pr.comments)}'))<br>
                       "><br>
-            <i class="icon-minus-circled"></i><br>
-          </div><br>
+            <i class="icon-minus-circled text-danger"></i><br>
+          </button><br>
           ${h.end_form()}<br>
         %endif<br>
       </td><br>
<br>
The special thing about this button, in contrast to the other buttons<br>
in Kallithea with 'type="button"' is that it serves as a real submit<br>
button. There is no JavaScript actually doing some action when<br>
clicking the button. The JavaScript only shows the confirm boxes.<br>
<br>
The intention is that after confirming, the form is submitted, but<br>
this is not the case. Nothing happens after confirming.<br>
<br>
Previously, there was no 'type' attribute, and it seems that the<br>
button also served as submit button (perhaps in forms the first button<br>
is treated as submit button anyway?).<br>
<br>
Following is the proper fix according to me (tested, it works):<br>
<br>
diff --git a/kallithea/templates/pullrequests/pullrequest_data.html<br>
b/kallithea/templates/pullrequests/pullrequest_data.html<br>
--- a/kallithea/templates/pullrequests/pullrequest_data.html<br>
+++ b/kallithea/templates/pullrequests/pullrequest_data.html<br>
@@ -61,7 +61,7 @@<br>
       <td><br>
         %if pr.owner_id == request.authuser.user_id:<br>
           ${h.form(url('pullrequest_delete',<br>
repo_name=pr.other_repo.repo_name,<br>
pull_request_id=pr.pull_request_id))}<br>
-          <button type="button" class="btn btn-link btn-xs"<br>
+          <button type="submit" class="btn btn-link btn-xs"<br>
                   id="remove_${pr.pull_request_id}"<br>
                   name="remove_${pr.pull_request_id}"<br>
                   title="${_('Delete Pull Request')}"<br>
<br>
Best regards,<br>
Thomas<br></blockquote><div class="gmail_quote">Thanks again.</div><div class="gmail_quote">You are right, the type should be submit in this case.</div><div>I'll create an additional changeset. </div></div></div>