diff options
| -rw-r--r-- | backend.php | 27 | ||||
| -rw-r--r-- | images/prefs_tab.png | bin | 384 -> 487 bytes | |||
| -rw-r--r-- | images/prefs_tab.svg | 4 | ||||
| -rw-r--r-- | prefs.php | 1 | ||||
| -rw-r--r-- | tt-rss-ie.css | 4 |
5 files changed, 25 insertions, 11 deletions
diff --git a/backend.php b/backend.php index a1ddf5b81..3d3d5f7e0 100644 --- a/backend.php +++ b/backend.php @@ -1477,7 +1477,8 @@ print "</td>"; # $row_class = toggleEvenOdd($row_class); - print "<tr class='$row_class'><td>Link to:</td>"; + + print "<tr class='$row_class'><td>Link to:</td><td>"; $tmp_result = db_query($link, "SELECT COUNT(id) AS count FROM ttrss_feeds WHERE parent_feed = '$feed_id'"); @@ -1490,7 +1491,7 @@ $disabled = "disabled"; } - print "<select $disabled id=\"iedit_parent_feed\">"; + print "<select $disabled id=\"iedit_parent_feed\">"; print "<option id=\"0\">Not linked</option>"; @@ -1520,8 +1521,8 @@ $tmp_line["id"], $tmp_line["title"]); } - print "</select></td>"; - print "</td></tr>"; + print "</select>"; + print "</td></tr>"; $purge_interval = db_fetch_result($result, 0, "purge_interval"); # $row_class = toggleEvenOdd($row_class); @@ -1930,8 +1931,13 @@ print "<tr><td colspan=\"6\" class=\"feedEditCat\">$edit_cat</td></tr>"; print "<tr class=\"title\"> - <td width='5%' align='center'> </td> - <td width='40%'><a href=\"javascript:updateFeedList('title')\">Title</a></td> + <td width='4%'> </td>"; + + if (get_pref($link, 'ENABLE_FEED_ICONS')) { + print "<td width='4%'> </td>"; + } + + print "<td width='40%'><a href=\"javascript:updateFeedList('title')\">Title</a></td> <td width='45%'><a href=\"javascript:updateFeedList('feed_url')\">Feed</a></td> <td width='15%' align='right'><a href=\"javascript:updateFeedList('last_updated')\">Updated</a></td>"; @@ -1950,11 +1956,14 @@ } else { $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">"; } -// print "<td class='feedIcon'>$feed_icon</td>"; - + print "<td class='feedSelect'><input onclick='toggleSelectRow(this);' type=\"checkbox\" id=\"FRCHK-".$line["id"]."\"></td>"; + if (get_pref($link, 'ENABLE_FEED_ICONS')) { + print "<td class='feedIcon'>$feed_icon</td>"; + } + $edit_title = truncate_string($edit_title, 40); $edit_link = truncate_string($edit_link, 60); @@ -1965,7 +1974,7 @@ } print "<td><a href=\"javascript:editFeed($feed_id);\">" . - "$feed_icon $edit_title $parent_title" . "</a></td>"; + "$edit_title $parent_title" . "</a></td>"; print "<td><a href=\"javascript:editFeed($feed_id);\">" . $edit_link . "</a></td>"; diff --git a/images/prefs_tab.png b/images/prefs_tab.png Binary files differindex 5df6f8bf4..13e8ba187 100644 --- a/images/prefs_tab.png +++ b/images/prefs_tab.png diff --git a/images/prefs_tab.svg b/images/prefs_tab.svg index f8307e4de..5eb7286ec 100644 --- a/images/prefs_tab.svg +++ b/images/prefs_tab.svg @@ -16,7 +16,7 @@ version="1.0" sodipodi:docbase="/home/fox/public_html/testbox/tt-rss/images" sodipodi:docname="prefs_tab.svg" - inkscape:export-filename="/home/fox/public_html/testbox/tt-rss/images/active_tab.png" + inkscape:export-filename="/home/fox/public_html/testbox/tt-rss/images/prefs_tab.png" inkscape:export-xdpi="90.150002" inkscape:export-ydpi="90.150002"> <defs @@ -65,7 +65,7 @@ inkscape:groupmode="layer" id="layer1"> <rect - style="opacity:1;fill:none;fill-opacity:1.0;stroke:#88b0ff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#88b0ff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1325" width="129.28574" height="48.392838" @@ -49,6 +49,7 @@ <!--[if gte IE 5.5000]> <script type="text/javascript" src="pngfix.js"></script> + <link rel="stylesheet" type="text/css" href="tt-rss-ie.css"> <![endif]--> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/tt-rss-ie.css b/tt-rss-ie.css index 2ca760c95..1d6a4bead 100644 --- a/tt-rss-ie.css +++ b/tt-rss-ie.css @@ -3,3 +3,7 @@ ul.feedCatList { top: -1em; } +li.feedCatHolder { + margin : 0px; + padding : 0px; +} |
