From 1d8cac6e73cea1cfbed76a7694150cff12582b4f Mon Sep 17 00:00:00 2001
From: Haakon Meland Eriksen <haakon.eriksen@far.no>
Date: Wed, 11 Nov 2015 23:31:18 +0100
Subject: [PATCH] Rearranged comment buttons

---
 view/tpl/comment_item.tpl | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 view/tpl/comment_item.tpl

diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
old mode 100755
new mode 100644
index 49c6af764..9c8de8301
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -22,7 +22,20 @@
 				<div class="clear"></div>
 				<div id="comment-tools-{{$id}}" class="comment-tools">
 					<div id="comment-edit-bb-{{$id}}" class="btn-toolbar pull-left">
+                                                {{if $feature_encrypt}}
+                                                <div class='btn-group'>
+                                                        <button class="btn btn-default btn-xs" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;">
+                                                                <i class="icon-key comment-icon"></i>
+                                                        </button>
+                                                </div>
+                                                {{/if}}
+
 						<div class='btn-group'>
+<!--button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('
+{{$comment}}','img', {{$id}}); return false;">
+                                                                <i class="icon-camera comment-icon"></i>
+                                                        </button-->
+
 							<button class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;">
 								<i class="icon-bold comment-icon"></i>
 							</button>
@@ -40,9 +53,6 @@
 							</button>
 						</div>
 						<div class='btn-group'>
-							<!--button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;">
-								<i class="icon-camera comment-icon"></i>
-							</button-->
 							<button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertCommentURL('{{$comment}}',{{$id}}); return false;">
 								<i class="icon-link comment-icon"></i>
 							</button>
@@ -50,13 +60,6 @@
 								<i class="icon-facetime-video comment-icon"></i>
 							</button-->
 						</div>
-						{{if $feature_encrypt}}
-						<div class='btn-group'>
-							<button class="btn btn-default btn-xs" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;">
-								<i class="icon-key comment-icon"></i>
-							</button>
-						</div>
-						{{/if}}
 					</div>
 					<div class="btn-group pull-right" id="comment-edit-submit-wrapper-{{$id}}">
 						{{if $preview}}