valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

headline subtoolbar: code cleanup

This commit is contained in:
Andrew Dolgov 2009-01-23 09:07:54 +01:00
parent 6b2ee18def
commit 0ef68e6fc9
2 changed files with 35 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
functions.php
View File

@ -3312,8 +3312,6 @@
$feed_title = "?"; $feed_title = "?";
} }
if ($feed < -10) error_reporting (0);
$content_query_part = "content as content_preview,"; $content_query_part = "content as content_preview,";
if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) { if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
@ -3870,29 +3868,10 @@
} }
function print_headline_subtoolbar($link, $feed_site_url, $feed_title, function print_headline_subtoolbar($link, $feed_site_url, $feed_title,
$bottom = false, $rtl_content = false, $feed_id = 0, $feed_id, $is_cat, $search, $match_on,
$is_cat = false, $search = false, $match_on = false, $search_mode) {
$search_mode = false, $offset = 0, $limit = 0,
$dashboard_menu = 0, $disable_feed = 0, $feed_small_icon = 0) {
$user_page_offset = $offset + 1; print "<div class=\"headlinesSubToolbar\">";
if (!$bottom) {
$class = "headlinesSubToolbar";
$tid = "headlineActionsTop";
} else {
$class = "headlinesSubToolbar";
$tid = "headlineActionsBottom";
}
print "<nobr><table class=\"$class\" id=\"$tid\"
width=\"100%\" cellspacing=\"0\" cellpadding=\"0\"><tr>";
if ($rtl_content) {
$rtl_cpart = "RTL";
} else {
$rtl_cpart = "";
}
$page_prev_link = "javascript:viewFeedGoPage(-1)"; $page_prev_link = "javascript:viewFeedGoPage(-1)";
$page_next_link = "javascript:viewFeedGoPage(1)"; $page_next_link = "javascript:viewFeedGoPage(1)";
@ -3927,8 +3906,30 @@
} }
print "<td class=\"headlineActions$rtl_cpart\">"; print "<div id=\"subtoolbar_ftitle\">";
if ($feed_site_url) {
if (!$bottom) {
$target = "target=\"_blank\"";
}
print "<a $target href=\"$feed_site_url\">".
truncate_string($feed_title,30)."</a>";
} else {
print $feed_title;
}
if ($search) {
$search_q = "&q=$search&m=$match_on&smode=$search_mode";
}
print "
<a target=\"_blank\"
href=\"backend.php?op=rss&id=$feed_id&is_cat=$is_cat$search_q\">
<img class=\"noborder\"
alt=\"".__('Generated feed')."\" src=\"images/feed-icon-12x12.png\">
</a>";
print "</div>";
print __('Select:')." print __('Select:')."
<a href=\"$sel_all_link\">".__('All')."</a>, <a href=\"$sel_all_link\">".__('All')."</a>,
@ -3964,46 +3965,8 @@
print_labels_headlines_dropdown($link, $feed_id); print_labels_headlines_dropdown($link, $feed_id);
print "</ul>"; print "</ul>";
print "</td>";
print "<td class=\"headlineTitle$rtl_cpart\">";
print "<span id=\"subtoolbar_ftitle\">";
if ($feed_site_url) {
if (!$bottom) {
$target = "target=\"_blank\"";
}
print "<a $target href=\"$feed_site_url\">".
truncate_string($feed_title,30)."</a>";
} else {
print $feed_title;
}
if ($search) {
$search_q = "&q=$search&m=$match_on&smode=$search_mode";
}
if ($user_page_offset > 1) {
print " [$user_page_offset] ";
}
if (!$bottom && !$disable_feed) {
print "
<a target=\"_blank\"
href=\"backend.php?op=rss&id=$feed_id&is_cat=$is_cat$search_q\">
<img class=\"noborder\"
alt=\"".__('Generated feed')."\" src=\"images/feed-icon-12x12.png\">
</a>";
} else if ($feed_small_icon) {
print "<img class=\"noborder\" alt=\"\" src=\"images/$feed_small_icon\">";
}
print "</span>";
print "</td>";
print "</tr></table></nobr>";
print "</div>";
} }
function printCategoryHeader($link, $cat_id, $hidden = false, $can_browse = true) { function printCategoryHeader($link, $cat_id, $hidden = false, $can_browse = true) {
@ -4863,9 +4826,8 @@
return; return;
} }
print_headline_subtoolbar($link, $feed_site_url, $feed_title, false, print_headline_subtoolbar($link, $feed_site_url, $feed_title,
$rtl_content, $feed, $cat_view, $search, $match_on, $search_mode, $feed, $cat_view, $search, $match_on, $search_mode);
$offset, $limit);
print "<div id=\"headlinesInnerContainer\" onscroll=\"headlines_scroll_handler()\">"; print "<div id=\"headlinesInnerContainer\" onscroll=\"headlines_scroll_handler()\">";
} }

29
tt-rss.css
View File

@ -812,7 +812,7 @@ td.selectPrompt {
color : gray; color : gray;
} }
table.headlinesSubToolbar { div.headlinesSubToolbar {
border-width : 0px 0px 1px 0px; border-width : 0px 0px 1px 0px;
border-style : solid; border-style : solid;
border-color : #f0f0f0; border-color : #f0f0f0;
@ -820,6 +820,9 @@ table.headlinesSubToolbar {
left : 0px; left : 0px;
top : 0px; top : 0px;
height : 25px; height : 25px;
line-height : 25px;
padding-left : 5px;
padding-right : 5px;
right : 0px; right : 0px;
background-color : white; background-color : white;
font-size : 11px; font-size : 11px;
@ -827,28 +830,8 @@ table.headlinesSubToolbar {
color : gray; color : gray;
} }
input#subtoolbar_search_box { div.headlinesSubToolbar div#subtoolbar_ftitle {
height : 10px; float : right;
font-size : 9px;
vertical-align : middle;
}
table.headlinesSubToolbar td.headlineActions {
padding : 0px 5px 0px 5px;
}
table.headlinesSubToolbar td.headlineActionsRTL {
padding : 0px 5px 0px 5px;
}
table.headlinesSubToolbar td.headlineTitle {
padding : 0px 5px 0px 5px;
text-align : right;
}
table.headlinesSubToolbar td.headlineTitleRTL {
padding : 0px 5px 0px 5px;
text-align : left;
} }
span.contentPreview { span.contentPreview {