Hey,

This is a more up-to-date version of "Yaroon". Glad some people are actually using it. If you encounter any bugs just drop them in my personal mailbox or fase them through to the mailinglist and let everyone know that I can't commit anything that, more or less,... works.

Greets,

Jeroen.

1 files changed, 14 insertions, 9 deletions

diff --git a/themes/yaroon/yaroon.theme b/themes/yaroon/yaroon.theme
index fee63a65a..d964638f0 100644
--- a/themes/yaroon/yaroon.theme
+++ b/themes/yaroon/yaroon.theme
@@ -72,15 +72,16 @@
                 <select name="navdrop" onChange="do_nav()" class="small">
                   <option value="index.php" <?php if (strstr($PHP_SELF, "index.php")) { echo "selected"; $true = 1; } ?>>Main</option>
                   <option value="account.php" <?php if (strstr($PHP_SELF, "account.php")) { echo "selected"; $true = 1; } ?>>Account</option>
-                  <option value="module.php?mod=diary" <?php if (strstr($REQUEST_URI, "mod=diary")) { echo "selected"; $true = 1; } ?>>Diary</option>
+                  <option value="module.php?mod=blog" <?php if (strstr($REQUEST_URI, "mod=diary")) { echo "selected"; $true = 1; } ?>>User blogs</option>
                   <option value="module.php?mod=forum" <?php if (strstr($REQUEST_URI, "mod=forum")) { echo "selected"; $true = 1; } ?>>Forum</option>
-                  <option value="module.php?mod=headline" <?php if (strstr($REQUEST_URI, "mod=headline")) { echo "selected"; $true = 1; } ?>>Headline</option>
-                  <option value="module.php?mod=book" <?php if (strstr($REQUEST_URI, "mod=book")) { echo "selected"; $true = 1; } ?>>Handbook</option>
-                  <option value="module.php?mod=cvs" <?php if (strstr($REQUEST_URI, "mod=cvs")) { echo "selected"; $true = 1; } ?>>CVS</option>
+                  <option value="module.php?mod=headline" <?php if (strstr($REQUEST_URI, "mod=import")) { echo "selected"; $true = 1; } ?>>News feeds</option>
+                  <option value="module.php?mod=cloud" <?php if (strstr($REQUEST_URI, "mod=cloud")) { echo "selected"; $true = 1; } ?>>Site cloud</option>
+                  <option value="module.php?mod=book" <?php if (strstr($REQUEST_URI, "mod=book")) { echo "selected"; $true = 1; } ?>>Collaborative book</option>
+                  <option value="module.php?mod=cvs" <?php if (strstr($REQUEST_URI, "mod=cvs")) { echo "selected"; $true = 1; } ?>>CVS messages</option>
                   <option value="submit.php" <?php if (strstr($PHP_SELF, "submit.php")) { echo "selected"; $true = 1; } ?>>Submit</option>
                   <option value="module.php?mod=search" <?php if (strstr($REQUEST_URI, "mod=search")) { echo "selected"; $true = 1; } ?>>Search</option>
-                  <option value="module.php?mod=rating" <?php if (strstr($REQUEST_URI, "mod=rating")) { echo "selected"; $true = 1; } ?>>Rating</option>
-                  <?php if ($REQUEST_URI == "/module.php?mod=queue") { $true = 1; echo "<option selected>Moderation</option>"; }
+                  <option value="module.php?mod=rating" <?php if (strstr($REQUEST_URI, "mod=rating")) { echo "selected"; $true = 1; } ?>>User rating</option>
+                  <?php if ($REQUEST_URI == "/module.php?mod=queue") { $true = 1; echo "<option selected>Submission queue</option>"; }
                   if (!$true) { echo "<option selected>"; if($cid) echo "Node $cid"; else if($id) echo "Node $id"; else echo "Other"; echo"</option>"; } ?>
                 </select>
                 <noscript><input type="submit" value="Go"></noscript>
@@ -114,7 +115,7 @@
 
     function node($node, $main = 0) {
 
-      switch ($node->tid) {
+      switch (rand(0,8)) {
         case 0: $color = "#c4a2a2"; $img = "square2.gif"; break;
         case 1: $color = "#a2c4a7"; $img = "square3.gif"; break;
         case 2: $color = "#c2c4a2"; $img = "square4.gif"; break;
@@ -125,12 +126,14 @@
         default: $color = "#a3b1c7"; $img = "square.gif";
       }
 
+
+
 ?>
 
                 <table border="0" cellpadding="0" cellspacing="1" width="100%">
                   <tr>
                     <td>
-                      <a href="index.php?topic=<?php echo $node->tid; ?>"><img src="themes/yaroon/images/<?php echo $img; ?>" border="0" /></a>&nbsp;<b style="font-size: 12pt"><?php echo check_output($node->title); ?></b>
+                      <img src="themes/yaroon/images/<?php echo $img; ?>" border="0" />&nbsp;<b style="font-size: 12pt"><?php echo check_output($node->title); ?></b>
                       <?php echo strtr(t("by %a on %b"), array("%a" => format_name($node->name), "%b" => format_date($node->timestamp), "small")); ?>
                     </td>
                   </tr>
@@ -146,7 +149,7 @@
                     <td align=\"right\">
                       <font color=\"". $color ."\">";
                       if ($main)
-                        echo $this->links(node_link($node));
+                        echo "[ ". $this->links(link_node($node)) ." ]";
                       echo"</font>";
 
 ?>
@@ -157,6 +160,7 @@
                 </table>
 
 <?php
+
     } // close node function
 
     function comment($comment, $link = "") {
@@ -248,6 +252,7 @@
             </tr>
           </table>
         </body>
+
      </html>
 
 <?php