Changeset - 50e9a5b61c59
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
Mads Kiilerich - 9 years ago 2016-12-04 22:53:36
mads@kiilerich.com
style: drop 'select' class inside 'form-group'

Temporarily, just apply styling to div inside form-group. Also, 'radios' is gone.

Based on work by Dominik Ruf.
5 files changed with 16 insertions and 17 deletions:
kallithea/public/css/style.css
4
5
kallithea/templates/admin/auth/auth_settings.html
1
1
kallithea/templates/admin/permissions/permissions_globals.html
9
9
kallithea/templates/admin/user_groups/user_group_edit_settings.html
1
1
kallithea/templates/search/search.html
1
1
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -3249,68 +3249,67 @@ div#legend_data, div#legend_container, d
 
    margin: 0;
 
    padding: 0;
 
}
 

			




	
	
	
		
 
#content div.panel div.form div.form-horizontal div.form-group > div input.error,

			




	
	
	
		
 
#login div.form div.form-horizontal div.form-group > div input.error,

			




	
	
	
		
 
#register div.form div.form-horizontal div.form-group > div input.error {

			




	
	
	
		
 
    background: #FBE3E4;

			




	
	
	
		
 
    border-top: 1px solid #e1b2b3;

			




	
	
	
		
 
    border-left: 1px solid #e1b2b3;

			




	
	
	
		
 
    border-right: 1px solid #FBC2C4;

			




	
	
	
		
 
    border-bottom: 1px solid #FBC2C4;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.panel div.form div.form-horizontal div.form-group > div input.success,

			




	
	
	
		
 
#login div.form div.form-horizontal div.form-group > div input.success,

			




	
	
	
		
 
#register div.form div.form-horizontal div.form-group > div input.success {

			




	
	
	
		
 
    background: #E6EFC2;

			




	
	
	
		
 
    border-top: 1px solid #cebb98;

			




	
	
	
		
 
    border-left: 1px solid #cebb98;

			




	
	
	
		
 
    border-right: 1px solid #c6d880;

			




	
	
	
		
 
    border-bottom: 1px solid #c6d880;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.panel div.form div.form-horizontal div.form-group div.select select,

			




	
	
	
		
 
#content div.panel div.form div.form-horizontal div.form-group > div select,

			




	
	
	
		
 
#content div.panel table th.selected input,

			




	
	
	
		
 
#content div.panel table td.selected input {

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.panel div.form div.form-horizontal div.form-group div.select,

			




	
	
	
		
 
#content div.panel div.form div.form-horizontal div.form-group > div {

			




	
	
	
		
 
    margin: 10px 20px 10px 200px;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.panel div.form div.form-horizontal div.form-group div.select a:hover,

			




	
	
	
		
 
#content div.panel div.form div.form-horizontal div.form-group div.select a.ui-selectmenu:hover,

			




	
	
	
		
 
#content div.panel div.form div.form-horizontal div.form-group > div a:hover,

			




	
	
	
		
 
#content div.panel div.form div.form-horizontal div.form-group > div a.ui-selectmenu:hover,

			




	
	
	
		
 
#content div.panel div.action a:hover {

			




	
	
	
		
 
    color: #000;

			




	
	
	
		
 
    text-decoration: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.panel div.form div.form-horizontal div.form-group div.select a.ui-selectmenu-focus,

			




	
	
	
		
 
#content div.panel div.form div.form-horizontal div.form-group > div a.ui-selectmenu-focus,

			




	
	
	
		
 
#content div.panel div.action a.ui-selectmenu-focus {

			




	
	
	
		
 
    border: 1px solid #666;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.panel div.form div.form-horizontal div.form-group > div div.checkbox {

			




	
	
	
		
 
    clear: both;

			




	
	
	
		
 
    min-height: 12px;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
    margin: 14px 0 10px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.panel div.form div.form-horizontal div.form-group > div div.checkbox input {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    margin: -4px 5px 0px 0px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.form div.form-horizontal div.form-group div.button input,

			




	
	
	
		
 
#content div.panel div.form div.fields div.buttons input

			




	
	
	
		
 
#content div.panel div.form div.form-horizontal div.buttons input

			




	
	
	
		
 
div.form div.fields div.buttons input,

			




	
	
	
		
 
div.form div.form-horizontal div.buttons input,

			




	
	
	
		
 
#content div.panel div.action div.button input {

			




	
	
	
		
 
    font-size: 11px;

			




	
	
	
		
 
    font-weight: 700;

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/auth/auth_settings.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -62,49 +62,49 @@

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.password(fullsetting,class_='form-control')}

			




	
	
	
		
 
                    <span class="help-block">${setting["description"]}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %elif setting["type"] in ["string", "int"]:

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="${fullsetting}">${_(displayname)}</label>

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.text(fullsetting,class_='form-control')}

			




	
	
	
		
 
                    <span class="help-block">${setting["description"]}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %elif setting["type"] == "bool":

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="${fullsetting}">${_(displayname)}</label>

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.checkbox(fullsetting,True)}

			




	
	
	
		
 
                    <span class="help-block">${setting["description"]}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %elif setting["type"] == "select":

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="${fullsetting}">${_(displayname)}</label>

			




	
	
	
		
 
                <div class="select">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.select(fullsetting,setting['values'][0],setting['values'],class_='form-control')}

			




	
	
	
		
 
                    <span class="help-block">${setting["description"]}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %else:

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="${fullsetting}">${_(displayname)}</label>

			




	
	
	
		
 
                <div>This field is of type ${setting['type']}, which cannot be displayed. Must be one of [string|int|bool|select].</div>

			




	
	
	
		
 
                <span class="help-block">${setting["description"]}</span>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        %endfor

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
        <div class="form-horizontal">

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <div class="buttons">

			




	
	
	
		
 
                    ${h.submit('save',_('Save'),class_="btn btn-default")}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
	
		
 
