kallithea Changeset - 8ba65e4c4e4c

Changeset - 8ba65e4c4e4c

Parent rev.

Child rev.

[Not reviewed]

celery

0 4 0

Marcin Kuzminski - 15 years ago 2010-09-13 13:02:20
marcin@python-works.com

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

4 files changed with 14 insertions and 2 deletions:

pylons_app/controllers/admin/users.py

pylons_app/public/css/style.css

pylons_app/templates/admin/admin_log.html

pylons_app/templates/base/base.html

0 comments (0 inline, 0 general)

pylons_app/controllers/admin/users.py

➞

Show inline comments

@@ @@ -145,12 +145,14 @@ class UsersController(BaseController): @@
     def edit(self, id, format='html'):
         """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')
             return redirect(url('users'))
         defaults = c.user.__dict__

pylons_app/public/css/style.css

➞

Show inline comments

@@ @@ -502,12 +502,21 @@ div.options a:hover @@
+{
     display: block;
+}
 /*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
+{
     background:url("../images/icons/folder_edit.png") no-repeat scroll 4px 9px #FFFFFF;
     margin:0;

pylons_app/templates/admin/admin_log.html

➞

Show inline comments

@@ @@ -8,14 +8,14 @@ @@
 		<th class="left">${_('Date')}</th>
 		<th class="left">${_('From IP')}</th>
 	</tr>
 	%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>
 	</tr>
 	%endfor
 </table>

pylons_app/templates/base/base.html

➞

Show inline comments

@@ @@ -200,12 +200,13 @@ @@
                    <span class="icon">
                        <img src="/images/icons/cog_edit.png" alt="${_('Admin')}" />
                    </span>
                    <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>
 				        <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>
 				    </ul>
                 </li>

0 comments (0 inline, 0 general)