From afe3e5d00ea0173e331fa4eed5f4f959e2f860a0 Mon Sep 17 00:00:00 2001
From: Eike Foken <kontakt@eikefoken.de>
Date: Thu, 8 Sep 2011 22:21:51 +0200
Subject: [PATCH] Add icons to project sidebar

---
 application/models/project.php | 16 ++++++++++------
 application/views/header.php   |  6 +++---
 assets/css/style.css           | 17 ++++++++++++++++-
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/application/models/project.php b/application/models/project.php
index 5b0280e..c10e25d 100644
--- a/application/models/project.php
+++ b/application/models/project.php
@@ -58,9 +58,13 @@ class Project extends CI_Model {
 	 * @return array The user's projects.
 	 */
 	public function getOwn() {
-		$query = $this->db->where(array('owner' => $this->session->userdata('user_id')))
-				->order_by('lastaccess', 'desc')
-				->get('projects');
+		$this->db->select('projects.*, COUNT(shares.user_id) AS shares');
+		$this->db->join('shares', 'shares.project_id = projects.id', 'left');
+		$this->db->group_by('shares.project_id');
+		$this->db->where(array('owner' => $this->session->userdata('user_id')));
+
+		$query = $this->db->order_by('last_access DESC')->get('projects');
+
 		return $this->_addShortNames($query->result_array());
 	}
 
@@ -71,7 +75,7 @@ class Project extends CI_Model {
 	 */
 	public function getShared() {
 		$this->load->library('session');
-		$this->db->select('*')->from('shares')->order_by('lastaccess', 'desc')->where(array('user_id' => $this->session->userdata('user_id')));
+		$this->db->select('*')->from('shares')->order_by('last_access DESC')->where(array('user_id' => $this->session->userdata('user_id')));
 		$this->db->join('projects', 'projects.id = shares.project_id');
 		$query = $this->db->get();
 
@@ -118,7 +122,7 @@ class Project extends CI_Model {
 	 */
 	public function getById($projectId) {
 		$result = $this->db->get_where('projects', array('id' => $projectId))->row_array();
-		$this->db->where('id', $projectId)->update('projects', array('lastaccess' => mysql_now()));
+		$this->db->where('id', $projectId)->update('projects', array('last_access' => mysql_now()));
 
 		if ($result) {
 			return $this->_addShortName($result);
@@ -189,7 +193,7 @@ class Project extends CI_Model {
 
 		$data['owner'] = '215cd70f310ae6ae'; //$this->session->userdata('user_id');
 		$data['created'] = mysql_now();
-		$data['lastaccess'] = mysql_now();
+		$data['last_access'] = mysql_now();
 
 		do {
 			$data['id'] = random_hash();
diff --git a/application/views/header.php b/application/views/header.php
index 23ea386..e140c61 100644
--- a/application/views/header.php
+++ b/application/views/header.php
@@ -112,7 +112,7 @@
 	if (count($projects) > 0):
 		foreach ($this->project->getOwn() as $project):
 ?>
-						<li><?=anchor('projects/detail/' . $project['id'] . '?active_project=' . $project['id'], $project['mediumname']);?></li>
+						<li><a href="<?=site_url('projects/detail/' . $project['id'] . '?active_project=' . $project['id']);?>"<?=($project['public'] == 1) ? ' class="public"' : (($project['shares'] > 0) ? ' class="share"' : ' class="folder"');?>><?=$project['mediumname'];?></a></li>
 <?php
 		endforeach;
 	else:
@@ -134,7 +134,7 @@
 <?php
 	foreach ($projects as $project):
 ?>
-						<li><?=anchor('projects/detail/' . $project['id'] . '?active_project=' . $project['id'], $project['mediumname']);?></li>
+						<li><?=anchor('projects/detail/' . $project['id'] . '?active_project=' . $project['id'], $project['mediumname'], 'class="folder"');?></li>
 <?php
 	endforeach;
 ?>
@@ -152,7 +152,7 @@
 <?php
 	foreach ($projects as $project):
 ?>
-						<li><?=anchor('projects/detail/' . $project['id'] . '?active_project=' . $project['id'], $project['mediumname']);?></li>
+						<li><?=anchor('projects/detail/' . $project['id'] . '?active_project=' . $project['id'], $project['mediumname'], 'class="folder"');?></li>
 <?php
 	endforeach;
 ?>
diff --git a/assets/css/style.css b/assets/css/style.css
index ad2ffcd..8d402dc 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -215,6 +215,21 @@ div.error {
 	color: #0088cc;
 }
 
+.navigation a.share {
+	background: url(../images/icons/blue-folder-share.png) 0 center no-repeat;
+	padding-left: 22px;
+}
+
+.navigation a.public {
+	background: url(../images/icons/users.png) 0 center no-repeat;
+	padding-left: 22px;
+}
+
+.navigation a.folder {
+	background: url(../images/icons/blue-folder.png) 0 center no-repeat;
+	padding-left: 22px;
+}
+
 /* Search */
 
 #search-form {
@@ -276,7 +291,7 @@ div.error {
 }
 
 #content div.title a.share {
-    background: url(../images/icons/hand-share.png) 6px center no-repeat;
+    background: url(../images/icons/user-share.png) 6px center no-repeat;
     padding-left: 28px;
     font-size: 12px;
     font-weight: normal;