From ceeb0ef08b808b6ec5dbc4a9af212895f5fd760e Mon Sep 17 00:00:00 2001
From: Karsten Heiken <karsten@disposed.de>
Date: Wed, 28 Sep 2011 20:50:36 +0200
Subject: [PATCH 1/2] Use site_url for links in dashboard

---
 application/controllers/dashboard.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/dashboard.php b/application/controllers/dashboard.php
index 9bda547..64d915f 100644
--- a/application/controllers/dashboard.php
+++ b/application/controllers/dashboard.php
@@ -54,28 +54,28 @@ class Dashboard extends MY_Controller {
 				'text' => _('Jobs finished'),
 				'id' => 'jobs_finished',
 				'title' => _('Show all finished jobs'),
-				'target' => 'jobs#finished',
+				'target' => site_url('jobs#finished'),
 			),
 			array(
 				'count' => $this->share->countUnseen(),
 				'text' => _('Newly shared projects'),
 				'id' => 'shared_projects',
 				'title' => _('Show all projects shared with me'),
-				'target' => 'shares',
+				'target' => site_url('shares'),
 			),
 			array(
 				'count' => $this->job->countRunning(),
 				'text' => _('Job running'),
 				'id' => 'jobs_running',
 				'title' => _('Show all running jobs'),
-				'target' => 'jobs#running',
+				'target' => site_url('jobs#running'),
 			),
 			array(
 				'count' => $this->job->countPending(),
 				'text' => _('Jobs pending'),
 				'id' => 'jobs_pending',
 				'title' => _('Show all pending jobs'),
-				'target' => 'jobs#pending',
+				'target' => site_url('jobs#pending'),
 			),
 		);
 		$this->load->view('dashboard', $tpl);

From affbcc9dfec8da130d69831bb263f22c0697bceb Mon Sep 17 00:00:00 2001
From: Karsten Heiken <karsten@disposed.de>
Date: Wed, 28 Sep 2011 20:56:49 +0200
Subject: [PATCH 2/2] Fix colspan on project's detail page

---
 application/views/projects/detail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/projects/detail.php b/application/views/projects/detail.php
index b2bb800..1925282 100644
--- a/application/views/projects/detail.php
+++ b/application/views/projects/detail.php
@@ -115,7 +115,7 @@
 	else:
 ?>
 				<tr>
-					<td colspan="3"><?=_('No experiments available.');?></td>
+					<td colspan="<?=(count($shares) > 0 || $project['public'] == 1) ? "4" : "3";?>"><?=_('No experiments available.');?></td>
 				</tr>
 <?php
 	endif;