Changeset - fe879761c235
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
Mads Kiilerich - 9 years ago 2016-12-24 17:26:48
mads@kiilerich.com
style: introduce text-nowrap and avoid using direct white-space: nowrap

Based on work by Dominik Ruf.
5 files changed with 15 insertions and 14 deletions:
kallithea/public/css/style.css
5
4
kallithea/templates/admin/repo_groups/repo_group_edit_perms.html
3
3
kallithea/templates/admin/repos/repo_edit_permissions.html
2
2
kallithea/templates/admin/user_groups/user_group_edit_perms.html
3
3
kallithea/templates/data_table/_dt_elements.html
2
2
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -979,24 +979,25 @@ input.disabled {
 
    background: #f6f6f6;
 
    border-color: #666;
 
}
 

			




	
	
	
		
 
.reviewer_ac {

			




	
	
	
		
 
    padding: 10px

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.form div.form-horizontal div.form-group div.button {

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 0 0 0 8px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.panel table.noborder {

			




	
	
	
		
 
    border: 1px solid transparent;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.panel table {

			




	
	
	
		
 
    width: 100%;

			




	
	
	
		
 
    border-collapse: separate;

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
    border: 1px solid #eee;

			




	
	
	
		
 
    border-radius: 4px;

			




	
	
	
		
 
}

			




	
	
		
 
@@ -2902,28 +2903,24 @@ table.code-browser i[class^='icon-'] {

			




	
	
	
		
 

			




	
	
	
		
 
div#legend_data {

			




	
	
	
		
 
    padding-left: 10px;

			




	
	
	
		
 
}

			




	
	
	
		
 
div#legend_container table {

			




	
	
	
		
 
    border: none !important;

			




	
	
	
		
 
}

			




	
	
	
		
 
div#legend_container table,

			




	
	
	
		
 
div#legend_choices table {

			




	
	
	
		
 
    width: auto !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
table#permissions_manage {

			




	
	
	
		
 
    width: 0 !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
table#permissions_manage span.private_repo_msg {

			




	
	
	
		
 
    font-size: 0.8em;

			




	
	
	
		
 
    opacity: 0.6;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
table#permissions_manage td.private_repo_msg {

			




	
	
	
		
 
    font-size: 0.8em;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
table#permissions_manage tr#add_perm_input td {

			




	
	
	
		
 
    vertical-align: middle;

			




	
	
	
		
 
}

			




	
	
		
 
@@ -4475,12 +4472,16 @@ body table.dataTable thead .sorting_desc

			




	
	
	
		
 

			




	
	
	
		
 
.text-muted {

			




	
	
	
		
 
    color: #777777;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.grid_edit a {

			




	
	
	
		
 
    text-decoration: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.changes_txt {

			




	
	
	
		
 
    clear: both;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.text-nowrap {

			




	
	
	
		
 
    white-space: nowrap;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/repo_groups/repo_group_edit_perms.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -11,61 +11,61 @@ ${h.form(url('edit_repo_group_perms', gr

			




	
	
	
		
 
                    <td>${_('User/User Group')}</td>

			




	
	
	
		
 
                    <td></td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
                ## USERS

			




	
	
	
		
 
                %for r2p in c.repo_group.repo_group_to_perm:

			




	
	
	
		
 
                    ##forbid revoking permission from yourself, except if you're an super admin

			




	
	
	
		
 
                    <tr id="id${id(r2p.user.username)}">

			




	
	
	
		
 
                      %if c.authuser.user_id != r2p.user.user_id or c.authuser.is_admin:

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'group.none')}</td>

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'group.read')}</td>

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'group.write')}</td>

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'group.admin')}</td>

			




	
	
	
		
 
                        <td style="white-space: nowrap;">

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)}

			




	
	
	
		
 
                            %if h.HasPermissionAny('hg.admin')() and r2p.user.username != 'default':

			




	
	
	
		
 
                             <a href="${h.url('edit_user',id=r2p.user.user_id)}">${r2p.user.username}</a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                             ${r2p.user.username if r2p.user.username != 'default' else _('Default')}

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                          %if r2p.user.username !='default':

			




	
	
	
		
 
                            <span style="color:#da4f49" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')">

			




	
	
	
		
 
                             <i class="icon-minus-circled"></i> ${_('Revoke')}

			




	
	
	
		
 
                            </span>

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                      %else:

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'group.none', disabled="disabled")}</td>

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'group.read', disabled="disabled")}</td>

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'group.write', disabled="disabled")}</td>

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'group.admin', disabled="disabled")}</td>

			




	
	
	
		
 
                        <td style="white-space: nowrap;">

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)}

			




	
	
	
		
 
                            ${r2p.user.username if r2p.user.username != 'default' else _('Default')}

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td><i class="icon-user"></i> ${_('Admin')}</td>

			




	
	
	
		
 
                      %endif

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 

			




	
	
	
		
 
                ## USER GROUPS

			




	
	
	
		
 
                %for g2p in c.repo_group.users_group_to_perm:

			




	
	
	
		
 
                    <tr id="id${id(g2p.users_group.users_group_name)}">

			




	
	
	
		
 
                        <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'group.none')}</td>

			




	
	
	
		
 
                        <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'group.read')}</td>

			




	
	
	
		
 
                        <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'group.write')}</td>

			




	
	
	
		
 
                        <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'group.admin')}</td>

			




	
	
	
		
 
                        <td style="white-space: nowrap;">

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            <i class="icon-users"></i>

			




	
	
	
		
 
                            %if h.HasPermissionAny('hg.admin')():

			




	
	
	
		
 
                             <a href="${h.url('edit_users_group',id=g2p.users_group.users_group_id)}">

			




	
	
	
		
 
                                 ${g2p.users_group.users_group_name}

			




	
	
	
		
 
                             </a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                             ${g2p.users_group.users_group_name}

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            <span style="color:#da4f49" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${g2p.users_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.users_group.users_group_name)}', '${g2p.users_group.users_group_name}')">

			




	
	
	
		
 
                            <i class="icon-minus-circled"></i> ${_('Revoke')}

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/repos/repo_edit_permissions.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -20,25 +20,25 @@ ${h.form(url('edit_repo_perms_update', r

			




	
	
	
		
 
                                <span class="private_repo_msg">

			




	
	
	
		
 
                                ${_('Private Repository')}

			




	
	
	
		
 
                                </span>

			




	
	
	
		
 
                            </td>

			




	
	
	
		
 
                            <td class="private_repo_msg"><i class="icon-user"></i> ${_('Default')}</td>

			




	
	
	
		
 
                        </tr>

			




	
	
	
		
 
                    %else:

			




	
	
	
		
 
                    <tr id="id${id(r2p.user.username)}">

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'repository.none')}</td>

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'repository.read')}</td>

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'repository.write')}</td>

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'repository.admin')}</td>

			




	
	
	
		
 
                        <td style="white-space: nowrap;">

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            ${h.gravatar(r2p.user.email, size=14)}

			




	
	
	
		
 
                            %if h.HasPermissionAny('hg.admin')() and r2p.user.username != 'default':

			




	
	
	
		
 
                             <a href="${h.url('edit_user',id=r2p.user.user_id)}">${r2p.user.username}</a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                             ${r2p.user.username if r2p.user.username != 'default' else _('Default')}

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                          %if r2p.user.username !='default':

			




	
	
	
		
 
                            <span style="color:#da4f49" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')">

			




	
	
	
		
 
                            <i class="icon-minus-circled"></i> ${_('Revoke')}

			




	
	
	
		
 
                            </span>

			




	
	
		
 
