diff options
| -rw-r--r-- | themes/marvin/marvin.theme | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme index 2c6bc4b4b..7ba99d6f8 100644 --- a/themes/marvin/marvin.theme +++ b/themes/marvin/marvin.theme @@ -37,7 +37,6 @@ } function story($story, $reply = 0) { - if (!$reply) { print "\n<!-- story: \"$story->subject\" -->\n"; print "<TABLE BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"2\" WIDTH=\"100%\">\n"; print " <TR><TD COLSPAN=\"2\"><IMG SRC=\"themes/marvin/images/drop.gif\" ALT=\"\"> <B>". check_output($story->subject) ."</B></TD></TR>\n"; @@ -52,32 +51,14 @@ print " <TD COLSPAN=\"2\">\n"; if ($story->abstract) print "<P>". check_output($story->abstract, 1) ."</P>\n"; if ($story->updates) print "<P><FONT COLOR=\"#666699\">". t("Editor's note") .":</FONT> ". check_output($story->updates, 1) ."</P>\n"; + if ($reply) if ($story->article) print " <P>". check_output($story->article, 1) ."</P>\n"; print " </TD>\n"; print " </TR>\n"; print " <TR><TD COLSPAN=\"2\"> </TD></TR>\n"; - print " <TR><TD COLSPAN=\"2\">". theme_morelink($this, $story) ."</TD></TR>\n"; + if (!$reply) print " <TR><TD COLSPAN=\"2\">". theme_morelink($this, $story) ."</TD></TR>\n"; + else print " <TR><TD ALIGN=\"right\" COLSPAN=\"2\">". $reply ."</TD></TR>\n"; print "</TABLE>\n"; print "<BR><BR>\n\n"; - } - else { - print "\n<!-- story: \"$story->subject\" -->\n"; - print "<TABLE BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"2\" WIDTH=\"100%\">\n"; - print " <TR><TD COLSPAN=\"2\"><IMG SRC=\"themes/marvin/images/drop.gif\" ALT=\"\"> <B>". check_output($story->subject) ."</B></TD></TR>\n"; - print " <TR VALIGN=\"bottom\"><TD COLSPAN=\"2\" BGCOLOR=\"#000000\" WIDTH=\"100%\"><IMG SRC=\"themes/marvin/images/pixel.gif\" WIDTH=\"1\" HEIGHT=\"0\" ALT=\"\"></TD></TR>\n"; - print " <TR><TD><FONT COLOR=\"#7C7C7C\"><SMALL>". strtr(t("Submitted by %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp, "large"))); ?><?php if ($story->department) print "<BR>from the $story->department dept."; ?><?php print "</SMALL></FONT></TD><TD ALIGN=\"right\" VALIGN=\"top\" NOWRAP><SMALL><A HREF=\"index.php?section=". urlencode($story->section) ."\"><FONT COLOR=\"#83997A\">$story->section</FONT></A></SMALL></TD></TR>\n"; - print " <TR><TD COLSPAN=\"2\"> </TD></TR>\n"; - print " <TR>\n"; - print " <TD COLSPAN=\"2\">\n"; - if ($story->abstract) print " <P>". check_output($story->abstract, 1) ."</P>\n"; - if ($story->updates) print " <P><FONT COLOR=\"#666699\">". t("Editor's note") .":</FONT>". check_output($story->updates, 1) ."</P>\n"; - if ($story->article) print " <P>". check_output($story->article, 1) ."</P>\n"; - print " </TD>\n"; - print " </TR>\n"; - print " <TR><TD COLSPAN=\"2\"> </TD></TR>\n"; - print " <TR><TD ALIGN=\"right\" COLSPAN=\"2\">". $reply ."</TD></TR>\n"; - print "</TABLE>\n"; - print "<BR><BR>\n\n"; - } } function controls() { |