From 3c6cf1f19ce783fe1b3b735cc405bf052d25aad7 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 26 Apr 2012 19:55:20 -0700
Subject: [PATCH] make comment edit icons look more like base theme

---
 htconfig.php                             |   2 +-
 include/conversation.php                 |   8 +++++
 view/theme/duepuntozero/bbedit.png       | Bin 0 -> 2145 bytes
 view/theme/duepuntozero/comment_item.tpl |  16 ++++-----
 view/theme/duepuntozero/style.css        |  40 +++++++++++------------
 5 files changed, 37 insertions(+), 29 deletions(-)
 create mode 100644 view/theme/duepuntozero/bbedit.png

diff --git a/htconfig.php b/htconfig.php
index 63a40c8090..872572654a 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -69,7 +69,7 @@ $a->config['system']['rino_encrypt'] = true;
 
 // allowed themes (change this from admin panel after installation)
 
-$a->config['system']['allowed_themes'] = 'dispy,quattro,testbubble,vier,darkbubble,darkzero,duepuntozero,greenzero,purplezero,quattro-green,slackr,diabook,diabook-blue';
+$a->config['system']['allowed_themes'] = 'dispy,quattro,vier,darkzero,duepuntozero,greenzero,purplezero,slackr,diabook';
 
 // default system theme
 
diff --git a/include/conversation.php b/include/conversation.php
index 1b869b91e4..521b4623b8 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -553,6 +553,14 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 							'$myphoto' => $a->contact['thumb'],
 							'$comment' => t('Comment'),
 							'$submit' => t('Submit'),
+							'$edbold' => t('Bold'),
+							'$editalic' => t('Italic'),
+							'$eduline' => t('Underline'),
+							'$edquote' => t('Quote'),
+							'$edcode' => t('Code'),
+							'$edimg' => t('Image'),
+							'$edurl' => t('Link'),
+							'$edvideo' => t('Video'),
 							'$preview' => t('Preview'),
 							'$ww' => (($mode === 'network') ? $commentww : '')
 						));
diff --git a/view/theme/duepuntozero/bbedit.png b/view/theme/duepuntozero/bbedit.png
new file mode 100644
index 0000000000000000000000000000000000000000..b89f2f7a830b573d37ea591e715d5e9507574642
GIT binary patch
literal 2145
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
X)oe|$-m16t00000NkvXXu0mjfyN3QR

literal 0
HcmV?d00001

diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl
index 84b9597e85..ea24d95cc3 100755
--- a/view/theme/duepuntozero/comment_item.tpl
+++ b/view/theme/duepuntozero/comment_item.tpl
@@ -13,28 +13,28 @@
 				<div class="comment-edit-photo-end"></div>
 				<ul class="comment-edit-bb-$id">
 					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edbold"
 						onclick="insertFormatting('$comment','b', $id);"></a></li>
 					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$editalic"
 						onclick="insertFormatting('$comment','i', $id);"></a></li>
 					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$eduline"
 						onclick="insertFormatting('$comment','u', $id);"></a></li>
 					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edquote"
 						onclick="insertFormatting('$comment','quote', $id);"></a></li>
 					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edcode"
 						onclick="insertFormatting('$comment','code', $id);"></a></li>
 					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edimg"
 						onclick="insertFormatting('$comment','img', $id);"></a></li>
 					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edurl"
 						onclick="insertFormatting('$comment','url', $id);"></a></li>
 					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edvideo"
 						onclick="insertFormatting('$comment','video', $id);"></a></li>
 				</ul>	
 				<div class="comment-edit-bb-end"></div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 0429ba5f06..2667c4334a 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2956,62 +2956,62 @@ aside input[type='text'] {
 }
 .editicon {
     display: inline-block;
-    width: 21px;
-    height: 21px;
-    background: url(editicons.png) no-repeat;
-    border: 0;
+    width: 16px;
+    height: 16px;
+    background-image: url(bbedit.png);
+	background-color: #fff;
     text-decoration: none;
 }
 .editicon:hover {
-	border: 0;
+	background-color: #ccc;
 }
 .boldbb {
 	background-position: 0px 0px;
 }
 .boldbb:hover {
-	background-position: -22px 0px;
+	background-position: 0px -16px;
 }
 .italicbb {
-	background-position: 0px -22px;
+	background-position: -16px 0px;
 }
 .italicbb:hover {
-	background-position: -22px -22px;
+	background-position: -16px -16px;
 }
 .underlinebb {
-	background-position: 0px -44px;
+	background-position: -32px 0px;
 }
 .underlinebb:hover {
-	background-position: -22px -44px;
+	background-position: -32px -16px;
 }
 .quotebb {
-	background-position: 0px -66px;
+	background-position: -48px 0px;
 }
 .quotebb:hover {
-	background-position: -22px -66px;
+	background-position: -48px -16px;
 }
 .codebb {
-	background-position: 0px -88px;
+	background-position: -64px 0px;
 }
 .codebb:hover {
-	background-position: -22px -88px;
+	background-position: -64px -16px;
 }
 .imagebb {
-	background-position: -44px 0px;
+	background-position: -80px 0px;
 }
 .imagebb:hover {
-	background-position: -66px 0px;
+	background-position: -80px -16px;
 }
 .urlbb {
-	background-position: -44px -22px;
+	background-position: -96px 0px;
 }
 .urlbb:hover {
-	background-position: -66px -22px;
+	background-position: -96px -16px;
 }
 .videobb {
-	background-position: -44px -44px;
+	background-position: -112px 0px;
 }
 .videobb:hover {
-	background-position: -66px -44px;
+	background-position: -112px -16px;
 }
 
 .attachtype {
-- 
2.39.5