diff options
Diffstat (limited to 'themes')
-rw-r--r-- | themes/example/example.theme | 8 | ||||
-rw-r--r-- | themes/goofy/goofy.theme | 6 | ||||
-rw-r--r-- | themes/jeroen/jeroen.theme | 8 | ||||
-rw-r--r-- | themes/marvin/marvin.theme | 12 | ||||
-rw-r--r-- | themes/unconed/unconed.theme | 10 | ||||
-rw-r--r-- | themes/yaroon/yaroon.theme | 6 |
6 files changed, 24 insertions, 26 deletions
diff --git a/themes/example/example.theme b/themes/example/example.theme index e53496b68..3f4889685 100644 --- a/themes/example/example.theme +++ b/themes/example/example.theme @@ -30,7 +30,7 @@ <TD ALIGN="right" COLSPAN="2"> <?php - print theme_link(); + print $this->links(link_page()); ?> </TD> @@ -50,7 +50,7 @@ } // close header function - function node($node, $main = 0, $links = 0) { + function node($node, $main = 0) { ?> <TABLE BORDER="1" CELLSPACING="0" CELLPADDING="3" WIDTH="100%"> @@ -83,7 +83,7 @@ <TR> <TD COLSPAN="2"> <?php - if (node_links($links, $node, $main)) echo $this->links($links, $main); + if ($main) echo $this->links(link_node($node)); ?> </TD> @@ -178,7 +178,7 @@ </TR> <TR> <TD ALIGN="center" COLSPAN="3"> - <P><?php print theme_link(" | "); ?></P> + <P><?php print $this->links(link_page()); ?></P> <P><SMALL><?php print variable_get(site_footer, ""); ?></SMALL></P> </TD> </TR> diff --git a/themes/goofy/goofy.theme b/themes/goofy/goofy.theme index 9cb913975..9444db289 100644 --- a/themes/goofy/goofy.theme +++ b/themes/goofy/goofy.theme @@ -86,7 +86,7 @@ function c(subject,mod,author,date,body) {document.writeln("<table border=\"0\" </tr> <tr> <td class="lgl"><img src="themes/goofy/images/null.gif" alt=""></td> - <td class="lgcnt" width="100%" valign="top"><div align="center"><big><?php print theme_link(); ?></big></div></td> + <td class="lgcnt" width="100%" valign="top"><div align="center"><big><?php print $this->links(link_page()); ?></big></div></td> <td class="lgr"><img src="themes/goofy/images/null.gif" alt=""></td> </tr> <tr> @@ -99,12 +99,12 @@ function c(subject,mod,author,date,body) {document.writeln("<table border=\"0\" } // close linksbar function - function node($node, $main = 0, $links = 0) { + function node($node, $main = 0) { echo "\n<!-- node: \"$node->title\" -->\n"; $title = check_output($node->title); $subleft = strtr(t("Submitted by %a on %b"), array("%a" => format_username($node->userid), "%b" => format_date($node->timestamp, "large"))); $subright = node_index($node); - $body = check_output($node->body, 1) . (node_links($links, $node, $main) ? "<hr color=\"#404040\" size=\"1\"><div align=\"right\">[ " . $this->links($links, $main) . " ]</div>" : ""); + $body = check_output($node->body, 1) . ($main ? "<hr color=\"#404040\" size=\"1\"><div align=\"right\">[ " . $this->links(link_node($node)) . " ]</div>" : ""); print "<script language=\"JavaScript\"><!--\ns(\"". $this->stripbreaks(addslashes($title)) ."\",\"". $this->stripbreaks(addslashes($subleft)) ."\",\"". $this->stripbreaks(addslashes($subright)) ."\",\"". $this->stripbreaks(addslashes($body)) ."\"); // -->\n</script>\n"; } // close node function diff --git a/themes/jeroen/jeroen.theme b/themes/jeroen/jeroen.theme index c5685f326..739c7b16e 100644 --- a/themes/jeroen/jeroen.theme +++ b/themes/jeroen/jeroen.theme @@ -84,7 +84,7 @@ } // close header function - function node($node, $main = 0, $links = 0) { + function node($node, $main = 0) { ?> @@ -138,8 +138,8 @@ <tr> <td colspan="2" align="right"> <?php - if (node_links($links, $node, $main)) - echo $this->links($links, $main); + if ($main) + echo $this->links(node_link($node)); ?> </td> @@ -310,7 +310,7 @@ <tr> <td align="left" width="20" height="20" background="themes/jeroen/images/footerleft.gif" nowrap> </td> <td width="100%" background="themes/jeroen/images/footer.gif" align="center" valign="middle"> - <FONT COLOR="#E09226" SIZE="2">[ <?php print theme_link(); ?> ] </FONT> + <FONT COLOR="#E09226" SIZE="2">[ <?php print $this->links(link_page()); ?> ] </FONT> </td> <td align="right" width="20" background="themes/jeroen/images/footerright.gif" nowrap> </td> </tr> diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme index c24cb68f3..583011daf 100644 --- a/themes/marvin/marvin.theme +++ b/themes/marvin/marvin.theme @@ -1,4 +1,4 @@ -<?php +<? /********************************************************************* @@ -41,7 +41,7 @@ <tr> <td align="right" colspan="2"> <?php - print "<small>". theme_link() ."</small>\n"; + print "<small>". $this->links(link_page()) ."</small>\n"; ?> </td> </tr> @@ -50,7 +50,7 @@ <?php } - function node($node, $main = 0, $links = 0) { + function node($node, $main = 0) { print "\n<!-- node: \"$node->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($node->title) ."</b></td></tr>\n"; @@ -59,9 +59,7 @@ print " <tr><td colspan=\"2\"> </td></tr>\n"; print " <tr><td colspan=\"2\"><p>". check_output($node->body, 1) ."</p></td></tr>\n"; print " <tr><td colspan=\"2\"> </tr></tr>\n"; - if (node_links($links, $node, $main)) { - print " <tr><td colspan=\"2\">". $this->links($links, $main) ."</td></tr>\n"; - } + if ($main) print " <tr><td colspan=\"2\">". $this->links(link_node($node)) ."</td></tr>\n"; print "</table>\n"; print "<br /><br />\n\n"; } @@ -145,7 +143,7 @@ <tr> <td align="center" colspan="2"> <?php - print "<p><small>[ ". theme_link() ." ]</small></p><p>". variable_get("site_footer", "") ."</p>\n"; + print "<p><small>[ ". $this->links(link_page()) ." ]</small></p><p>". variable_get("site_footer", "") ."</p>\n"; ?> </td> </tr> diff --git a/themes/unconed/unconed.theme b/themes/unconed/unconed.theme index a51f6222f..0eeb72e7b 100644 --- a/themes/unconed/unconed.theme +++ b/themes/unconed/unconed.theme @@ -63,7 +63,7 @@ </TR> <TR> <TD COLSPAN="2" ALIGN="CENTER"> - <TABLE BORDER="0" WIDTH="100%" CELLSPACING="0" CELLPADDING="0" BGCOLOR="<?php echo $this->brcolor1; ?>"><TR><TD ALIGN="CENTER"><TABLE BORDER="0" WIDTH="100%" CELLSPACING="1" CELLPADDING="4"><TR><TD ALIGN="CENTER" BGCOLOR="<?php echo $this->bgcolor2; ?>"><BIG><?php print theme_link(); ?></BIG></TD></TR></TABLE></TD></TR></TABLE> + <TABLE BORDER="0" WIDTH="100%" CELLSPACING="0" CELLPADDING="0" BGCOLOR="<?php echo $this->brcolor1; ?>"><TR><TD ALIGN="CENTER"><TABLE BORDER="0" WIDTH="100%" CELLSPACING="1" CELLPADDING="4"><TR><TD ALIGN="CENTER" BGCOLOR="<?php echo $this->bgcolor2; ?>"><BIG><?php print $this->links(link_page()); ?></BIG></TD></TR></TABLE></TD></TR></TABLE> </TD> </TR> <TR><TD COLSPAN="2"><?php @@ -79,7 +79,7 @@ <?php } - function node($node, $main = 0, $links = 0) { + function node($node, $main = 0) { print "\n<!-- node: \"$node->title\" -->\n"; ?> @@ -101,8 +101,8 @@ </TD> </TR> <?php - if (node_links($links, $node, $main)) - echo "<TR BGCOLOR=\"". $this->bgcolor3 ."\"><TD BGCOLOR=\"". $this->bgcolor3 ."\" ALIGN=\"right\" COLSPAN=\"2\">[ ". $this->links($links, $main) ." ]</TD></TR>"; + if ($main) + echo "<TR BGCOLOR=\"". $this->bgcolor3 ."\"><TD BGCOLOR=\"". $this->bgcolor3 ."\" ALIGN=\"right\" COLSPAN=\"2\">[ ". $this->links(link_node($node)) ." ]</TD></TR>"; ?> </TABLE></TD></TR></TABLE><BR> <?php @@ -202,7 +202,7 @@ ?></TD></TR> <TR> <TD COLSPAN="2"> - <TABLE BORDER="0" WIDTH="100%" CELLSPACING="0" CELLPADDING="0" BGCOLOR="<?php echo $this->brcolor1; ?>"><TR><TD ALIGN="CENTER"><TABLE BORDER="0" WIDTH="100%" CELLSPACING="1" CELLPADDING="4"><TR><TD ALIGN="CENTER" BGCOLOR="<?php echo $this->bgcolor2; ?>"><BIG><?php print theme_link(); ?></BIG></TD></TR></TABLE></TD></TR></TABLE> + <TABLE BORDER="0" WIDTH="100%" CELLSPACING="0" CELLPADDING="0" BGCOLOR="<?php echo $this->brcolor1; ?>"><TR><TD ALIGN="CENTER"><TABLE BORDER="0" WIDTH="100%" CELLSPACING="1" CELLPADDING="4"><TR><TD ALIGN="CENTER" BGCOLOR="<?php echo $this->bgcolor2; ?>"><BIG><?php print $this->links(link_page()); ?></BIG></TD></TR></TABLE></TD></TR></TABLE> </TD> </TR> </TABLE> diff --git a/themes/yaroon/yaroon.theme b/themes/yaroon/yaroon.theme index 66280be8b..f0dd622a5 100644 --- a/themes/yaroon/yaroon.theme +++ b/themes/yaroon/yaroon.theme @@ -112,7 +112,7 @@ } // close header function - function node($node, $main = 0, $links = 0) { + function node($node, $main = 0) { switch ($node->tid) { case 0: $color = "#c4a2a2"; $img = "square2.gif"; break; @@ -145,8 +145,8 @@ <tr> <td align=\"right\"> <font color=\"". $color ."\">"; - if (node_links($links, $node, $main)) - echo $this->links($links, $main); + if ($main) + echo $this->links(node_link($node)); echo"</font>"; ?> |