@@ -46,25 +46,25 @@ ${h.form(url('edit_repo_perms_update', r

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 

			




	
	
	
		
 
                ## USER GROUPS

			




	
	
	
		
 
                %for g2p in sorted(c.repo_info.users_group_to_perm, key=lambda x:x.users_group.users_group_name):

			




	
	
	
		
 
                    <tr id="id${id(g2p.users_group.users_group_name)}">

			




	
	
	
		
 
                        <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.none')}</td>

			




	
	
	
		
 
                        <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.read')}</td>

			




	
	
	
		
 
                        <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.write')}</td>

			




	
	
	
		
 
                        <td>${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.admin')}</td>

			




	
	
	
		
 
                        <td style="white-space: nowrap;">

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            <i class="icon-users"></i>

			




	
	
	
		
 
                            %if h.HasPermissionAny('hg.admin')():

			




	
	
	
		
 
                             <a href="${h.url('edit_users_group',id=g2p.users_group.users_group_id)}">${g2p.users_group.users_group_name}</a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                             ${g2p.users_group.users_group_name}

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            <span style="color:#da4f49" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${g2p.users_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.users_group.users_group_name)}', '${g2p.users_group.users_group_name}')">

			




	
	
	
		
 
                            <i class="icon-minus-circled"></i> ${_('Revoke')}

			




	
	
	
		
 
                            </span>

			




	
	
	
		
 
                        </td>

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/user_groups/user_group_edit_perms.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -11,61 +11,61 @@ ${h.form(url('edit_user_group_perms_upda

			




	
	
	
		
 
                    <td>${_('User/User Group')}</td>

			




	
	
	
		
 
                    <td></td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
                ## USERS

			




	
	
	
		
 
                %for r2p in c.user_group.user_user_group_to_perm:

			




	
	
	
		
 
                    ##forbid revoking permission from yourself, except if you're an super admin

			




	
	
	
		
 
                    <tr id="id${id(r2p.user.username)}">

			




	
	
	
		
 
                      %if c.authuser.user_id != r2p.user.user_id or c.authuser.is_admin:

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.none')}</td>

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.read')}</td>

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.write')}</td>

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.admin')}</td>

			




	
	
	
		
 
                        <td style="white-space: nowrap;">

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)}

			




	
	
	
		
 
                            %if h.HasPermissionAny('hg.admin')() and r2p.user.username != 'default':

			




	
	
	
		
 
                             <a href="${h.url('edit_user',id=r2p.user.user_id)}">${r2p.user.username}</a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                             ${r2p.user.username if r2p.user.username != 'default' else _('Default')}

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                          %if r2p.user.username !='default':

			




	
	
	
		
 
                            <span style="color:#da4f49" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')">

			




	
	
	
		
 
                             <i class="icon-minus-circled"></i> ${_('Revoke')}

			




	
	
	
		
 
                            </span>

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                      %else:

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.none', disabled="disabled")}</td>

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.read', disabled="disabled")}</td>

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.write', disabled="disabled")}</td>

			




	
	
	
		
 
                        <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.admin', disabled="disabled")}</td>

			




	
	
	
		
 
                        <td style="white-space: nowrap;">

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)}

			




	
	
	
		
 
                            ${r2p.user.username if r2p.user.username != 'default' else _('Default')}

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td><i class="icon-user"></i> ${_('Admin')}</td>

			




	
	
	
		
 
                      %endif

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 

			




	
	
	
		
 
                ## USER GROUPS

			




	
	
	
		
 
                %for g2p in c.user_group.user_group_user_group_to_perm:

			




	
	
	
		
 
                    <tr id="id${id(g2p.user_group.users_group_name)}">

			




	
	
	
		
 
                        <td>${h.radio('g_perm_%s' % g2p.user_group.users_group_name,'usergroup.none')}</td>

			




	
	
	
		
 
                        <td>${h.radio('g_perm_%s' % g2p.user_group.users_group_name,'usergroup.read')}</td>

			




	
	
	
		
 
                        <td>${h.radio('g_perm_%s' % g2p.user_group.users_group_name,'usergroup.write')}</td>

			




	
	
	
		
 
                        <td>${h.radio('g_perm_%s' % g2p.user_group.users_group_name,'usergroup.admin')}</td>

			




	
	
	
		
 
                        <td style="white-space: nowrap;">

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            <i class="icon-users"></i>

			




	
	
	
		
 
                            %if h.HasPermissionAny('hg.admin')():

			




	
	
	
		
 
                             <a href="${h.url('edit_users_group',id=g2p.user_group.users_group_id)}">

			




	
	
	
		
 
                                 ${g2p.user_group.users_group_name}

			




	
	
	
		
 
                             </a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                             ${g2p.user_group.users_group_name}

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            <span style="color:#da4f49" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${g2p.user_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.user_group.users_group_name)}', '${g2p.user_group.users_group_name}')">

			




	
	
	
		
 
                            <i class="icon-minus-circled"></i> ${_('Revoke')}

			




        

    


    
    

    

        

                

                    kallithea/templates/data_table/_dt_elements.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -138,24 +138,24 @@

			




	
	
	
		
 
        <i class="icon-minus-circled" style="color:#FF4444"></i>

			




	
	
	
		
 
        ${h.submit('remove_%s' % repo_group_name,_('Delete'),class_="btn btn-default btn-xs",

			




	
	
	
		
 
        onclick="return confirm('"+ungettext('Confirm to delete this group: %s with %s repository','Confirm to delete this group: %s with %s repositories',gr_count) % (repo_group_name, gr_count)+"');")}

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
	
		
 
 </div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="user_name(user_id, username)">

			




	
	
	
		
 
    ${h.link_to(username,h.url('edit_user', id=user_id))}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_group_name(repo_group_name, children_groups)">

			




	
	
	
		
 
  <div style="white-space: nowrap">

			




	
	
	
		
 
  <div class="text-nowrap">

			




	
	
	
		
 
  <a href="${h.url('repos_group_home',group_name=repo_group_name)}">

			




	
	
	
		
 
    <i class="icon-folder" title="${_('Repository group')}"></i> ${h.literal(' &raquo; '.join(children_groups))}</a>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="user_group_name(user_group_id, user_group_name)">

			




	
	
	
		
 
  <div style="white-space: nowrap">

			




	
	
	
		
 
  <div class="text-nowrap">

			




	
	
	
		
 
  <a href="${h.url('edit_users_group', id=user_group_id)}">

			




	
	
	
		
 
    <i class="icon-users" title="${_('User group')}"></i> ${user_group_name}</a>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    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.