diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/group.php | 1 | ||||
| -rw-r--r-- | include/items.php | 2 | ||||
| -rw-r--r-- | mod/network.php | 5 | ||||
| -rw-r--r-- | mod/search.php | 2 | ||||
| -rw-r--r-- | view/theme/duepuntozero/group_side.tpl | 2 | ||||
| -rw-r--r-- | view/theme/duepuntozero/saved_searches_aside.tpl | 4 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 25 | ||||
| -rw-r--r-- | view/theme/duepuntozero/theme.php | 45 |
9 files changed, 77 insertions, 11 deletions
@@ -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/include/items.php b/include/items.php index b802a59bd..50c5e56c1 100644 --- a/include/items.php +++ b/include/items.php @@ -1924,7 +1924,7 @@ function local_delivery($importer,$data) { if($deleted) { $r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join contact on `item`.`contact-id` = `contact`.`id` - WHERE `uri` = '%s' AND `uid` = %d AND `contact-id` = %d LIMIT 1", + WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1", dbesc($uri), intval($importer['importer_uid']), intval($importer['id']) diff --git a/mod/network.php b/mod/network.php index e05791614..8df3f83df 100644 --- a/mod/network.php +++ b/mod/network.php @@ -68,17 +68,16 @@ function saved_searches($search) { $o = ''; - $r = q("select `term` from `search` WHERE `uid` = %d", + $r = q("select `id`,`term` from `search` WHERE `uid` = %d", intval(local_user()) ); $saved = array(); - - if(count($r)) { foreach($r as $rr) { $saved[] = array( + 'id' => $rr['id'], 'term' => $rr['term'], 'encodedterm' => urlencode($rr['term']), 'delete' => t('Remove term'), diff --git a/mod/search.php b/mod/search.php index 819100204..0b58db5d1 100644 --- a/mod/search.php +++ b/mod/search.php @@ -4,7 +4,7 @@ function search_saved_searches() { $o = ''; - $r = q("select `term` from `search` WHERE `uid` = %d", + $r = q("select `id`,`term` from `search` WHERE `uid` = %d", intval(local_user()) ); 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/saved_searches_aside.tpl b/view/theme/duepuntozero/saved_searches_aside.tpl index e2aae1e77..e6a0d6278 100644 --- a/view/theme/duepuntozero/saved_searches_aside.tpl +++ b/view/theme/duepuntozero/saved_searches_aside.tpl @@ -5,8 +5,8 @@ <ul id="saved-search-ul"> {{ for $saved as $search }} <li class="saved-search-li clear"> - <a onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&remove=1&search=$search.encodedterm"></a> - <a class="savedsearchterm" href="network/?f=&search=$search.encodedterm">$search.term</a> + <a title="$search.delete" onclick="return confirmDelete();" id="drop-saved-search-term-$search.id" class="iconspacer savedsearchdrop " href="network/?f=&remove=1&search=$search.encodedterm"></a> + <a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&search=$search.encodedterm">$search.term</a> </li> {{ endfor }} </ul> diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 0f9999c3e..0150eb176 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -23,6 +23,7 @@ input { border: 1px solid #666666; -moz-border-radius: 3px; border-radius: 3px; + padding: 3px; } img { border :0px; } @@ -56,6 +57,10 @@ blockquote { padding: 0.4em; } +/*input[type=text] { + padding: 5px; +}*/ + .icollapse-wrapper, .ccollapse-wrapper { border: 1px solid #CCC; padding: 5px; @@ -281,6 +286,8 @@ div.wall-item-content-wrapper.shiny { .group-selected { padding: 3px; + -moz-border-radius: 3px; + border-radius: 3px; border: 1px solid #CCCCCC; background: #F8F8F8; font-weight: bold; @@ -829,6 +836,9 @@ input#dfrn-url { margin-top: 10px; border: 1px solid #CCC; position: relative; + -moz-border-radius: 3px; + border-radius: 3px; + } .wall-item-content-wrapper.comment { @@ -1076,6 +1086,10 @@ input#dfrn-url { .comment-edit-text-empty, .comment-edit-text-full { float: left; margin-top: 10px; + -moz-border-radius: 3px; + border-radius: 3px; + border: 1px solid #cccccc; + padding: 3px 1px 1px 3px; } .comment-edit-text-end { clear: both; @@ -1507,6 +1521,9 @@ input#dfrn-url { color:#cccccc; border: 1px solid #cccccc; padding: 3px 0px 0px 5px; + -moz-border-radius: 3px; + border-radius: 3px; + } @@ -1792,7 +1809,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; @@ -1835,7 +1852,7 @@ a.mail-list-link { } aside input[type='text'] { - width: 180px; + width: 174px; } .widget { @@ -2766,6 +2783,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..7d919fedc 100644 --- a/view/theme/duepuntozero/theme.php +++ b/view/theme/duepuntozero/theme.php @@ -1,2 +1,47 @@ <?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');} + ); + + +$('.savedsearchdrop').hover( + function() { + $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');}, + function() { + $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');} + ); + +$('.savedsearchterm').hover( + function() { + id = $(this).attr('id'); + $('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');}, + + function() { + id = $(this).attr('id'); + $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');} + ); + +}); + + +</script> +EOT; |