diff options
| -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/saved_searches_aside.tpl | 4 | ||||
| -rw-r--r-- | view/theme/duepuntozero/theme.php | 21 |
5 files changed, 27 insertions, 7 deletions
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/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/theme.php b/view/theme/duepuntozero/theme.php index 3e55b658a..7d919fedc 100644 --- a/view/theme/duepuntozero/theme.php +++ b/view/theme/duepuntozero/theme.php @@ -21,6 +21,27 @@ $('.sidebar-group-element').hover( 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; |