diff options
Diffstat (limited to 'themes')
-rw-r--r-- | themes/example/example.theme | 15 | ||||
-rw-r--r-- | themes/goofy/goofy.theme | 10 | ||||
-rw-r--r-- | themes/marvin/marvin.theme | 43 | ||||
-rw-r--r-- | themes/unconed/unconed.theme | 14 | ||||
-rw-r--r-- | themes/yaroon/jeroen2.theme | 8 |
5 files changed, 35 insertions, 55 deletions
diff --git a/themes/example/example.theme b/themes/example/example.theme index 9d5cbd250..8b7d608c8 100644 --- a/themes/example/example.theme +++ b/themes/example/example.theme @@ -47,7 +47,7 @@ } // close header function - function story($story, $reply = 0) { + function story($story, $main = 0) { ?> <TABLE BORDER="1" CELLSPACING="0" CELLPADDING="3" WIDTH="100%"> @@ -74,27 +74,18 @@ </TR> <TR> <TD COLSPAN="2"> - <?php - echo "<P>". check_output($story->abstract, 1) ."</P>"; - if ($reply && $story->body) + if (!$main && $story->body) echo "<P>". check_output($story->body, 1) ."</P>"; - ?> </TD> </TR> <TR> <TD COLSPAN="2"> - <?php - - - if (!$reply) + if ($main) echo theme_morelink($this, $story); - else - echo $reply; - ?> </TD> diff --git a/themes/goofy/goofy.theme b/themes/goofy/goofy.theme index 8acde2ae8..69b988730 100644 --- a/themes/goofy/goofy.theme +++ b/themes/goofy/goofy.theme @@ -88,7 +88,7 @@ <?php } - function story($story, $reply = 0) { + function story($story, $main = 0) { echo "\n<!-- story: \"$story->title\" -->\n"; ?> @@ -117,7 +117,7 @@ <tr> <td class="lgl"><img src="themes/goofy/images/null.gif" alt=""></td> <td class="lgcnt"><small><?php echo strtr(t("$how by %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp, "large"))); ?></small></td> - <td class="lgcnt" nowrap><div align="right"><?php echo "<A HREF=\"search.php?category=". urlencode($story->section) ."\">". check_output($story->section) ."</A>"; ?></div></td> + <td class="lgcnt" nowrap><div align="right"><?php echo "<A HREF=\"index.php?category=$story->cid\">". check_output($story->category) ."</A> / <A HREF=\"index.php?topic=$story->tid\">". check_output($story->topic) ."</A>"; ?></div></td> <td class="lgr"><img src="themes/goofy/images/null.gif" alt=""></td> </tr> <tr> @@ -125,15 +125,13 @@ <td class="lgcnt" width="100%" colspan="2"><hr color="#404040" size="1"> <?php echo check_output($story->abstract, 1) . "<br>"; - if ($reply && $story->body) + if (!$main && $story->body) echo "<br>" . check_output($story->body, 1); ?> <hr color="#404040" size="1"><div align="right"> <?php - if (!$reply) + if ($main) echo theme_morelink($this, $story); - else - echo $reply; ?></div></td> <td class="lgr"><img src="themes/goofy/images/null.gif" alt=""></td> </tr> diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme index 41c4e318c..584720919 100644 --- a/themes/marvin/marvin.theme +++ b/themes/marvin/marvin.theme @@ -44,28 +44,27 @@ <?php } - function story($story, $reply = 0) { - print "\n<!-- story: \"$story->title\" -->\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->title) ."</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>\n"; - print " <TD>\n"; - print " <FONT COLOR=\"#7C7C7C\"><SMALL>". strtr(t("Submitted by %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp, "large"))); ?><?php print "</SMALL></FONT></TD><TD ALIGN=\"right\" VALIGN=\"top\" NOWRAP><SMALL><A HREF=\"index.php?category=$story->cid\"><FONT COLOR=\"#83997A\">". check_output($story->category) ."</FONT></A> / <A HREF=\"index.php?topic=$story->tid\"><FONT COLOR=\"#83997A\">". check_output($story->topic) ."</FONT></A></SMALL>\n"; - print " </TD>\n"; - print " </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 ($reply) if ($story->body) print " <P>". check_output($story->body, 1) ."</P>\n"; - print " </TD>\n"; - print " </TR>\n"; - print " <TR><TD COLSPAN=\"2\"> </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"; + function story($story, $main = 0) { + print "\n<!-- story: \"$story->title\" -->\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->title) ."</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>\n"; + print " <TD>\n"; + print " <FONT COLOR=\"#7C7C7C\"><SMALL>". strtr(t("Submitted by %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp, "large"))); ?><?php print "</SMALL></FONT></TD><TD ALIGN=\"right\" VALIGN=\"top\" NOWRAP><SMALL><A HREF=\"index.php?category=$story->cid\"><FONT COLOR=\"#83997A\">". check_output($story->category) ."</FONT></A> / <A HREF=\"index.php?topic=$story->tid\"><FONT COLOR=\"#83997A\">". check_output($story->topic) ."</FONT></A></SMALL>\n"; + print " </TD>\n"; + print " </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 (!$main && $story->body) print " <P>". check_output($story->body, 1) ."</P>\n"; + print " </TD>\n"; + print " </TR>\n"; + print " <TR><TD COLSPAN=\"2\"> </TD></TR>\n"; + if ($main) print " <TR><TD COLSPAN=\"2\">". theme_morelink($this, $story) ."</TD></TR>\n"; + print "</TABLE>\n"; + print "<BR><BR>\n\n"; } function comment($comment, $link = "") { diff --git a/themes/unconed/unconed.theme b/themes/unconed/unconed.theme index 5556c6bf0..ed3a1b952 100644 --- a/themes/unconed/unconed.theme +++ b/themes/unconed/unconed.theme @@ -78,7 +78,7 @@ <?php } - function story($story, $reply = 0) { + function story($story, $main = 0) { $timestamp = format_date($story->timestamp); print "\n<!-- story: \"$story->title\" -->\n"; @@ -89,10 +89,7 @@ <TR><TD COLSPAN="2" BGCOLOR="<?php echo $this->bgcolor1; ?>" WIDTH="100%"><table width="100%" cellpadding="0" cellspacing="0"><tr><td width="100%"><FONT COLOR="<?php echo $this->fgcolor1; ?>"><B><?php echo "". check_output($story->title) .""; ?></B></FONT></td><td valign="middle" align="center"><IMG SRC="themes/<?php print $this->themename; ?>/images/icon.gif" valign="middle"></td></tr></table></TD></TR> <TR BGCOLOR="<?php echo $this->bgcolor2; ?>"> <?php - if ($story->section) { print "<TD WIDTH=\"70%\" BGCOLOR=\"$this->bgcolor2\">"; } - else { print "<TD COLSPAN=\"2\" BGCOLOR=\"$this->bgcolor2\">"; } - print "<SMALL>Posted by " . format_username($story->userid) . " on $timestamp"; - if ($story->section) { print "</TD><TD WIDTH=\"30%\" BGCOLOR=\"$this->bgcolor2\" ALIGN=\"center\"><B><A HREF=\"index.php?section=" . urlencode($story->section) . "\"><FONT COLOR=\"$this->sectioncolor\">". check_output($story->section) ."</FONT></A></B>"; } + print "<TD WIDTH=\"70%\" BGCOLOR=\"$this->bgcolor2\"><SMALL>Posted by " . format_username($story->userid) . " on $timestamp</TD><TD WIDTH=\"30%\" BGCOLOR=\"$this->bgcolor2\" ALIGN=\"center\"><B><A HREF=\"index.php?category=$story->cid\"><FONT COLOR=\"$this->sectioncolor\">". check_output($story->category) ."</FONT></A> / <A HREF=\"index.php?topic=$story->tid\"><FONT COLOR=\"$this->sectioncolor\">". check_output($story->topic) ."</FONT></A></B>"; ?> </TD> </TR> @@ -100,16 +97,13 @@ <TD BGCOLOR="<?php echo $this->bgcolor2 ?>" COLSPAN="2"> <?php echo "<P>". check_output($story->abstract, 1) ."</P>"; - if ($reply) - if ($story->body) print "<P>". check_output($story->body, 1) ."</P>\n"; + if (!$main && $story->body) print "<P>". check_output($story->body, 1) ."</P>\n"; ?> </TD> </TR> <?php - if (!$reply) + if ($main) echo "<TR BGCOLOR=\"". $this->bgcolor3 ."\"><TD BGCOLOR=\"". $this->bgcolor3 ."\" ALIGN=\"right\" COLSPAN=\"2\">". theme_morelink($this, $story) ."</TD></TR>"; - else - echo "<TR BGCOLOR=\"". $this->bgcolor3 ."\"><TD COLSPAN=\"2\" BGCOLOR=\"". $this->bgcolor3 ."\" ALIGN=\"right\">". $reply ."</TD></TR>"; ?> </TABLE></TD></TR></TABLE><BR> <?php diff --git a/themes/yaroon/jeroen2.theme b/themes/yaroon/jeroen2.theme index 06434db50..b4d4e6be0 100644 --- a/themes/yaroon/jeroen2.theme +++ b/themes/yaroon/jeroen2.theme @@ -106,7 +106,7 @@ } // close header function - function story($story, $reply = 0) { + function story($story, $main = 0) { switch ($story->tid) { case 0: $color = "#c4a2a2"; $img = "square2.gif"; break; @@ -135,17 +135,15 @@ <?php echo "<br />". check_output($story->abstract, 1) ."<br />"; - if ($reply && $story->body) + if (!$main && $story->body) echo "<br />". check_output($story->body, 1) ."<br />"; echo" </td> </tr> <tr> <td align=\"right\"> <font color=\"". $color ."\">"; - if (!$reply) + if ($main) echo "". theme_morelink($this, $story) .""; - else - echo "". $reply .""; echo"</font>"; ?> |