allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kentontay...@apache.org
Subject allura git commit: Put the disabled attr on the merge button, not the icon within it
Date Tue, 24 Oct 2017 14:22:00 GMT
Repository: allura
Updated Branches:
  refs/heads/master bb0326c0f -> f8c3b8bf8


Put the disabled attr on the merge button, not the icon within it


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/f8c3b8bf
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/f8c3b8bf
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/f8c3b8bf

Branch: refs/heads/master
Commit: f8c3b8bf8cf3524d4a5bbf9a5d1bb058a846df55
Parents: bb0326c
Author: Dave Brondsema <dave@brondsema.net>
Authored: Mon Oct 23 14:15:12 2017 -0400
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Mon Oct 23 14:15:12 2017 -0400

----------------------------------------------------------------------
 Allura/allura/templates/repo/merge_request.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/f8c3b8bf/Allura/allura/templates/repo/merge_request.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/merge_request.html b/Allura/allura/templates/repo/merge_request.html
index fd3acdf..7d861e9 100644
--- a/Allura/allura/templates/repo/merge_request.html
+++ b/Allura/allura/templates/repo/merge_request.html
@@ -93,8 +93,8 @@ Merge Request #{{req.request_number}}: {{req.summary}} ({{req.status}})
     {% if req.merge_allowed(c.user) %}
         <form action="merge" method="POST" onsubmit="return confirm('Do you really want
to Accept this Merge Request?');">
           {{ lib.csrf_token() }}
-          <button type="submit" id="merge-btn">
-            <i class="fa fa-code-fork fa-flip-vertical" aria-hidden="true" {% if not can_merge
or merge_status in ('ready', 'busy') %}disabled="disabled"{% endif %}></i> Merge
+          <button type="submit" id="merge-btn" {% if not can_merge or merge_status in
('ready', 'busy') %}disabled="disabled"{% endif %}>
+            <i class="fa fa-code-fork fa-flip-vertical" aria-hidden="true"></i>
Merge
           </button>
         </form>
     {% endif %}


Mime
View raw message