# HG changeset patch # User Mads Kiilerich # Date 2016-12-04 22:53:36 # Node ID 50e9a5b61c5987f76dfebe949b12d044e9a21d9d # Parent 951004d57e3fa53c777f6cb27884d1fb8f207883 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. diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css --- a/kallithea/public/css/style.css +++ b/kallithea/public/css/style.css @@ -3270,26 +3270,25 @@ div#legend_data, div#legend_container, d 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; } diff --git a/kallithea/templates/admin/auth/auth_settings.html b/kallithea/templates/admin/auth/auth_settings.html --- a/kallithea/templates/admin/auth/auth_settings.html +++ b/kallithea/templates/admin/auth/auth_settings.html @@ -83,7 +83,7 @@ %elif setting["type"] == "select":
-
+
${h.select(fullsetting,setting['values'][0],setting['values'],class_='form-control')} ${setting["description"]}
diff --git a/kallithea/templates/admin/permissions/permissions_globals.html b/kallithea/templates/admin/permissions/permissions_globals.html --- a/kallithea/templates/admin/permissions/permissions_globals.html +++ b/kallithea/templates/admin/permissions/permissions_globals.html @@ -13,7 +13,7 @@ ${h.form(url('admin_permissions'), metho
-
+
${h.select('default_repo_perm','',c.repo_perms_choices)} ${h.checkbox('overwrite_default_repo','true')}
-
+
${h.select('default_group_perm','',c.group_perms_choices)} ${h.checkbox('overwrite_default_group','true')}
-
+
${h.select('default_user_group_perm','',c.user_group_perms_choices)} ${h.checkbox('overwrite_default_user_group','true')}
-
+
${h.select('default_repo_create','',c.repo_create_choices)} ${_('Enable this to allow non-admins to create repositories at the top level.')} ${_('Note: This will also give all users API access to create repositories everywhere. That might change in future versions.')} @@ -57,34 +57,34 @@ ${h.form(url('admin_permissions'), metho
-
+
${h.select('create_on_write','',c.repo_create_on_write_choices)} ${_('With this, write permission to a repository group allows creating repositories inside that group. Without this, group write permissions mean nothing.')}
-
+
${h.select('default_user_group_create','',c.user_group_create_choices)} ${_('Enable this to allow non-admins to create user groups.')}
-
+
${h.select('default_fork','',c.fork_choices)} ${_('Enable this to allow non-admins to fork repositories.')}
-
+
${h.select('default_register','',c.register_choices)}
-
+
${h.select('default_extern_activate','',c.extern_activate_choices)}
diff --git a/kallithea/templates/admin/user_groups/user_group_edit_settings.html b/kallithea/templates/admin/user_groups/user_group_edit_settings.html --- a/kallithea/templates/admin/user_groups/user_group_edit_settings.html +++ b/kallithea/templates/admin/user_groups/user_group_edit_settings.html @@ -23,7 +23,7 @@ ${h.form(url('update_users_group', id=c.
-
+
diff --git a/kallithea/templates/search/search.html b/kallithea/templates/search/search.html --- a/kallithea/templates/search/search.html +++ b/kallithea/templates/search/search.html @@ -54,7 +54,7 @@ ${self.repo_context_bar('options')}
-
+
${h.select('type',c.cur_type,[('content',_('File contents')), ('commit',_('Commit messages')), ('path',_('File names')),