- improved submit.php:

  it now uses the new category code, incl content bindings.
  You can setup different "categories" which map on a content
  type.  Example:
    review   -> review.module
    article  -> story.module
    column   -> story.module
    announc. -> story.module
    addons   -> file.module
    themes   -> file.module
- "generalised" story.module and book.module's output.
- fixed bug in includes/timer.inc
- fixed glitch in theme example.theme: it said "$how by" but
  the variable $how has never been declared.
- added "drupal development settings" to display some timings
- more work on the categories/topics -> does NOT work yet

3 files changed, 7 insertions, 7 deletions

diff --git a/themes/example/example.theme b/themes/example/example.theme
index a1984fb4f..dbdad530d 100644
--- a/themes/example/example.theme
+++ b/themes/example/example.theme
@@ -61,7 +61,7 @@
 
 <?php
 
-                     echo strtr(t("$how by %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp, "large")));
+                     echo strtr(t("by %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp, "small")));
 ?>
 
                    </TD>
@@ -192,7 +192,7 @@
           <TR>
             <TD ALIGN="center" COLSPAN="3">
               <P><?php print theme_link(" | "); ?></P>
-              <P><SMALL><?php print variable_get(theme_footer, ""); ?></SMALL></P>
+              <P><SMALL><?php print variable_get(site_footer, ""); ?></SMALL></P>
             </TD>
           </TR>
         </TABLE>
diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme
index 4bab35078..00a415640 100644
--- a/themes/marvin/marvin.theme
+++ b/themes/marvin/marvin.theme
@@ -145,7 +145,7 @@
       <TR>
        <TD ALIGN="center" COLSPAN="3">
         <?php
-          print "<P><SMALL>[ ". theme_link(" | ") ." ]</SMALL></P><P>". varaible_get(theme_footer, "") ."</P>\n";
+          print "<P><SMALL>[ ". theme_link(" | ") ." ]</SMALL></P><P>". variable_get(site_footer, "") ."</P>\n";
         ?>
        </TD>
       </TR>
diff --git a/themes/yaroon/jeroen2.theme b/themes/yaroon/jeroen2.theme
index afa3eba4c..21086cb77 100644
--- a/themes/yaroon/jeroen2.theme
+++ b/themes/yaroon/jeroen2.theme
@@ -124,7 +124,7 @@
                   <tr><td bgcolor="<?php echo $color; ?>"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0" /></td></tr>
                   <tr>
                     <td>
-                      
+
 <?php
 
                       echo "<br /><font face=\"Helvetica\">". check_output($story->abstract, 1) ."<br />";
@@ -160,7 +160,7 @@
         <tr>
           <td class="box">
             <img src="themes/jeroen2/images/square.gif" />&nbsp;<b><?php echo check_output($comment->subject); ?></b>
-	    <font face="Helvetica" size="-1"><?php echo strtr(t(" by %a on %b"), array("%a" => format_username($comment->userid), "%b" => format_date($comment->timestamp), "small")); ?></font>
+      <font face="Helvetica" size="-1"><?php echo strtr(t(" by %a on %b"), array("%a" => format_username($comment->userid), "%b" => format_date($comment->timestamp), "small")); ?></font>
           </td>
           <td align="right"><?php echo comment_moderation($comment); ?></td>
         </tr>
@@ -201,7 +201,7 @@
 
       <table width="90%" border="0" cellpadding="0" cellspacing="1">
         <tr>
-	  <td class="box"><img src="themes/jeroen2/images/square.gif" />&nbsp;<b><font face="Helvetica"><?php echo $subject; ?></font></b></td>
+    <td class="box"><img src="themes/jeroen2/images/square.gif" />&nbsp;<b><font face="Helvetica"><?php echo $subject; ?></font></b></td>
         </tr>
         <tr><td class="spacer1"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0" /><br></td></tr>
         <tr>
@@ -222,7 +222,7 @@
     function footer() {
 
 ?>
-              
+
                 &nbsp; <!-- I call this the super-space, withouth it, the comment section looks crappy at the bottom :) -->
               </td>
             </tr>