- added header logo link

- fixed IE 7/8 collapsable table bugs

application/config/phpbb.php

@@ -9,7 +9,7 @@
 */
 
 // url to forum, with trailing slash
-$config['url'] = 'http://forum.eternal-knights.net/';
+$config['url'] = 'http://www.eternal-knights.net/forum/';
 
 // database connection group for phpBB, defined in database.php
 $config['db_group'] = 'phpbb';

application/libraries/phpbb.php

@@ -16,6 +16,7 @@ public function parse_bbcode(&$text)
 		$text = preg_replace_callback('#\[list](.*)\[/list\]#msUi', array($this, 'handle_bbcode_list_u'), $text);
 		$text = preg_replace_callback('#\[list=1](.*)\[/list\]#msUi', array($this, 'handle_bbcode_list_1'), $text);
 		$text = preg_replace_callback('#\[list=a](.*)\[/list\]#msUi', array($this, 'handle_bbcode_list_a'), $text);
+		$text = preg_replace('#<img src="\{SMILIES_PATH\}([^"]+)"#', '<img class="bbcode smiley" src="'.config_item('url', 'phpbb').'images/smilies/$1"', $text);
 
 		$text = str_replace("\n", '<br />', $text);
 

application/models/calendar.php

@@ -8,20 +8,19 @@ function __construct()
 	}
 
 	/**
-	 * Returns the events for current month.
-	 * With realm name, without event description.
+	 * Returns the events for current month,
+	 * without event description.
 	 *
 	 * @param int $userlevel	Minimal userlevel (USERLEVEL_* constant)
 	 * @return array
 	 */
 	public function get_month_events($userlevel)
 	{
 		return $this->db->from('ek_calendar')
-				 ->select(array('ek_calendar.id', 'ek_calendar.title', 'ek_calendar.date', 'ek_calendar.realm_id', 'ek_calendar.visibility', 'realmlist.name AS realm'))
-				 ->where('ek_calendar.visibility >=', $userlevel)
-				 ->where('ek_calendar.date >=', mktime(0, 0, 0, date('n'), 1))
-				 ->order_by('ek_calendar.date ASC')
-				 ->join('realmlist', 'ek_calendar.realm_id = realmlist.id')
+				 ->select(array('id', 'title', 'date', 'visibility'))
+				 ->where('visibility >=', $userlevel)
+				 ->where('date >=', mktime(0, 0, 0, date('n'), 1))
+				 ->order_by('date ASC')
 				 ->get()
 				 ->result();
 	}

application/modules/events.php

@@ -28,7 +28,7 @@ function index()
 
 		foreach($events as $event)
 		{
-			$content[date('j', $event->date)] = '<div style="display:none" id="event-title-'.date('j', $event->date).'"><strong>'.$event->realm.':</strong> '.$event->title.'</div><a href="'.site_url('events/'.$event->id).'">'.date('j', $event->date).'</a>';
+			$content[date('j', $event->date)] = '<div style="display:none" id="event-title-'.date('j', $event->date).'">'.$event->title.'</div><a href="'.site_url('events/'.$event->id).'">'.date('j', $event->date).'</a>';
 		}
 
 		$config = array();

application/views/partials/header.php

@@ -35,5 +35,7 @@
     		<li><a href="<?=site_url('server')?>">Server</a></li>
     		<li><a href="<?=site_url('armory')?>">Armory</a></li>
     	</ul>
+
+    	<a href="<?=base_url()?>" class="logo-link">Startseite</a>
     </div>
 

assets/css/style.css

@@ -35,6 +35,16 @@ img {
 	padding: 22px 32px 0 32px;
 }
 
+#header a.logo-link {
+	position: absolute;
+	top: 110px;
+	width: 550px;
+	height: 110px;
+	left: 50%;
+	margin-left: -290px;
+	text-indent: -9999px;
+}
+
 /* buttons */
 #header ul li > a, #header ul li.dropdown span {
 	display: block;
@@ -442,10 +452,6 @@ img {
 	background: #080e17;
 }
 
-#sidebar .box table tr {
-	margin: 0; padding: 0;
-}
-
 #sidebar .box table th {
 	font-weight: bold;
 	text-align: left;
@@ -468,7 +474,7 @@ img {
 	background-color: #12212f;
 }
 
-#sidebar .box table.collapsable.collapsed td {
+#sidebar .box table.collapsable.collapsed tr + tr {
 	display: none;
 }