prefs: further feedlist tweaks (3)

diff --git a/backend.php b/backend.php
index 252004d15a12c464e336a128b29846a34d60efc0..a018e0b8dcf93f30c935859c0e6409d8d9c1658d 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -1377,9 +1377,9 @@
 
                        print "<div align='center'>
                                <input type='submit' class='button'                     
-                               onclick=\"closeInfoBox()\" value=\"Cancel\">
+                               onclick=\"feedEditCancel()\" value=\"Cancel\">
                                <input type=\"submit\" class=\"button\" 
-                               onclick=\"javascript:feedEditSave()\" value=\"Save\"></div>";
+                               onclick=\"feedEditSave()\" value=\"Save\"></div>";
                        return;
                }
 
@@ -1649,7 +1649,6 @@
 
                        if (!get_pref($link, 'ENABLE_FEED_CATS')) {
                                print "<tr class=\"title\">
-                                       <td width='1%'>&nbsp;</td>
                                        <td width='5%' align='center'>Select</td>
                                        <td width='30%'><a href=\"javascript:updateFeedList('title')\">Title</a></td>
                                        <td width='30%'><a href=\"javascript:updateFeedList('feed_url')\">Link</a></td>
@@ -1684,7 +1683,6 @@
                                        print "<tr><td colspan=\"6\" class=\"feedEditCat\">$edit_cat</td></tr>";
 
                                        print "<tr class=\"title\">
-                                               <td width='1%'>&nbsp;</td>
                                                <td width='5%' align='center'>Select</td>
                                                <td width='30%'><a href=\"javascript:updateFeedList('title')\">Title</a></td>
                                                <td width='30%'><a href=\"javascript:updateFeedList('feed_url')\">Link</a></td>
@@ -1702,12 +1700,11 @@
                                $icon_file = ICONS_DIR . "/$feed_id.ico";
        
                                if (file_exists($icon_file) && filesize($icon_file) > 0) {
-                                               $feed_icon = "<img width=\"16\" height=\"16\"
-                                                       src=\"" . ICONS_URL . "/$feed_id.ico\">";
+                                               $feed_icon = "<img class=\"tinyFeedIcon\"       src=\"" . ICONS_URL . "/$feed_id.ico\">";
                                } else {
-                                       $feed_icon = "&nbsp;";
+                                       $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
                                }
-                               print "<td class='feedIcon'>$feed_icon</td>";           
+//                             print "<td class='feedIcon'>$feed_icon</td>";           
        
                                print "<td class='feedSelect'><input onclick='toggleSelectRow(this);' 
                                type=\"checkbox\" id=\"FRCHK-".$line["id"]."\"></td>";
@@ -1716,7 +1713,7 @@
                                $edit_link = truncate_string($edit_link, 60);
 
                                print "<td><a href=\"javascript:editFeed($feed_id);\">" . 
-                                       $edit_title . "</a></td>";              
+                                       "$feed_icon $edit_title" . "</a></td>";         
                                        
                                print "<td><a href=\"javascript:editFeed($feed_id);\">" . 
                                        $edit_link . "</a></td>";               

diff --git a/prefs.js b/prefs.js
index c1e8ed35ced51d7cd3a69b1e99259090db4aa7a6..f6917f681f39a02480cf66d6fcd02fad4a53e072 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -604,13 +604,15 @@ function feedEditCancel() {
                return
        }
 
+       closeInfoBox();
+
        active_feed = false;
 
        notify("Operation cancelled.");
 
-       xmlhttp.open("GET", "backend.php?op=pref-feeds", true);
+/*     xmlhttp.open("GET", "backend.php?op=pref-feeds", true);
        xmlhttp.onreadystatechange=feedlist_callback;
-       xmlhttp.send(null);
+       xmlhttp.send(null); */
 
 }
 

diff --git a/tt-rss.css b/tt-rss.css
index e0fb23d3fd77b07da5075fbd3ca40bb81a56d14c..e4954035cc4078c8476fafba1adf99a8f0c26929 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -238,6 +238,7 @@ ul.feedList img, img.tinyFeedIcon {
        margin : 0px 3px 0px 0px;
        width : 16px;
        height : 16px;
+       border-width : 0px;
 }
 
 h1 {
@@ -442,11 +443,7 @@ input {
 
 /* preferences */
 
-table.prefFeedList tr.title td, table.prefFilterList tr.title td,
-       table.headlinesList tr.title td, table.prefLabelList tr.title td,
-       table.prefPrefsList tr.title td, 
-       table.prefFeedCatList tr.title td, 
-       table.prefUserList tr.title td {
+tr.title td {
        font-weight : bold;
        border-width : 0px 0px 1px 0px;
        border-color : #f0f0f0;
@@ -454,10 +451,10 @@ table.prefFeedList tr.title td, table.prefFilterList tr.title td,
        font-size : x-small;
 }
 
+
 table.prefFeedList td.feedEditCat {
        font-size : large;
        font-weight : bold;
-       color : black;
        padding : 5px 0px 5px 0px;
 }