##// END OF EJS Templates
added journal icon and made active links in journal, fixed edit user bug when given wrong id
marcink -
r476:8ba65e4c celery
parent child Browse files
Show More
@@ -148,6 +148,8 b' class UsersController(BaseController):'
148 """GET /users/id/edit: Form to edit an existing item"""
148 """GET /users/id/edit: Form to edit an existing item"""
149 # url('edit_user', id=ID)
149 # url('edit_user', id=ID)
150 c.user = self.sa.query(User).get(id)
150 c.user = self.sa.query(User).get(id)
151 if not c.user:
152 return redirect(url('users'))
151 if c.user.username == 'default':
153 if c.user.username == 'default':
152 h.flash(_("You can't edit this user since it's"
154 h.flash(_("You can't edit this user since it's"
153 " crucial for entire application"), category='warning')
155 " crucial for entire application"), category='warning')
@@ -505,6 +505,15 b' div.options a:hover'
505
505
506
506
507 /*ICONS*/
507 /*ICONS*/
508 #header #header-inner #quick li ul li a.journal,
509 #header #header-inner #quick li ul li a.journal:hover
510 {
511 background:url("../images/icons/book.png") no-repeat scroll 4px 9px #FFFFFF;
512 margin:0;
513 padding:12px 9px 7px 24px;
514 width:167px;
515
516 }
508
517
509 #header #header-inner #quick li ul li a.repos,
518 #header #header-inner #quick li ul li a.repos,
510 #header #header-inner #quick li ul li a.repos:hover
519 #header #header-inner #quick li ul li a.repos:hover
@@ -11,8 +11,8 b''
11
11
12 %for cnt,l in enumerate(c.users_log):
12 %for cnt,l in enumerate(c.users_log):
13 <tr class="parity${cnt%2}">
13 <tr class="parity${cnt%2}">
14 <td>${l.user.username}</td>
14 <td>${h.link_to(l.user.username,h.url('edit_user', id=l.user.user_id))}</td>
15 <td>${l.repository}</td>
15 <td>${h.link_to(l.repository,h.url('summary_home',repo_name=l.repository))}</td>
16 <td>${l.action}</td>
16 <td>${l.action}</td>
17 <td>${l.action_date}</td>
17 <td>${l.action_date}</td>
18 <td>${l.user_ip}</td>
18 <td>${l.user_ip}</td>
@@ -203,6 +203,7 b''
203 <span>${_('Admin')}</span>
203 <span>${_('Admin')}</span>
204 </a>
204 </a>
205 <ul>
205 <ul>
206 <li>${h.link_to(_('journal'),h.url('admin_home'),class_='journal')}</li>
206 <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
207 <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
207 <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
208 <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
208 <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
209 <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
General Comments 0
You need to be logged in to leave comments. Login now