You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/07/11 15:06:02 UTC
[2/4] allura git commit: Added fontawesome fonts
Added fontawesome fonts
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/620c9956
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/620c9956
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/620c9956
Branch: refs/heads/master
Commit: 620c9956c9d65306b03575bdb07ca3b831d5bfe4
Parents: f71b1f2
Author: Rohan Verma <ro...@gmail.com>
Authored: Fri Jun 24 19:01:37 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon Jul 11 11:05:39 2016 -0400
----------------------------------------------------------------------
Allura/allura/templates/repo/merge_request.html | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/620c9956/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 d3b3081..543eaf8 100644
--- a/Allura/allura/templates/repo/merge_request.html
+++ b/Allura/allura/templates/repo/merge_request.html
@@ -90,7 +90,9 @@ Merge Request #{{req.request_number}}: {{req.summary}} ({{req.status}})
{% if req.merge_allowed(c.user) %}
<form action="merge" method="POST">
{{ lib.csrf_token() }}
- <input id="merge-btn" type="submit" value="Merge"{% if not can_merge or merge_status in ('ready', 'busy') %}disabled="disabled"{% endif %}>
+ <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>
</form>
{% endif %}
@@ -98,12 +100,16 @@ Merge Request #{{req.request_number}}: {{req.summary}} ({{req.status}})
<form action="save" method="POST">
{{ lib.csrf_token() }}
<input type="hidden" value="rejected" name="status">
- <input id="reject-btn" type="submit" value="Reject">
+ <button type="submit" id="reject-btn" type="submit" >
+ <i class="fa fa-ban" aria-hidden="true"></i> Reject
+ </button>
</form>
<form action="refresh" method="POST">
{{ lib.csrf_token() }}
- <input id="refresh-btn" type="submit" value="Refresh Commits">
+ <button type="submit" id="refresh-btn" type="submit" >
+ <i class="fa fa-refresh" aria-hidden="true"></i> Refresh Commits
+ </button>
<input type="hidden" value="{{req.source_branch}}" name="source_branch">
</form>
{% endif %}