dynamic delete icons for saved-search on network page

diff --git a/include/items.php b/include/items.php
index b802a59bdb6143724b1964b06a78b46ebe983a6c..50c5e56c129e9dcacd366ff97298ceca21905865 100644 (file)
--- 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 e05791614da51eb8995b55e14ffb39d8daa474db..8df3f83df4473e6652e2911d83d5a5fd75de2bad 100644 (file)
--- 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 819100204c3bdfd875fce1d533e9840695c49442..0b58db5d1733e302bc39f874ab6752c9c715d6e7 100644 (file)
--- 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 e2aae1e77cd9b9474a652433a95388e2f528ba7f..e6a0d6278d696589ae07e37e3b8c9d9569448053 100644 (file)
--- 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=&amp;remove=1&amp;search=$search.encodedterm"></a>
-                       <a class="savedsearchterm" href="network/?f=&amp;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=&amp;remove=1&amp;search=$search.encodedterm"></a>
+                       <a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
                </li>
                {{ endfor }}
        </ul>

diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index 3e55b658a7adb22b7b661abacf6f72a2889e7e98..7d919fedc85a3d8cca522a3edc60e55e7c94622f 100644 (file)
--- 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;