# HG changeset patch # User Mads Kiilerich # Date 1480888416 -3600 # Node ID 951004d57e3fa53c777f6cb27884d1fb8f207883 # Parent dd42c2ad28d73096626d66ae30f5ed1cf2059129 style: drop 'checkboxes' class inside 'form-group' Temporarily, just apply styling to div inside form-group. Also, 'radios' is gone. Based on work by Dominik Ruf. diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/public/css/style.css --- a/kallithea/public/css/style.css Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/public/css/style.css Sun Dec 04 22:53:36 2016 +0100 @@ -3277,8 +3277,7 @@ } #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.checkboxes, -#content div.panel div.form div.form-horizontal div.form-group div.radios { +#content div.panel div.form div.form-horizontal div.form-group > div { margin: 10px 20px 10px 200px; padding: 0; } @@ -3295,28 +3294,18 @@ border: 1px solid #666; } -#content div.panel div.form div.form-horizontal div.form-group div.checkboxes div.checkbox, -#content div.panel div.form div.form-horizontal div.form-group div.radios div.radio { +#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.checkboxes div.checkbox input, -#content div.panel div.form div.form-horizontal div.form-group div.radios div.radio input { +#content div.panel div.form div.form-horizontal div.form-group > div div.checkbox input { float: left; margin: -4px 5px 0px 0px; } -#content div.panel div.form div.form-horizontal div.form-group div.checkboxes div.checkbox label, -#content div.panel div.form div.form-horizontal div.form-group div.radios div.radio label { - height: 1%; - display: block; - float: left; - margin: 2px 0 0 4px; -} - 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 diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/admin/auth/auth_settings.html --- a/kallithea/templates/admin/auth/auth_settings.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/auth/auth_settings.html Sun Dec 04 22:53:36 2016 +0100 @@ -75,8 +75,8 @@ %elif setting["type"] == "bool":
-
-
${h.checkbox(fullsetting,True)}
+
+ ${h.checkbox(fullsetting,True)} ${setting["description"]}
diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/admin/defaults/defaults.html --- a/kallithea/templates/admin/defaults/defaults.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/defaults/defaults.html Sun Dec 04 22:53:36 2016 +0100 @@ -37,7 +37,7 @@
-
+
${h.checkbox('default_repo_private',value="True")} ${_('Private repositories are only visible to people explicitly added as collaborators.')}
@@ -45,7 +45,7 @@
-
+
${h.checkbox('default_repo_enable_statistics',value="True")} ${_('Enable statistics window on summary page.')}
@@ -53,7 +53,7 @@
-
+
${h.checkbox('default_repo_enable_downloads',value="True")} ${_('Enable download menu on summary page.')}
@@ -61,7 +61,7 @@
-
+
${h.checkbox('default_repo_enable_locking',value="True")} ${_('Enable lock-by-pulling on repository.')}
diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/admin/permissions/permissions_globals.html --- a/kallithea/templates/admin/permissions/permissions_globals.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/permissions/permissions_globals.html Sun Dec 04 22:53:36 2016 +0100 @@ -4,7 +4,7 @@
-
+
${h.checkbox('anonymous',True)}
diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/admin/repo_groups/repo_group_add.html --- a/kallithea/templates/admin/repo_groups/repo_group_add.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_group_add.html Sun Dec 04 22:53:36 2016 +0100 @@ -51,7 +51,7 @@
-
+
${h.checkbox('group_copy_permissions',value="True")} ${_('Copy permission set from parent repository group.')}
diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/admin/repo_groups/repo_group_edit_settings.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Sun Dec 04 22:53:36 2016 +0100 @@ -26,7 +26,7 @@
-
+
${h.checkbox('enable_locking',value="True")} ${_('Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside')}
diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/admin/repos/repo_add_base.html --- a/kallithea/templates/admin/repos/repo_add_base.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/repos/repo_add_base.html Sun Dec 04 22:53:36 2016 +0100 @@ -35,7 +35,7 @@
-
+
${h.checkbox('repo_copy_permissions',value="True")} ${_('Copy permission set from parent repository group.')}
@@ -56,7 +56,7 @@
-
+
${h.checkbox('repo_private',value="True")} ${_('Private repositories are only visible to people explicitly added as collaborators.')}
diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/admin/repos/repo_edit_settings.html --- a/kallithea/templates/admin/repos/repo_edit_settings.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/repos/repo_edit_settings.html Sun Dec 04 22:53:36 2016 +0100 @@ -60,28 +60,28 @@
-
+
${h.checkbox('repo_private',value="True")} ${_('Private repositories are only visible to people explicitly added as collaborators.')}
-
+
${h.checkbox('repo_enable_statistics',value="True")} ${_('Enable statistics window on summary page.')}
-
+
${h.checkbox('repo_enable_downloads',value="True")} ${_('Enable download menu on summary page.')}
-
+
${h.checkbox('repo_enable_locking',value="True")} ${_('Enable lock-by-pulling on repository.')}
diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/admin/settings/settings_mapping.html --- a/kallithea/templates/admin/settings/settings_mapping.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/settings/settings_mapping.html Sun Dec 04 22:53:36 2016 +0100 @@ -3,7 +3,7 @@
-
+
${h.checkbox('destroy',True)} diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/admin/settings/settings_search.html --- a/kallithea/templates/admin/settings/settings_search.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/settings/settings_search.html Sun Dec 04 22:53:36 2016 +0100 @@ -4,7 +4,7 @@
-
+
${h.checkbox('full_index',True)} diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/admin/settings/settings_vcs.html --- a/kallithea/templates/admin/settings/settings_vcs.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/settings/settings_vcs.html Sun Dec 04 22:53:36 2016 +0100 @@ -3,7 +3,7 @@
-
+
${h.checkbox('hooks_changegroup_repo_size','True')} @@ -24,7 +24,7 @@
-
+
${h.checkbox('extensions_largefiles','True')} diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/admin/settings/settings_visual.html --- a/kallithea/templates/admin/settings/settings_visual.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/settings/settings_visual.html Sun Dec 04 22:53:36 2016 +0100 @@ -5,7 +5,7 @@
-
+
${h.checkbox('repository_fields','True')} @@ -67,7 +67,7 @@
-
+
${h.checkbox('show_public_icon','True')} @@ -82,7 +82,7 @@
-
+
${h.checkbox('stylify_metatags','True')} diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/admin/user_groups/user_group_add.html --- a/kallithea/templates/admin/user_groups/user_group_add.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/user_groups/user_group_add.html Sun Dec 04 22:53:36 2016 +0100 @@ -42,7 +42,7 @@
-
+
${h.checkbox('users_group_active',value=True, checked='checked')}
diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/admin/user_groups/user_group_edit_settings.html --- a/kallithea/templates/admin/user_groups/user_group_edit_settings.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/user_groups/user_group_edit_settings.html Sun Dec 04 22:53:36 2016 +0100 @@ -17,7 +17,7 @@
-
+
${h.checkbox('users_group_active',value=True)}
diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/admin/users/user_add.html --- a/kallithea/templates/admin/users/user_add.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/users/user_add.html Sun Dec 04 22:53:36 2016 +0100 @@ -71,7 +71,7 @@
-
+
${h.checkbox('active',value=True,checked='checked')}
diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/admin/users/user_edit_profile.html --- a/kallithea/templates/admin/users/user_edit_profile.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/users/user_edit_profile.html Sun Dec 04 22:53:36 2016 +0100 @@ -77,14 +77,14 @@
-
+
${h.checkbox('active',value=True, readonly=c.readonly('active'))}
-
+
${h.checkbox('admin',value=True, readonly=c.readonly('admin'))}
diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/base/default_perms_box.html --- a/kallithea/templates/base/default_perms_box.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/base/default_perms_box.html Sun Dec 04 22:53:36 2016 +0100 @@ -11,7 +11,7 @@
-
+
${h.checkbox('inherit_default_permissions',value=True)} ${h.literal(_('Select to inherit global settings, IP whitelist and permissions from the %s.') @@ -23,7 +23,7 @@
-
+
${h.checkbox('create_repo_perm',value=True)} ${h.literal(_('Select this option to allow repository creation for this user'))} @@ -33,7 +33,7 @@
-
+
${h.checkbox('create_user_group_perm',value=True)} ${h.literal(_('Select this option to allow user group creation for this user'))} @@ -43,7 +43,7 @@
-
+
${h.checkbox('fork_repo_perm',value=True)} ${h.literal(_('Select this option to allow repository forking for this user'))} diff -r dd42c2ad28d7 -r 951004d57e3f kallithea/templates/forks/fork.html --- a/kallithea/templates/forks/fork.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/forks/fork.html Sun Dec 04 22:53:36 2016 +0100 @@ -57,7 +57,7 @@
-
+
${h.checkbox('private',value="True")} ${_('Private repositories are only visible to people explicitly added as collaborators.')}
@@ -65,7 +65,7 @@
-
+
${h.checkbox('copy_permissions',value="True", checked="checked")} ${_('Copy permissions from forked repository')}
@@ -74,7 +74,7 @@ %if c.can_update:
-
+
${h.checkbox('update_after_clone',value="True")} ${_('Checkout source after making a clone')}