add tooltip with all article tags

diff --git a/functions.php b/functions.php
index e1c60e15f514e6981f07b59415080696a510ea98..50228939b81eb6ce8c52b29c56c207fcf6d0d28a 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -4771,7 +4771,11 @@
                                $rv['content'] .= "<div clear='both'>" . $line["title"] . "$entry_author</div>";
                        }
 
-                       $tags_str = format_tags_string(get_article_tags($link, $id), $id);
+                       $tags = get_article_tags($link, $id);
+                       $tags_str = format_tags_string($tags, $id);
+                       $tags_str_full = join(", ", $tags);
+
+                       if (!$tags_str_full) $tags_str_full = __("no tags");
 
                        if (!$entry_comments) $entry_comments = "&nbsp;"; # placeholder
 
@@ -4784,6 +4788,10 @@
                                        <a title=\"".__('Edit tags for this article')."\"
                                        href=\"#\" onclick=\"editArticleTags($id, $feed_id)\">(+)</a>";
 
+                               $rv['content'] .= "<div dojoType=\"dijit.Tooltip\"
+                                       id=\"ATSTRTIP-$id\" connectId=\"ATSTR-$id\"
+                                       position=\"below\">$tags_str_full</div>";
+
                                $rv['content'] .= "<img src=\"".theme_image($link, 'images/art-zoom.png')."\"
                                                class='tagsPic' style=\"cursor : pointer\"
                                                onclick=\"postOpenInNewTab(event, $id)\"

diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 1adfb23b16ebd38da5a727a754c63cca3bd02a9d..f21ca5814033b86aab80a6054b4ea2760c0e9e5a 100644 (file)
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -359,7 +359,7 @@
 
                                /* update tag cache */
 
-                               $tags_str = join(",", $tags_to_cache);
+                               $tags_str = asort(join(",", $tags_to_cache));
 
                                db_query($link, "UPDATE ttrss_user_entries
                                        SET tag_cache = '$tags_str' WHERE ref_id = '$id'
@@ -373,10 +373,14 @@
                                $memcache->delete($obj_id);
                        }
 
-                       $tags_str = format_tags_string(get_article_tags($link, $id), $id);
+                       $tags = get_article_tags($link, $id);
+                       $tags_str = format_tags_string($tags, $id);
+                       $tags_str_full = join(", ", $tags);
+
+                       if (!$tags_str_full) $tags_str_full = __("no tags");
 
                        print json_encode(array("tags_str" => array("id" => $id,
-                               "content" => $tags_str)));
+                               "content" => $tags_str, "content_full" => $tags_str_full)));
 
                        return;
                }

diff --git a/viewfeed.js b/viewfeed.js
index a5ca881c6d326fbbf9c13c3e971ba2a56882c8a5..fd188797674f08b310f1dac4ae09fe3d0440c529 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -992,10 +992,10 @@ function editArticleTags(id) {
                                                        var id = tags_str.id;
 
                                                        var tags = $("ATSTR-" + id);
+                                                       var tooltip = dijit.byId("ATSTRTIP-" + id);
 
-                                                       if (tags) {
-                                                               tags.innerHTML = tags_str.content;
-                                                       }
+                                                       if (tags) tags.innerHTML = tags_str.content;
+                                                       if (tooltip) tooltip.attr('label', tags_str.content_full);
 
                                                        cache_invalidate(id);
                                                }
@@ -1536,6 +1536,9 @@ function zoomToArticle(event, id) {
                        if (!event || !event.shiftKey)
                                return dijit.byId("content-tabs").selectChild(dijit.byId("ATAB-" + id));
 
+               if (dijit.byId("ATSTRTIP-" + id))
+                       dijit.byId("ATSTRTIP-" + id).destroyRecursive();
+
                if (cached_article) {
                        //closeArticlePanel();