Commit 8f7eddbe authored by Kjartan's avatar Kjartan

Changes

- fixed the trailing | in some cases.
- removed theme_morelinks().
- added node_links().
- simplified BaseTheme->links().
- updated themes.

Notes
- the new links system is taking form, but concider it beta. There might still
  be some major changes ahead so I suggest waiting a little longer before
  modifying your theme to take advantage of it.
parent d397bbe9
<?php
class BaseTheme {
function links($links = array(), $status = 0, $node = 0) {
if ($status == 1)
$links = array_merge(theme_morelink($node), $links);
function links(&$links, $state = 0) {
// $state = 0 : default behaviour
// $state = 1 : main page
// $state = 2 : theme_link()
// Subject to change coz its messy
foreach ($links as $link) {
$_links[] = count($link) == 2 ? "<A HREF=\"$link[0]\"><FONT COLOR=\"$theme->link\">". t($link[1]) ."</FONT></A>" : t($link[0]);
if ($link[0]) $_links[] = count($link) == 2 ? "<A HREF=\"$link[0]\"><FONT COLOR=\"$theme->link\">". t($link[1]) ."</FONT></A>" : t($link[0]);
}
if ($status == 2) return ($_links ? implode(" | ", $_links) : "");
else return ($_links ? "[ ". implode(" | ", $_links) ." ]" : "");
return ($_links ? implode(" | ", $_links) : "");
}
}
......@@ -112,17 +112,6 @@ function theme_blocks($region, $theme) {
}
}
function theme_morelink(&$node) {
if ($node->body) {
$links[] = array("node.php?id=$node->nid", t("read more"));
}
if ($node->comment) {
$links[] = array("node.php?id=$node->nid", format_plural(node_get_comments($node->nid), "comment", "comments"));
}
return $links;
}
function theme_moderation_results($theme, $node) {
foreach (explode(";", $node->users) as $vote) {
if ($vote) {
......
......@@ -83,7 +83,7 @@ function node($node, $main = 0, $links = 0) {
<TR>
<TD COLSPAN="2">
<?php
if ($main || $links) echo $this->links($links, $main, $node);
if (node_links($links, $node, $main)) echo $this->links($links, $main);
?>
</TD>
......
......@@ -63,7 +63,7 @@ function node($node, $main = 0, $links = 0) {
print " <TD COLSPAN=\"2\"><P>". check_output($node->body, 1) ."</P></TD>\n";
print " </TR>\n";
print " <TR><TD COLSPAN=\"2\">&nbsp;</TD></TR>\n";
if ($main || $links) print " <TR><TD COLSPAN=\"2\">". $this->links($links, $main, $node) ."</TD></TR>\n";
if (node_links($links, $node, $main)) print " <TR><TD COLSPAN=\"2\">". $this->links($links, $main) ."</TD></TR>\n";
print "</TABLE>\n";
print "<BR><BR>\n\n";
}
......
......@@ -101,8 +101,8 @@ function node($node, $main = 0, $links = 0) {
</TD>
</TR>
<?php
if ($main || $links)
echo "<TR BGCOLOR=\"". $this->bgcolor3 ."\"><TD BGCOLOR=\"". $this->bgcolor3 ."\" ALIGN=\"right\" COLSPAN=\"2\">". $this->links($links, $main, $node) ."</TD></TR>";
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>";
?>
</TABLE></TD></TR></TABLE><BR>
<?php
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment