aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--boot.php2
-rw-r--r--include/group.php1
-rw-r--r--view/theme/duepuntozero/group_side.tpl2
-rw-r--r--view/theme/duepuntozero/style.css6
-rw-r--r--view/theme/duepuntozero/theme.php24
5 files changed, 32 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index 50cfbf661..2ab1f560b 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1181' );
+define ( 'FRIENDICA_VERSION', '2.3.1182' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1107 );
diff --git a/include/group.php b/include/group.php
index 82cdc554f..4a35912e5 100644
--- a/include/group.php
+++ b/include/group.php
@@ -210,6 +210,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
$tpl = get_markup_template("group_side.tpl");
$o = replace_macros($tpl, array(
'$title' => t('Groups'),
+ '$edittext' => t('Edit group'),
'$createtext' => t('Create a new group'),
'$groups' => $groups,
'$add' => t('add'),
diff --git a/view/theme/duepuntozero/group_side.tpl b/view/theme/duepuntozero/group_side.tpl
index 8c4464560..0353b1d2c 100644
--- a/view/theme/duepuntozero/group_side.tpl
+++ b/view/theme/duepuntozero/group_side.tpl
@@ -13,7 +13,7 @@
/>
{{ endif }}
{{ if $group.edit }}
- <a class="groupsideedit" href="$group.edit.href"><span id="group-side-editicon-$group.id" class="icon small-pencil"></span></a>
+ <a class="groupsideedit" href="$group.edit.href" title="$edittext"><span id="edit-sidebar-group-element-$group.id" class="group-edit-icon iconspacer small-pencil"></span></a>
{{ endif }}
<a id="sidebar-group-element-$group.id" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
</li>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 0f9999c3e..bc6cc8450 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1792,7 +1792,7 @@ a.mail-list-link {
list-style-type: none;
}
-#sidebar-group-list .icon {
+#sidebar-group-list .icon, #sidebar-group-list .iconspacer {
display: inline-block;
height: 12px;
width: 12px;
@@ -2766,6 +2766,10 @@ aside input[type='text'] {
/**
* ICONS
*/
+.iconspacer {
+ display: block; width: 16px; height: 16px;
+}
+
.icon {
display: block; width: 16px; height: 16px;
background-image: url('../../../images/icons.png');
diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index ebced7b9b..3e55b658a 100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -1,2 +1,26 @@
<?php
$a->theme_info = array();
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+
+$('.group-edit-icon').hover(
+ function() {
+ $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+ function() {
+ $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+ );
+
+$('.sidebar-group-element').hover(
+ function() {
+ id = $(this).attr('id');
+ $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+ function() {
+ id = $(this).attr('id');
+ $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+ );
+});
+</script>
+EOT;