implement (incomplete) sortable feedlist

[tt-rss.git] / functions.php

diff --git a/functions.php b/functions.php
index 31b7f758f9fd72320b5f13fb13d95031aadeb3ed..2401947310c69c4f9f0306b858b431b52c47ca40 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -3516,7 +3516,7 @@
                if (get_pref($link, "STRIP_UNSAFE_TAGS") || $force_strip_tags) {
 
                        $res = strip_tags_long($res, 
-                               "<p><a><i><em><b><strong><blockquote><br><img><ul><ol><li>");
+                               "<p><a><i><em><b><strong><code><pre><blockquote><br><img><ul><ol><li>");
 
 //                     $res = preg_replace("/\r\n|\n|\r/", "", $res);
 //                     $res = strip_tags_long($res, "<p><a><i><em><b><strong><blockquote><br><img><div><span>");                       
@@ -3918,6 +3918,7 @@
                                $sel_all_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, '', true)";
                                $sel_unread_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true)";
                                $sel_none_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false)";
+                               $sel_inv_link = "javascript:invertHeadlineSelection()";
 
                                $tog_unread_link = "javascript:selectionToggleUnread()";
                                $tog_marked_link = "javascript:selectionToggleMarked()";
@@ -3929,6 +3930,8 @@
                                $sel_unread_link = "javascript:cdmSelectArticles('unread')";
                                $sel_none_link = "javascript:cdmSelectArticles('none')";
 
+                               $sel_inv_link = "javascript:invertHeadlineSelection()";
+
                                $tog_unread_link = "javascript:selectionToggleUnread(true)";
                                $tog_marked_link = "javascript:selectionToggleMarked(true)";
                                $tog_published_link = "javascript:selectionTogglePublished(true)";
@@ -3945,6 +3948,7 @@
                                                ".__('Select:')."
                                                        <a href=\"$sel_all_link\">".__('All')."</a>,
                                                        <a href=\"$sel_unread_link\">".__('Unread')."</a>,
+                                                       <a href=\"$sel_inv_link\">".__('Invert')."</a>,
                                                        <a href=\"$sel_none_link\">".__('None')."</a></li>
                                                <li class=\"vsep\">&nbsp;</li>
                                                <li class=\"top\">".__('Actions...')."<ul>
@@ -4083,25 +4087,29 @@
 
                        $catctr_class = ($cat_unread > 0) ? "catCtrHasUnread" : "catCtrNoUnread";
 
-                       print "<li class=\"feedCat\" id=\"FCAT-$cat_id\">
-                               <a id=\"FCATN-$cat_id\" href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a>";
-
                        if ($can_browse) {
-                               print "<a href=\"#\" onclick=\"javascript:viewCategory($cat_id)\" id=\"FCAP-$cat_id\">";
+                               $browse_cat_link = "onclick=\"javascript:viewCategory($cat_id)\"";
+                               $inner_title_class = "catTitle";
                        } else {
-                               print "<span id=\"FCAP-$cat_id\">";
+                               $browse_cat_link = "";
+                               $inner_title_class = "catTitleNL";
                        }
 
+                       print "<li class=\"feedCat\" id=\"FCAT-$cat_id\">
+                               <img onclick=\"toggleCollapseCat($cat_id)\" class=\"catCollapse\"
+                                       title=\"".__('Click to collapse category')."\"
+                                       src=\"images/cat-collapse.png\"><span class=\"$inner_title_class\" 
+                                       id=\"FCATN-$cat_id\" $browse_cat_link
+                               \">$tmp_category</span>";
+
+                       print "<span id=\"FCAP-$cat_id\">";
+
                        print " <span id=\"FCATCTR-$cat_id\" 
                                class=\"$catctr_class\">($cat_unread)</span> $ellipsis";
 
-                       if ($can_browse) {
-                               print "</a>";
-                       } else {
-                               print "</span>";
-                       }
+                       print "</span>";
 
-                       print "</li>";
+                       //print "</li>";
 
                        print "<ul class=\"feedCatList\" id=\"FCATLIST-$cat_id\" style='$holder_style'>";
 
@@ -5007,12 +5015,12 @@
 
                                                        $cur_feed_title = htmlspecialchars($cur_feed_title);
 
-                                                       $vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id, \"$cur_feed_title\");' href='#'>mark as read</a>)";
+                                                       $vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>mark as read</a>)";
 
                                                        print "<tr class='feedTitle'><td colspan='7'>".
                                                                "<div style=\"float : right\">$feed_icon_img</div>".
                                                                "<a href=\"javascript:viewfeed($feed_id, '', false)\">".
-                                                               $line["feed_title"]."</a> $vf_catchup_link:</td></tr>";
+                                                               $line["feed_title"]."</a> $vf_catchup_link</td></tr>";
                                                }
                                        }
 
@@ -5088,7 +5096,7 @@
 
                                                        $cur_feed_title = htmlspecialchars($cur_feed_title);
 
-                                                       $vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id, \"$cur_feed_title\");' href='#'>mark as read</a>)";
+                                                       $vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>mark as read</a>)";
 
                                                        $has_feed_icon = is_file(ICONS_DIR . "/$feed_id.ico");
 
@@ -5131,7 +5139,12 @@
 
                                        print "<div class=\"cdmHeader\">";
 
-                                       print "<div class=\"articleUpdated\">$updated_fmt $score_pic</div>";
+                                       if (!get_pref($link, "VFEED_GROUP_BY_FEED") || !$line["feed_title"]) {
+                                               $cdm_feed_icon = "<span style=\"cursor : pointer\" onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
+                                       }
+
+                                       print "<div class=\"articleUpdated\">$updated_fmt $score_pic $cdm_feed_icon
+                                               </div>";
 
                                        print "<span id=\"RTITLE-$id\" class=\"titleWrap$hlc_suffix\"><a class=\"title\" 
                                                onclick=\"javascript:toggleUnread($id, 0)\"
@@ -5645,10 +5658,14 @@
        }
 
        function get_score_pic($score) {
-               if ($score > 0) { 
+               if ($score > 100) { 
                        return "score_high.png"; 
-               } else if ($score < 0) {
+               } else if ($score > 0) { 
+                       return "score_half_high.png"; 
+               } else if ($score < -100) {
                        return "score_low.png"; 
+               } else if ($score < 0) {
+                       return "score_half_low.png"; 
                } else { 
                        return "score_neutral.png"; 
                }