Return-Path: <commits-return-14556-archive-asf-public=cust-asf.ponee.io@allura.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 1AFA7200B3B
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Mon, 11 Jul 2016 17:06:03 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 198B2160A78; Mon, 11 Jul 2016 15:06:03 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 6C2E8160A7D
	for <archive-asf-public@cust-asf.ponee.io>; Mon, 11 Jul 2016 17:06:02 +0200 (CEST)
Received: (qmail 55556 invoked by uid 500); 11 Jul 2016 15:06:01 -0000
Mailing-List: contact commits-help@allura.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@allura.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@allura.apache.org>
List-Post: <mailto:commits@allura.apache.org>
List-Id: <commits.allura.apache.org>
Reply-To: dev@allura.apache.org
Delivered-To: mailing list commits@allura.apache.org
Received: (qmail 55496 invoked by uid 99); 11 Jul 2016 15:06:01 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jul 2016 15:06:01 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 45C29E032D; Mon, 11 Jul 2016 15:06:01 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: brondsem@apache.org
To: commits@allura.apache.org
Date: Mon, 11 Jul 2016 15:06:02 -0000
Message-Id: <94875e05697d4799890796911adac9c0@git.apache.org>
In-Reply-To: <91929bb3dba2496abb9795124f2bab9c@git.apache.org>
References: <91929bb3dba2496abb9795124f2bab9c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/4] allura git commit: Added fontawesome fonts
archived-at: Mon, 11 Jul 2016 15:06:03 -0000

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 <rohanverma2004@gmail.com>
Authored: Fri Jun 24 19:01:37 2016 +0530
Committer: Dave Brondsema <dave@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 %}