browser interface tweaks

diff --git a/backend.php b/backend.php
index 11e5c1e071aee4dc62883550fe32856de696428b..16797ea4a8f09c3ee6910c7ec7c7fbb676fa3751 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -3949,7 +3949,38 @@
 
                if ($subop == "details") {
                        $id = db_escape_string($_GET["id"]);
-                       print "-- nasty details about feed $id --";                     
+
+                       $result = db_query($link, "SELECT title,content,
+                                       substring(date_entered,1,19) as date_entered,
+                                       substring(updated,1,19) as updated
+                               FROM ttrss_entries,ttrss_user_entries 
+                               WHERE   id = ref_id AND feed_id = '$id'
+                               ORDER BY updated DESC LIMIT 5");
+
+                       if (db_num_rows($result) > 0) {
+
+                               print "<b>Feed information:</b>";
+                               print "<div class=\"detailsPart\">FIXME</div>";
+                               
+                               print "<b>Last headlines:</b><br>";
+                               
+                               print "<div class=\"detailsPart\">";
+                               print "<ul class=\"compact\">";
+                               while ($line = db_fetch_assoc($result)) {
+
+                                       if (get_pref($link, 'HEADLINES_SMART_DATE')) {
+                                               $entry_dt = smart_date_time(strtotime($line["updated"]));
+                                       } else {
+                                               $short_date = get_pref($link, 'SHORT_DATE_FORMAT');
+                                               $entry_dt = date($short_date, strtotime($line["updated"]));
+                                       }                               
+               
+                                       print "<li>" . $line["title"] . 
+                                               "&nbsp;<span class=\"insensitive\">($entry_dt)</span></li>";    
+                               }               
+                               print "</ul></div>";
+                       }
+                               
                        return;
                }
        
@@ -3998,7 +4029,7 @@
                        print "<li class='$class' id=\"FBROW-".$details["id"]."\">$check_box".
                                "$feed_icon ";
                                
-                       print "<a href=\"javascript:browserExpand('".$details["id"]."')\">" . 
+                       print "<a href=\"javascript:browserToggleExpand('".$details["id"]."')\">" . 
                                $details["title"] ."</a>&nbsp;" .
                                "<span class='subscribers'>($subscribers)</span>";
                        

diff --git a/prefs.js b/prefs.js
index 66c0de5dc21c271eb46fcf1c3b96e7dea2820a79..99fe378bb530ca265f1af009cac0a8ceb34c9bfb 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -1380,19 +1380,27 @@ function updateBigFeedBrowser() {
 
 }
 
-function browserExpand(id) {
+function browserToggleExpand(id) {
        try {
 /*             if (feed_to_expand && feed_to_expand != id) {
                        var d = document.getElementById("BRDET-" + feed_to_expand);
                        d.style.display = "none";
                } */
+
+               var d = document.getElementById("BRDET-" + id);
+
+               if (d.style.display == "block") {               
+                       d.style.display = "none";
+                       
+               } else {
        
-               feed_to_expand = id;
+                       feed_to_expand = id;
 
-               xmlhttp.open("GET", "backend.php?op=pref-feed-browser&subop=details&id="
-                       + param_escape(id), true);
-               xmlhttp.onreadystatechange=expand_feed_callback;
-               xmlhttp.send(null);
+                       xmlhttp.open("GET", "backend.php?op=pref-feed-browser&subop=details&id="
+                               + param_escape(id), true);
+                       xmlhttp.onreadystatechange=expand_feed_callback;
+                       xmlhttp.send(null);
+               }
 
        } catch (e) {
                exception_error("browserExpand", e);

diff --git a/tt-rss.css b/tt-rss.css
index 8da86844659fc8a739022a84e710b292f6995b13..5878a0972f2dbd4a36106f9dec69d257e62231c5 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -955,3 +955,18 @@ div.browserDetails {
        display : none;
        padding : 5px;
 }
+
+ul.compact {
+       list-style-type : none;
+       margin : 0px;
+       padding : 0px;
+}
+
+ul.compact li {
+       margin : 0px;
+       padding : 0px;
+}
+
+div.detailsPart {
+       margin : 5px 0px 5px 5px;       
+}