</div>

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/permissions/permissions_globals.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
${h.form(url('admin_permissions'), method='post')}

			




	
	
	
		
 
    <div class="form">

			




	
	
	
		
 
        <!-- fields -->

			




	
	
	
		
 
        <div class="form-horizontal">

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="anonymous">${_('Anonymous access')}:</label>

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    <div class="checkbox">

			




	
	
	
		
 
                        ${h.checkbox('anonymous',True)}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                     <span class="help-block">${h.literal(_('Allow access to Kallithea without needing to log in. Anonymous users use %s user permissions.' % (h.link_to('*default*',h.url('admin_permissions_perms')))))}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="default_repo_perm">${_('Repository')}:</label>

			




	
	
	
		
 
                <div class="select">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.select('default_repo_perm','',c.repo_perms_choices)}

			




	
	
	
		
 
                    ${h.checkbox('overwrite_default_repo','true')}

			




	
	
	
		
 
                    <label for="overwrite_default_repo">

			




	
	
	
		
 
                    <span data-toggle="tooltip"

			




	
	
	
		
 
                        title="${_('All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost')}">

			




	
	
	
		
 
                    ${_('Apply to all existing repositories')}</span> </label>

			




	
	
	
		
 
                    <span class="help-block">${_('Permissions for the Default user on new repositories.')}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="default_group_perm">${_('Repository group')}:</label>

			




	
	
	
		
 
                <div class="select">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.select('default_group_perm','',c.group_perms_choices)}

			




	
	
	
		
 
                    ${h.checkbox('overwrite_default_group','true')}

			




	
	
	
		
 
                    <label for="overwrite_default_group">

			




	
	
	
		
 
                    <span data-toggle="tooltip"

			




	
	
	
		
 
                        title="${_('All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost')}">

			




	
	
	
		
 
                    ${_('Apply to all existing repository groups')}</span> </label>

			




	
	
	
		
 
                    <span class="help-block">${_('Permissions for the Default user on new repository groups.')}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="default_user_group_perm">${_('User group')}:</label>

			




	
	
	
		
 
                <div class="select">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.select('default_user_group_perm','',c.user_group_perms_choices)}

			




	
	
	
		
 
                    ${h.checkbox('overwrite_default_user_group','true')}

			




	
	
	
		
 
                    <label for="overwrite_default_user_group">

			




	
	
	
		
 
                    <span data-toggle="tooltip"

			




	
	
	
		
 
                        title="${_('All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost')}">

			




	
	
	
		
 
                    ${_('Apply to all existing user groups')}</span></label>

			




	
	
	
		
 
                    <span class="help-block">${_('Permissions for the Default user on new user groups.')}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="default_repo_create">${_('Top level repository creation')}:</label>

			




	
	
	
		
 
                <div class="select">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.select('default_repo_create','',c.repo_create_choices)}

			




	
	
	
		
 
                    <span class="help-block">${_('Enable this to allow non-admins to create repositories at the top level.')}</span>

			




	
	
	
		
 
                    <span class="help-block">${_('Note: This will also give all users API access to create repositories everywhere. That might change in future versions.')}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="create_on_write">${_('Repository creation with group write access')}:</label>

			




	
	
	
		
 
                <div class="select">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.select('create_on_write','',c.repo_create_on_write_choices)}

			




	
	
	
		
 
                    <span class="help-block">${_('With this, write permission to a repository group allows creating repositories inside that group. Without this, group write permissions mean nothing.')}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="default_user_group_create">${_('User group creation')}:</label>

			




	
	
	
		
 
                <div class="select">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.select('default_user_group_create','',c.user_group_create_choices)}

			




	
	
	
		
 
                    <span class="help-block">${_('Enable this to allow non-admins to create user groups.')}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="default_fork">${_('Repository forking')}:</label>

			




	
	
	
		
 
                <div class="select">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.select('default_fork','',c.fork_choices)}

			




	
	
	
		
 
                    <span class="help-block">${_('Enable this to allow non-admins to fork repositories.')}</span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="default_register">${_('Registration')}:</label>

			




	
	
	
		
 
                <div class="select">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.select('default_register','',c.register_choices)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="default_extern_activate">${_('External auth account activation')}:</label>

			




	
	
	
		
 
                <div class="select">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.select('default_extern_activate','',c.extern_activate_choices)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <div class="buttons">

			




	
	
	
		
 
                    ${h.submit('save',_('Save'),class_="btn btn-default")}

			




	
	
	
		
 
                    ${h.reset('reset',_('Reset'),class_="btn btn-default")}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
