From 9e4984588c7f70ddc8012859cd1e97a00c0829ad Mon Sep 17 00:00:00 2001
From: Kjartan Mannes <kjartan@2.no-reply.drupal.org>
Date: Sun, 10 Jun 2001 13:53:44 +0000
Subject: Changes - created a BaseTheme class in theme.inc. - added
 links($links = array(), $status = 0, $node = 0) to BaseTheme. - modified all
 themes to extend from BaseTheme. - modiefied theme_link() to take advantage
 of $theme->links(). - theme_morelink() does not require a $theme argument.

Todo
- add the other standard variables and functions to BaseTheme.
- some themes could use some more modifications.

Weird
- marvin.theme still has a story() function.
---
 themes/example/example.theme |  9 ++++-----
 themes/marvin/marvin.theme   | 12 ++++++------
 themes/unconed/unconed.theme | 12 ++++++------
 3 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'themes')

diff --git a/themes/example/example.theme b/themes/example/example.theme
index 20e567173..ad8a92cff 100644
--- a/themes/example/example.theme
+++ b/themes/example/example.theme
@@ -9,7 +9,7 @@
 
   *********************************************************************/
 
-  class Theme {
+  class Theme extends BaseTheme {
     // General colorset that can be used for this theme 
     var $foreground = "#000000";
     var $background = "#FFFFFF";
@@ -30,7 +30,7 @@
               <TD ALIGN="right" COLSPAN="2">
 
 <?php
-               print theme_link(" | ");
+               print theme_link();
 ?>
 
               </TD>
@@ -50,7 +50,7 @@
 
     } // close header function
 
-    function node($node, $main = 0) {
+    function node($node, $main = 0, $links = 0) {
 ?>
 
               <TABLE BORDER="1" CELLSPACING="0" CELLPADDING="3" WIDTH="100%">
@@ -83,8 +83,7 @@
                  <TR>
                    <TD COLSPAN="2">
 <?php
-                     if ($main)
-                       echo theme_morelink($this, $node);
+                      if ($main || $links) echo $this->links($links, $main, $node);
 ?>
 
                    </TD>
diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme
index 67746ab24..ab76f8fe1 100644
--- a/themes/marvin/marvin.theme
+++ b/themes/marvin/marvin.theme
@@ -10,7 +10,7 @@
 
   *********************************************************************/
 
- class Theme {
+ class Theme extends BaseTheme {
    var $link = "#666699";
 
    // General colorset that can be used for this theme 
@@ -39,7 +39,7 @@
        <TR>
         <TD ALIGN="right" COLSPAN="2">
          <?php
-           print "<SMALL>". theme_link(" | ") ."</SMALL>\n";
+           print "<SMALL>". theme_link() ."</SMALL>\n";
          ?>
         </TD>
        </TR>
@@ -66,12 +66,12 @@
      print "  </TD>\n";
      print " </TR>\n";
      print " <TR><TD COLSPAN=\"2\">&nbsp;</TD></TR>\n";
-     if ($main) print " <TR><TD COLSPAN=\"2\">". theme_morelink($this, $story) ."</TD></TR>\n";
+     if ($main || $links) print " <TR><TD COLSPAN=\"2\">". $this->links($links, $main, $node) ."</TD></TR>\n";
      print "</TABLE>\n";
      print "<BR><BR>\n\n";
    }
 
-   function node($node, $main = 0) {
+   function node($node, $main = 0, $links = 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=\"\"> &nbsp; <B>". check_output($node->title) ."</B></TD></TR>\n";
@@ -86,7 +86,7 @@
      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) print " <TR><TD COLSPAN=\"2\">". theme_morelink($this, $node) ."</TD></TR>\n";
+     if ($main || $links) print " <TR><TD COLSPAN=\"2\">". $this->links($links, $main, $node) ."</TD></TR>\n";
      print "</TABLE>\n";
      print "<BR><BR>\n\n";
    }
@@ -168,7 +168,7 @@
       <TR>
        <TD ALIGN="center" COLSPAN="3">
         <?php
-          print "<P><SMALL>[ ". theme_link(" | ") ." ]</SMALL></P><P>". variable_get(site_footer, "") ."</P>\n";
+          print "<P><SMALL>[ ". theme_link() ." ]</SMALL></P><P>". variable_get(site_footer, "") ."</P>\n";
         ?>
        </TD>
       </TR>
diff --git a/themes/unconed/unconed.theme b/themes/unconed/unconed.theme
index 08ea6fe3c..54c938dd5 100644
--- a/themes/unconed/unconed.theme
+++ b/themes/unconed/unconed.theme
@@ -10,7 +10,7 @@
 
   *********************************************************************/
 
- class Theme {
+ class Theme extends BaseTheme {
    var $foreground = "#000000";
    var $background = "#FFFFFF";
 
@@ -65,7 +65,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 theme_link(); ?></BIG></TD></TR></TABLE></TD></TR></TABLE>
         </TD>
        </TR>
        <TR><TD COLSPAN="2"><?php
@@ -81,7 +81,7 @@
     <?php
    }
 
-   function node($node, $main = 0) {
+   function node($node, $main = 0, $links = 0) {
 
         print "\n<!-- node: \"$node->title\" -->\n";
         ?>
@@ -103,8 +103,8 @@
           </TD>
          </TR>
          <?php
-           if ($main)
-             echo "<TR BGCOLOR=\"". $this->bgcolor3 ."\"><TD BGCOLOR=\"". $this->bgcolor3 ."\" ALIGN=\"right\" COLSPAN=\"2\">". theme_morelink($this, $node) ."</TD></TR>";
+           if ($main || $links)
+             echo "<TR BGCOLOR=\"". $this->bgcolor3 ."\"><TD BGCOLOR=\"". $this->bgcolor3 ."\" ALIGN=\"right\" COLSPAN=\"2\">". $this->links($links, $main, $node) ."</TD></TR>";
          ?>
        </TABLE></TD></TR></TABLE><BR>
       <?php
@@ -204,7 +204,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 theme_link(); ?></BIG></TD></TR></TABLE></TD></TR></TABLE>
        </TD>
       </TR>
      </TABLE>
-- 
cgit v1.2.3