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
2
pylons_app/public/css/style.css
9
pylons_app/templates/admin/admin_log.html
2
2
pylons_app/templates/base/base.html
1
0 comments (0 inline, 0 general)
pylons_app/controllers/admin/users.py
➞
Show inline comments
 
@@ -127,36 +127,38 @@ class UsersController(BaseController):
 
        # Or using helpers:
 
        #    h.form(url('user', id=ID),
 
        #           method='delete')
 
        # url('user', id=ID)
 
        user_model = UserModel()
 
        try:
 
            user_model.delete(id)
 
            h.flash(_('sucessfully deleted user'), category='success')
 
        except DefaultUserException as e:
 
            h.flash(str(e), category='warning')
 
        except Exception:
 
            h.flash(_('An error occured during deletion of user'),
 
                    category='error')
 
        return redirect(url('users'))
 
 
    def show(self, id, format='html'):
 
        """GET /users/id: Show a specific item"""
 
        # url('user', id=ID)
 
 
 
    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__
 
        return htmlfill.render(
 
            render('admin/users/user_edit.html'),
 
            defaults=defaults,
 
            encoding="UTF-8",
 
            force_defaults=False
 
        )
pylons_app/public/css/style.css
➞
Show inline comments
 
@@ -484,48 +484,57 @@ div.options a:hover
 
    right: 200px;
 
    max-height: 275px;
 
    overflow: auto;
 
    overflow-x: hidden;
 
    white-space:nowrap;
 
}
 
 
#header #header-inner #quick li:hover ul ul,
 
#header #header-inner #quick li:hover ul ul ul,
 
#header #header-inner #quick li:hover ul ul ul ul
 
{
 
    display: none;
 
}
 
 
#header #header-inner #quick li:hover ul,
 
#header #header-inner #quick li li:hover ul,
 
#header #header-inner #quick li li li:hover ul,
 
#header #header-inner #quick li li li li:hover ul
 
{
 
    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;
 
    padding:12px 9px 7px 24px;
 
    width:167px;
 
 
}
 
#header #header-inner #quick li ul li a.users,
 
#header #header-inner #quick li ul li a.users:hover
 
{
 
    background: #FFFFFF url("../images/icons/user_edit.png") no-repeat 4px 9px;
 
    margin:0;
 
    padding:12px 9px 7px 24px;
 
    width:167px;
 
}
 
#header #header-inner #quick li ul li a.settings,
 
#header #header-inner #quick li ul li a.settings:hover
 
{
 
    background: #FFFFFF url("../images/icons/cog.png") no-repeat 4px 9px;
 
    margin:0;
 
    padding:12px 9px 7px 24px;
pylons_app/templates/admin/admin_log.html
➞
Show inline comments
 
## -*- coding: utf-8 -*-
 
%if c.users_log:
 
<table>
 
	<tr>
 
		<th class="left">${_('Username')}</th>
 
		<th class="left">${_('Repository')}</th>
 
		<th class="left">${_('Action')}</th>
 
		<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>

			




	
	
	
		
 

			




	
	
	
		
 
<script type="text/javascript">

			




	
	
	
		
 
  var data_div = 'user_log';

			




	
	
	
		
 
  YAHOO.util.Event.onDOMReady(function(){

			




	
	
	
		
 
	YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){

			




	
	
	
		
 
			YAHOO.util.Dom.setStyle('shortlog_data','opacity','0.3');});});

			




	
	
	
		
 
</script>

			




	
	
	
		
 
		

			




	
	
	
		
 
		

			




	
	
	
		
 
<div class="pagination-wh pagination-left">

			




	
	
	
		
 
${c.users_log.pager('$link_previous ~2~ $link_next',

			




	
	
	
		
 
onclick="""YAHOO.util.Connect.asyncRequest('GET','$partial_url',{

			




	
	
	
		
 
success:function(o){YAHOO.util.Dom.get(data_div).innerHTML=o.responseText;

			




	
	
	
		
 
YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){

			




	
	
	
		
 
		YAHOO.util.Dom.setStyle(data_div,'opacity','0.3');});		

			




	
	
	
		
 
YAHOO.util.Dom.setStyle(data_div,'opacity','1');}},null); return false;""")}

			




	
	
	
		
 
</div>

			




	
	
	
		
 
%else: 

			




        

    


    
    

    

        

                

                    pylons_app/templates/base/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -182,48 +182,49 @@

			




	
	
	
		
 
                        <img src="/images/icons/home_16.png" alt="${_('Home')}" />

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 
                    <span>${_('Home')}</span>                 

			




	
	
	
		
 
                    </a>        

			




	
	
	
		
 
                </li>

			




	
	
	
		
 
                

			




	
	
	
		
 
                <li>

			




	
	
	
		
 
                    <a title="${_('Search')}"  href="${h.url('search')}">

			




	
	
	
		
 
                    <span class="icon">

			




	
	
	
		
 
                        <img src="/images/icons/search_16.png" alt="${_('Search')}" />

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 
                    <span>${_('Search')}</span>                 

			




	
	
	
		
 
                    </a>        

			




	
	
	
		
 
                </li>

			




	
	
	
		
 
                

			




	
	
	
		
 
				%if h.HasPermissionAll('hg.admin')('access admin main page'):

			




	
	
	
		
 
                <li ${is_current('admin')}>

			




	
	
	
		
 
                   <a title="${_('Admin')}" href="${h.url('admin_home')}">

			




	
	
	
		
 
                   <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>

			




	
	
	
		
 
				%endif

			




	
	
	
		
 
				

			




	
	
	
		
 
			</ul>

			




	
	
	
		
 
		%endif    

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="css()">

			




	
	
	
		
 
<link rel="stylesheet" type="text/css" href="/css/reset.css" />

			




	
	
	
		
 
<link rel="stylesheet" type="text/css" href="/css/style.css" media="screen" />

			




	
	
	
		
 
<link id="color" rel="stylesheet" type="text/css" href="/css/colors/blue.css" />

			




	
	
	
		
 
<link rel="stylesheet" type="text/css" href="/css/pygments.css"  />

			




	
	
	
		
 
<link rel="stylesheet" type="text/css" href="/css/diff.css"  />

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="js()">

			




	
	
	
		
 
##<script type="text/javascript" src="/js/yui/utilities/utilities.js"></script>

			




	
	
	
		
 
##<script type="text/javascript" src="/js/yui/container/container.js"></script>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.