Changeset - 50e9a5b61c59
[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:
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
Show inline comments
 
@@ -3267,32 +3267,31 @@ div#legend_data, div#legend_container, d
 
    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;
kallithea/templates/admin/auth/auth_settings.html
Show inline comments
 
@@ -80,13 +80,13 @@
 
                    <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">
kallithea/templates/admin/permissions/permissions_globals.html
Show inline comments
 
@@ -10,84 +10,84 @@ ${h.form(url('admin_permissions'), metho
 
                    </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")}
kallithea/templates/admin/user_groups/user_group_edit_settings.html
Show inline comments
 
@@ -20,13 +20,13 @@ ${h.form(url('update_users_group', id=c.
 
                    <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>
kallithea/templates/search/search.html
Show inline comments
 
@@ -51,13 +51,13 @@ ${self.repo_context_bar('options')}
 
                    ${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>
0 comments (0 inline, 0 general)