diff options
| -rw-r--r-- | themes/yaroon/jeroen2.theme | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/themes/yaroon/jeroen2.theme b/themes/yaroon/jeroen2.theme index 236bbbd66..06434db50 100644 --- a/themes/yaroon/jeroen2.theme +++ b/themes/yaroon/jeroen2.theme @@ -13,8 +13,7 @@ function header() { - global $PHP_SELF; - global $REQUEST_URI; + global $PHP_SELF, $REQUEST_URI, $cid, $id; $true = 0; @@ -42,7 +41,7 @@ a:hover { color: <?php echo $color; ?>; } td { font-family: Arial,Helvetica; font-size: 10pt; } .spacer1 { background-color: #000000; } - .small { font-family: Arial; font-size: 10pt; } + .small { font-family: Arial,Helvetica; font-size: 10pt; } .box { font-size: 12pt; } </style> <script language="JavaScript"> @@ -72,12 +71,12 @@ <select name="navdrop" onChange="do_nav()" class="small"> <option value="index.php" <?php if ($PHP_SELF == "/index.php") { echo "selected"; $true = 1; } ?>>Main</option> <option value="account.php" <?php if ($PHP_SELF == "/account.php") { echo "selected"; $true = 1; } ?>>Account</option> - <option value="module.php?mod=diary" <?php if (substr($REQUEST_URI,12,9) == "mod=diary") { echo "selected"; $true = 1; } ?>>Diary</option> - <option value="module.php?mod=book" <?php if ($REQUEST_URI == "/module.php?mod=book") { echo "selected"; $true = 1; } ?>>Handbook</option> - <option value="submit.php" <?php if ($PHP_SELF == "/submit.php") { echo "selected"; $true = 1; } ?>>Submit news</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=book" <?php if (strstr($REQUEST_URI, "mod=book")) { echo "selected"; $true = 1; } ?>>Handbook</option> + <option value="submit.php" <?php if ($PHP_SELF == "/submit.php") { echo "selected"; $true = 1; } ?>>Submit</option> <option value="search.php" <?php if ($PHP_SELF == "/search.php") { echo "selected"; $true = 1; } ?>>Search</option> - <?php if ($REQUEST_URI == "/module.php?mod=moderation") echo "<option selected>Moderation</option>"; - if (!$true) { echo "<option selected>Node "; $id = substr($REQUEST_URI,strlen($REQUEST_URI) - 3); if (is_int((int) $id)) echo $id; echo"</option>"; } ?> + <?php if ($REQUEST_URI == "/module.php?mod=moderation") { $true = 1; echo "<option selected>Moderation</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> </td> @@ -109,14 +108,14 @@ function story($story, $reply = 0) { - switch ($story->section) { - case "Announcements": $color = "#c4a2a2"; $img = "square2.gif"; break; - case "Drop.org - Drupal": $color = "#a2c4a7"; $img = "square3.gif"; break; - case "Science": $color = "#c2c4a2"; $img = "square4.gif"; break; - case "Drop.org - Meta": $color = "#ad4322"; $img = "square5.gif"; break; - case "Coding & Webdesign": $color = "#6c6c23"; $img = "square6.gif"; break; - case "Computers & Internet": $color = "#d31717"; $img = "square7.gif"; break; - case "News & Media": $color = "#383838"; $img = "square8.gif"; break; + switch ($story->tid) { + case 0: $color = "#c4a2a2"; $img = "square2.gif"; break; + case 1: $color = "#a2c4a7"; $img = "square3.gif"; break; + case 2: $color = "#c2c4a2"; $img = "square4.gif"; break; + case 3: $color = "#ad4322"; $img = "square5.gif"; break; + case 4: $color = "#6c6c23"; $img = "square6.gif"; break; + case 5: $color = "#d31717"; $img = "square7.gif"; break; + case 6: $color = "#383838"; $img = "square8.gif"; break; default: $color = "#a3b1c7"; $img = "square.gif"; } @@ -125,8 +124,8 @@ <table border="0" cellpadding="0" cellspacing="1" width="100%"> <tr> <td> - <a href="search.php?category=<?php echo urlencode($story->section); ?>"><img src="themes/jeroen2/images/<?php echo $img; ?>" border="0" /></a> <b style="font-size: 12pt"><?php echo check_output($story->title); ?></b> - <?php echo strtr(t("by %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp), "small")); ?> + <a href="index.php?topic=<?php echo $story->tid; ?>"><img src="themes/jeroen2/images/<?php echo $img; ?>" border="0" /></a> <b style="font-size: 12pt"><?php echo check_output($story->title); ?></b> + <?php echo strtr(t("by %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp), "small")); echo $story->cid; ?> </td> </tr> <tr><td bgcolor="<?php echo $color; ?>"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0" /></td></tr> @@ -166,7 +165,7 @@ <table width="90%" border="0" cellpadding="0" cellspacing="1" heigth="100%"> <tr> - <td class="box"> + <td valign="bottom" class="box"> <img src="themes/jeroen2/images/square.gif" /> <b><?php echo check_output($comment->subject); ?></b> <font size="-1"><?php echo strtr(t(" by %a on %b"), array("%a" => format_username($comment->userid), "%b" => format_date($comment->timestamp), "small")); ?></font> </td> @@ -174,13 +173,13 @@ </tr> <tr><td colspan="2" class="spacer1"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0" /><br></td></tr> <tr> - <td> + <td colspan="2"> <br /> <?php echo check_output($comment->comment, 1); ?> </td> </tr> <tr> - <td align="right"> + <td align="right" colspan="2"> <br /> [ <?php echo $link; ?> ]<br /> |