${h.end_form()}

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/user_groups/user_group_edit_settings.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2,49 +2,49 @@ ${h.form(url('update_users_group', id=c.

			




	
	
	
		
 
    <div class="form">

			




	
	
	
		
 
        <!-- fields -->

			




	
	
	
		
 
            <div class="form-horizontal">

			




	
	
	
		
 
                <div class="form-group">

			




	
	
	
		
 
                    <label class="control-label" for="users_group_name">${_('Group name')}:</label>

			




	
	
	
		
 
                    <div>

			




	
	
	
		
 
                        ${h.text('users_group_name',class_='form-control')}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="form-group">

			




	
	
	
		
 
                    <label class="control-label" for="user_group_description">${_('Description')}:</label>

			




	
	
	
		
 
                    <div class="textarea-small editor">

			




	
	
	
		
 
                        ${h.textarea('user_group_description')}

			




	
	
	
		
 
                        <span class="help-block">${_('Short, optional description for this user group.')}</span>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="form-group">

			




	
	
	
		
 
                    <label class="control-label" for="users_group_active">${_('Active')}:</label>

			




	
	
	
		
 
                    <div>

			




	
	
	
		
 
                        ${h.checkbox('users_group_active',value=True)}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="form-group">

			




	
	
	
		
 
                    <label class="control-label">${_('Members')}:</label>

			




	
	
	
		
 
                    <div class="select">

			




	
	
	
		
 
                    <div>

			




	
	
	
		
 
                        <table class="table">

			




	
	
	
		
 
                                <tr>

			




	
	
	
		
 
                                    <td>

			




	
	
	
		
 
                                        <div>

			




	
	
	
		
 
                                            <div style="float:left">

			




	
	
	
		
 
                                                <div class="text" style="padding: 0px 0px 6px;">${_('Chosen group members')}</div>

			




	
	
	
		
 
                                                ${h.select('users_group_members',[],c.group_members,multiple=True,size=8,style="min-width:210px")}

			




	
	
	
		
 
                                            </div>

			




	
	
	
		
 
                                            <div style="float:left;width:20px;padding-top:50px">

			




	
	
	
		
 
                                                <i style="cursor:pointer; font-size: 16px" id="add_element" class="icon-left-open" title="Choose selected available"></i>

			




	
	
	
		
 
                                                <div style="height:50px"></div>

			




	
	
	
		
 
                                                <i style="cursor:pointer; font-size: 16px" id="remove_element" class="icon-right-open" title="Remove selected chosen"></i>

			




	
	
	
		
 
                                            </div>

			




	
	
	
		
 
                                            <div style="float:left">

			




	
	
	
		
 
                                                 <div class="text" style="padding: 0px 0px 6px;">${_('Available members')}</div>

			




	
	
	
		
 
                                                 ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px")}

			




	
	
	
		
 
                                            </div>

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                    </td>

			




	
	
	
		
 
                                </tr>

			




	
	
	
		
 
                        </table>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="form-group">

			




        

    


    
    

    

        

                

                    kallithea/templates/search/search.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -33,49 +33,49 @@

			




	
	
	
		
 
${self.repo_context_bar('options')}

			




	
	
	
		
 
%endif

			




	
	
	
		
 
<div class="panel panel-primary">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="panel-heading">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <!-- end box / title -->

			




	
	
	
		
 
    %if c.repo_name:

			




	
	
	
		
 
        ${h.form(h.url('search_repo',repo_name=c.repo_name),method='get')}

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
        ${h.form(h.url('search'),method='get')}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    <div class="form">

			




	
	
	
		
 
        <div class="form-horizontal">

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="q">${_('Search term')}:</label>

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.text('q',c.cur_query,class_='form-control')}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label for="type">${_('Search in')}:</label>

			




	
	
	
		
 
                <div class="select">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.select('type',c.cur_type,[('content',_('File contents')),

			




	
	
	
		
 
                        ('commit',_('Commit messages')),

			




	
	
	
		
 
                        ('path',_('File names')),

			




	
	
	
		
 
                        ##('repository',_('Repository names')),

			




	
	
	
		
 
                        ])}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <div class="buttons">

			




	
	
	
		
 
                    <input type="submit" value="${_('Search')}" class="btn btn-default"/>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                ## <label>${_('Status')}:</label>

			




	
	
	
		
 
                <div style="font-weight: bold;clear:both">${c.runtime}</div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
	
		
 
    <div class="search">

			




	
	
	
		
 
    %if c.cur_type == 'content':

			




	
	
	
		
 
        <%include file='search_content.html'/>

			




        

    



    


    



    



      

      





    
    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.