drop table markup from article header

This commit is contained in:
Andrew Dolgov 2006-12-07 10:57:09 +01:00
parent ca676fb583
commit b810a0f146
2 changed files with 24 additions and 22 deletions

View File

@ -211,7 +211,7 @@
print "<div class=\"postReply\">"; print "<div class=\"postReply\">";
print "<div class=\"postHeader\"><table width=\"100%\">"; print "<div class=\"postHeader\">";
$entry_author = $line["author"]; $entry_author = $line["author"];
@ -219,19 +219,17 @@
$entry_author = " - by $entry_author"; $entry_author = " - by $entry_author";
} }
if ($line["link"]) {
print "<tr><td width='70%'><a $link_target href=\"" . $line["link"] . "\">" .
$line["title"] . "</a>$entry_author</td>";
} else {
print "<tr><td width='70%'>" . $line["title"] . "$entry_author</td>";
}
$parsed_updated = date(get_pref($link, 'LONG_DATE_FORMAT'), $parsed_updated = date(get_pref($link, 'LONG_DATE_FORMAT'),
strtotime($line["updated"])); strtotime($line["updated"]));
print "<td class=\"postDate$rtl_class\">$parsed_updated</td>"; print "<div class=\"postDate$rtl_class\">$parsed_updated</div>";
print "</tr>"; if ($line["link"]) {
print "<div clear='both'><a $link_target href=\"" . $line["link"] . "\">" .
$line["title"] . "</a>$entry_author</div>";
} else {
print "<div clear='both'>" . $line["title"] . "$entry_author</div>";
}
$tmp_result = db_query($link, "SELECT DISTINCT tag_name FROM $tmp_result = db_query($link, "SELECT DISTINCT tag_name FROM
ttrss_tags WHERE post_int_id = " . $line["int_id"] . " ttrss_tags WHERE post_int_id = " . $line["int_id"] . "
@ -247,9 +245,9 @@
$tag = $tmp_line["tag_name"]; $tag = $tmp_line["tag_name"];
$tag_str = "<a href=\"javascript:viewfeed('$tag')\">$tag</a>, "; $tag_str = "<a href=\"javascript:viewfeed('$tag')\">$tag</a>, ";
if ($num_tags == 3) { if ($num_tags == 6) {
$tags_str .= "<a href=\"javascript:showBlockElement('allEntryTags')\">...</a>"; $tags_str .= "<a href=\"javascript:showBlockElement('allEntryTags')\">...</a>";
} else if ($num_tags < 3) { } else if ($num_tags < 6) {
$tags_str .= $tag_str; $tags_str .= $tag_str;
} }
$f_tags_str .= $tag_str; $f_tags_str .= $tag_str;
@ -258,15 +256,13 @@
$tags_str = preg_replace("/, $/", "", $tags_str); $tags_str = preg_replace("/, $/", "", $tags_str);
$f_tags_str = preg_replace("/, $/", "", $f_tags_str); $f_tags_str = preg_replace("/, $/", "", $f_tags_str);
// $truncated_link = truncate_string($line["link"], 60); if (!$entry_comments) $entry_comments = "&nbsp;"; # placeholder
# if ($tags_str || $entry_comments) { print "<div style='float : right'>$tags_str
print "<tr><td width='50%'> <a href=\"javascript:editArticleTags($id, $feed_id)\">(+)</a></div>
$entry_comments</td> <div clear='both'>$entry_comments</div>";
<td align=\"right\">$tags_str <a href=\"javascript:editArticleTags($id, $feed_id)\">(+)</a></td></tr>";
# }
print "</table></div>"; print "</div>";
print "<div class=\"postIcon\">" . $feed_icon . "</div>"; print "<div class=\"postIcon\">" . $feed_icon . "</div>";
print "<div class=\"postContent\">"; print "<div class=\"postContent\">";

View File

@ -713,16 +713,22 @@ table.headlinesList tr td {
padding : 2px 0px 2px 0px; padding : 2px 0px 2px 0px;
} }
div.postHeader td.postDate { div.postHeader div.postDate {
font-size : x-small; font-size : x-small;
text-align : right; text-align : right;
color : gray; color : gray;
float : right;
} }
div.postHeader td.postDateRTL { div.postHeader div.postDateRTL {
font-size : x-small; font-size : x-small;
text-align : left; text-align : left;
color : gray; color : gray;
float : right;
}
div.postHeader div {
padding-bottom : 3px;
} }
#feedUpdateErrors { #feedUpdateErrors {