From 8e94fe162587c3285554cd3f0eb87a43ffc079b0 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 18 Apr 2001 20:40:21 +0000
Subject: - structure.inc: added category_name($cid) and topic_name($tid).  
 They both return a linked string with the respective category,   or topic
 name.  Updated all themes to use these new functions.

- (stripped tabs from emsa files, nevermind)
---
 themes/example/example.theme |  4 +---
 themes/goofy/goofy.theme     |  2 +-
 themes/jeroen/jeroen.theme   | 11 ++++-------
 themes/marvin/marvin.theme   |  2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'themes')

diff --git a/themes/example/example.theme b/themes/example/example.theme
index 8b7d608c8..32b7376de 100644
--- a/themes/example/example.theme
+++ b/themes/example/example.theme
@@ -60,15 +60,13 @@
                   <TD>
 
 <?php
-
                      echo strtr(t("by %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp, "small")));
 ?>
 
                    </TD>
                    <TD 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>";
-
+                     echo category_name($story->cid) ." / ". topic_name($story->tid);
 ?>
                    </TD>
                  </TR>
diff --git a/themes/goofy/goofy.theme b/themes/goofy/goofy.theme
index 69b988730..f60fbfb92 100644
--- a/themes/goofy/goofy.theme
+++ b/themes/goofy/goofy.theme
@@ -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=\"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="lgcnt" nowrap><div align="right"><?php echo category_name($story->cid) ." / ". topic_name($story->tid); ?></div></td>
          <td class="lgr"><img src="themes/goofy/images/null.gif" alt=""></td>
         </tr>
         <tr>
diff --git a/themes/jeroen/jeroen.theme b/themes/jeroen/jeroen.theme
index 003ae3560..c93b8f4bc 100644
--- a/themes/jeroen/jeroen.theme
+++ b/themes/jeroen/jeroen.theme
@@ -103,9 +103,7 @@
                               <tr>
                                 <td align="left" background="themes/jeroen/images/menutitle.gif" nowrap>
                                   <FONT COLOR="#FEFEFE">
-
 <?php
-
                                     switch (rand(0,13)) {
                                       case 0: $how = "Yelled"; break;         case 1: $how = "Whispered"; break;
                                       case 2: $how = "Reported"; break;       case 3: $how = "Posted"; break;
@@ -116,14 +114,13 @@
                                       case 12: $how = "Forged"; break;
                                       default: $how = "Sneaked through";
                                     }
-                                    echo "<FONT SIZE=\"-1\">". strtr(t("$how by %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp), "large")) ."</FONT>
+                                    echo "<FONT SIZE=\"-1\">". strtr(t("$how by %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp), "large")) ."</FONT>";
+?>
                                   </FONT>
                                 </td>
-                                <td align=\"right\" background=\"themes/jeroen/images/menutitle.gif\" nowrap>
-                                  <b><a href=\"index.php?category=$story->cid\">". check_output($story->category) ."</a> / <a href=\"index.php?topic=$story->tid\">". check_output($story->topic) ."</a></b>";
-
+<?php
+                                echo "<td align=\"right\" background=\"themes/jeroen/images/menutitle.gif\" nowrap><b>". category_name($story->cid) ." / ". topic_name($story->tid) ."</b>";
 ?>
-
                                 </td>
                               </tr>
                               <tr>
diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme
index 584720919..5a7e33545 100644
--- a/themes/marvin/marvin.theme
+++ b/themes/marvin/marvin.theme
@@ -51,7 +51,7 @@
      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 "   <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>". category_name($story->cid) ." / ". topic_name($story->tid) ."</SMALL>\n";
      print "  </TD>\n";
      print " </TR>\n";
      print " <TR><TD COLSPAN=\"2\">&nbsp;</TD></TR>\n";
-- 
cgit v1.2.3