# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2010-09-13 11:02:20
# Node ID 8ba65e4c4e4cf8f203bcf0cc9b1a12c9d3b4cc6a
# Parent  9dd38344c466552f5e1486b518a11df94ebfb670

added journal icon and made active links in journal, fixed edit user bug when given wrong id

diff --git a/pylons_app/controllers/admin/users.py b/pylons_app/controllers/admin/users.py
--- a/pylons_app/controllers/admin/users.py
+++ b/pylons_app/controllers/admin/users.py
@@ -148,6 +148,8 @@ class UsersController(BaseController):
         """GET /users/id/edit: Form to edit an existing item"""
         # url('edit_user', id=ID)
         c.user = self.sa.query(User).get(id)
+        if not c.user:
+            return redirect(url('users'))
         if c.user.username == 'default':
             h.flash(_("You can't edit this user since it's" 
               " crucial for entire application"), category='warning')
diff --git a/pylons_app/public/css/style.css b/pylons_app/public/css/style.css
--- a/pylons_app/public/css/style.css
+++ b/pylons_app/public/css/style.css
@@ -505,6 +505,15 @@ div.options a:hover
 
 
 /*ICONS*/
+#header #header-inner #quick li ul li a.journal,
+#header #header-inner #quick li ul li a.journal:hover
+{
+    background:url("../images/icons/book.png") no-repeat scroll 4px 9px #FFFFFF;
+    margin:0;
+    padding:12px 9px 7px 24px;
+    width:167px;
+
+}
 
 #header #header-inner #quick li ul li a.repos,
 #header #header-inner #quick li ul li a.repos:hover
diff --git a/pylons_app/templates/admin/admin_log.html b/pylons_app/templates/admin/admin_log.html
--- a/pylons_app/templates/admin/admin_log.html
+++ b/pylons_app/templates/admin/admin_log.html
@@ -11,8 +11,8 @@
 
 	%for cnt,l in enumerate(c.users_log):
 	<tr class="parity${cnt%2}">
-		<td>${l.user.username}</td>
-		<td>${l.repository}</td>
+		<td>${h.link_to(l.user.username,h.url('edit_user', id=l.user.user_id))}</td>
+		<td>${h.link_to(l.repository,h.url('summary_home',repo_name=l.repository))}</td>
 		<td>${l.action}</td>
 		<td>${l.action_date}</td>
 		<td>${l.user_ip}</td>
diff --git a/pylons_app/templates/base/base.html b/pylons_app/templates/base/base.html
--- a/pylons_app/templates/base/base.html
+++ b/pylons_app/templates/base/base.html
@@ -203,6 +203,7 @@
                    <span>${_('Admin')}</span>                 
                    </a>    
 				    <ul>
+				        <li>${h.link_to(_('journal'),h.url('admin_home'),class_='journal')}</li>
 				        <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
 				        <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
 				        <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>