From 52fa84135c261f820a8ac45d4d5a63ffd97d45e2 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 25 Jul 2014 01:13:08 -0700
Subject: wrong label on icon

---
 view/tpl/comment_item.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/comment_item.tpl')

diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 423d13d88..351cc8e14 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -37,7 +37,7 @@
 						<button class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;">
 							<i class="icon-terminal comment-icon"></i>
 						</button>
-						<button class="btn btn-default btn-xs" title="{{$comment}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;">
+						<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="insertbbcomment('{{$comment}}','url', {{$id}}); return false;">
-- 
cgit v1.2.3


From 5bdfc2f64780abd36d889dc0bbe52026b768631b Mon Sep 17 00:00:00 2001
From: Alexandre Hannud Abdo <abdo@member.fsf.org>
Date: Tue, 16 Sep 2014 18:56:34 -0300
Subject: Fix name attribute of button elements so jquery '.submit()' doesn't
 break

According to "Additional notes" in:

http://api.jquery.com/submit/

Not fixing buttons created with 'input' tags.
---
 view/tpl/comment_item.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/comment_item.tpl')

diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 351cc8e14..e68314797 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -58,7 +58,7 @@
 							<i class="icon-eye-open comment-icon" ></i>
 						</button>
 						{{/if}}
-						<button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-xs" type="submit" name="submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button>
+						<button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-xs" type="submit" name="button-submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button>
 					</div>
 				</div>
 				<div class="clear"></div>
-- 
cgit v1.2.3


From e233e386b84f8b43cfc8d757cad454403670e043 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <saparvia@caterva.eu>
Date: Mon, 8 Dec 2014 22:46:30 +0100
Subject: Group comment editor icons

---
 view/tpl/comment_item.tpl | 62 ++++++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

(limited to 'view/tpl/comment_item.tpl')

diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index e68314797..ab67bc196 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -21,35 +21,41 @@
 				{{/if}}
 				<div class="clear"></div>
 				<div id="comment-tools-{{$id}}" class="comment-tools">
-					<div id="comment-edit-bb-{{$id}}" class="btn-group pull-left">
-						<button class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;">
-							<i class="icon-bold comment-icon"></i>
-						</button>
-						<button class="btn btn-default btn-xs" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;">
-							<i class="icon-italic comment-icon"></i>
-						</button>
-						<button class="btn btn-default btn-xs" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;">
-							<i class="icon-underline comment-icon"></i>
-						</button>
-						<button class="btn btn-default btn-xs" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;">
-							<i class="icon-quote-left comment-icon"></i>
-						</button>
-						<button class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;">
-							<i class="icon-terminal comment-icon"></i>
-						</button>
-						<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="insertbbcomment('{{$comment}}','url', {{$id}}); return false;">
-							<i class="icon-link comment-icon"></i>
-						</button>
-						<button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;">
-							<i class="icon-facetime-video comment-icon"></i>
-						</button>
+					<div id="comment-edit-bb-{{$id}}" class="btn-toolbar pull-left">
+						<div class='btn-group'>
+							<button class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;">
+								<i class="icon-bold comment-icon"></i>
+							</button>
+							<button class="btn btn-default btn-xs" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;">
+								<i class="icon-italic comment-icon"></i>
+							</button>
+							<button class="btn btn-default btn-xs" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;">
+								<i class="icon-underline comment-icon"></i>
+							</button>
+							<button class="btn btn-default btn-xs" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;">
+								<i class="icon-quote-left comment-icon"></i>
+							</button>
+							<button class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;">
+								<i class="icon-terminal comment-icon"></i>
+							</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="insertbbcomment('{{$comment}}','url', {{$id}}); return false;">
+								<i class="icon-link comment-icon"></i>
+							</button>
+							<button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;">
+								<i class="icon-facetime-video comment-icon"></i>
+							</button>
+						</div>
 						{{if $feature_encrypt}}
-						<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 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}}">
-- 
cgit v1.2.3