Mercurial > kallithea
changeset 6352:951004d57e3f
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.
line wrap: on
line diff
--- 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
--- 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": <div class="form-group"> <label class="control-label" for="${fullsetting}">${_(displayname)}</label> - <div class="checkboxes"> - <div class="checkbox">${h.checkbox(fullsetting,True)}</div> + <div> + ${h.checkbox(fullsetting,True)} <span class="help-block">${setting["description"]}</span> </div> </div>
--- 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 @@ <div class="form-group"> <label class="control-label" for="default_repo_private">${_('Private repository')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('default_repo_private',value="True")} <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span> </div> @@ -45,7 +45,7 @@ <div class="form-group"> <label class="control-label" for="default_repo_enable_statistics">${_('Enable statistics')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('default_repo_enable_statistics',value="True")} <span class="help-block">${_('Enable statistics window on summary page.')}</span> </div> @@ -53,7 +53,7 @@ <div class="form-group"> <label class="control-label" for="default_repo_enable_downloads">${_('Enable downloads')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('default_repo_enable_downloads',value="True")} <span class="help-block">${_('Enable download menu on summary page.')}</span> </div> @@ -61,7 +61,7 @@ <div class="form-group"> <label class="control-label" for="default_repo_enable_locking">${_('Enable locking')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('default_repo_enable_locking',value="True")} <span class="help-block">${_('Enable lock-by-pulling on repository.')}</span> </div>
--- 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 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="anonymous">${_('Anonymous access')}:</label> - <div class="checkboxes"> + <div> <div class="checkbox"> ${h.checkbox('anonymous',True)} </div>
--- 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 @@ <div id="copy_perms" class="form-group"> <label class="control-label" for="group_copy_permissions">${_('Copy parent group permissions')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('group_copy_permissions',value="True")} <span class="help-block">${_('Copy permission set from parent repository group.')}</span> </div>
--- 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 @@ <div class="form-group"> <label class="control-label" for="enable_locking">${_('Enable locking')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('enable_locking',value="True")} <span class="help-block">${_('Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside')}</span> </div>
--- 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 @@ </div> <div id="copy_perms" class="form-group"> <label class="control-label" for="repo_copy_permissions">${_('Copy parent group permissions')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('repo_copy_permissions',value="True")} <span class="help-block">${_('Copy permission set from parent repository group.')}</span> </div> @@ -56,7 +56,7 @@ </div> <div class="form-group"> <label class="control-label" for="repo_private">${_('Private repository')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('repo_private',value="True")} <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span> </div>
--- 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 @@ <div class="form-group"> <label class="control-label" for="repo_private">${_('Private repository')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('repo_private',value="True")} <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span> </div> </div> <div class="form-group"> <label class="control-label" for="repo_enable_statistics">${_('Enable statistics')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('repo_enable_statistics',value="True")} <span class="help-block">${_('Enable statistics window on summary page.')}</span> </div> </div> <div class="form-group"> <label class="control-label" for="repo_enable_downloads">${_('Enable downloads')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('repo_enable_downloads',value="True")} <span class="help-block">${_('Enable download menu on summary page.')}</span> </div> </div> <div class="form-group"> <label class="control-label" for="repo_enable_locking">${_('Enable locking')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('repo_enable_locking',value="True")} <span class="help-block">${_('Enable lock-by-pulling on repository.')}</span> </div>
--- 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 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="destroy">${_('Rescan options')}:</label> - <div class="checkboxes"> + <div> <div class="checkbox"> ${h.checkbox('destroy',True)} <label for="destroy">${_('Delete records of missing repositories')}</label>
--- 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 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label">${_('Index build option')}:</label> - <div class="checkboxes"> + <div> <div class="checkbox"> ${h.checkbox('full_index',True)} <label for="full_index">${_('Build from scratch')}</label>
--- 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 @@ <div class="form-horizontal"> <div class="form-group"> <label>${_('Hooks')}:</label> - <div class="checkboxes"> + <div> <div class="checkbox"> ${h.checkbox('hooks_changegroup_repo_size','True')} <label for="hooks_changegroup_repo_size">${_('Show repository size after push')}</label> @@ -24,7 +24,7 @@ </div> <div class="form-group"> <label>${_('Mercurial extensions')}:</label> - <div class="checkboxes"> + <div> <div class="checkbox"> ${h.checkbox('extensions_largefiles','True')} <label for="extensions_largefiles">${_('Enable largefiles extension')}</label>
--- 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 @@ <div class="form-group"> <label>${_('General')}:</label> - <div class="checkboxes"> + <div> <div class="checkbox"> ${h.checkbox('repository_fields','True')} <label for="repository_fields">${_('Use repository extra fields')}</label> @@ -67,7 +67,7 @@ <div class="form-group"> <label>${_('Icons')}:</label> - <div class="checkboxes"> + <div> <div class="checkbox"> ${h.checkbox('show_public_icon','True')} <label for="show_public_icon">${_('Show public repository icon on repositories')}</label> @@ -82,7 +82,7 @@ <div class="form-group"> <label>${_('Meta Tagging')}:</label> - <div class="checkboxes"> + <div> <div class="checkbox"> ${h.checkbox('stylify_metatags','True')} <label for="stylify_metatags">${_('Stylify recognised meta tags:')}</label>
--- 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 @@ </div> <div class="form-group"> <label class="control-label" for="users_group_active">${_('Active')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('users_group_active',value=True, checked='checked')} </div> </div>
--- 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 @@ </div> <div class="form-group"> <label class="control-label" for="users_group_active">${_('Active')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('users_group_active',value=True)} </div> </div>
--- 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 @@ <div class="form-group"> <label class="control-label" for="active">${_('Active')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('active',value=True,checked='checked')} </div> </div>
--- 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 @@ <div class="form-group"> <label class="control-label" for="active">${_('Active')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('active',value=True, readonly=c.readonly('active'))} </div> </div> <div class="form-group"> <label class="control-label" for="admin">${_('Admin')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('admin',value=True, readonly=c.readonly('admin'))} </div> </div>
--- 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 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="inherit_default_permissions">${_('Inherit defaults')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('inherit_default_permissions',value=True)} <span class="help-block"> ${h.literal(_('Select to inherit global settings, IP whitelist and permissions from the %s.') @@ -23,7 +23,7 @@ <div id="inherit_overlay"> <div class="form-group"> <label class="control-label" for="create_repo_perm">${_('Create repositories')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('create_repo_perm',value=True)} <span class="help-block"> ${h.literal(_('Select this option to allow repository creation for this user'))} @@ -33,7 +33,7 @@ <div class="form-group"> <label class="control-label" for="create_user_group_perm">${_('Create user groups')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('create_user_group_perm',value=True)} <span class="help-block"> ${h.literal(_('Select this option to allow user group creation for this user'))} @@ -43,7 +43,7 @@ <div class="form-group"> <label class="control-label" for="fork_repo_perm">${_('Fork repositories')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('fork_repo_perm',value=True)} <span class="help-block"> ${h.literal(_('Select this option to allow repository forking for this user'))}
--- 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 @@ <div class="form-group"> <label class="control-label" for="private">${_('Private')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('private',value="True")} <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span> </div> @@ -65,7 +65,7 @@ <div class="form-group"> <label class="control-label" for="copy_permissions">${_('Copy permissions')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('copy_permissions',value="True", checked="checked")} <span class="help-block">${_('Copy permissions from forked repository')}</span> </div> @@ -74,7 +74,7 @@ %if c.can_update: <div class="form-group"> <label class="control-label" for="update_after_clone">${_('Update after clone')}:</label> - <div class="checkboxes"> + <div> ${h.checkbox('update_after_clone',value="True")} <span class="help-block">${_('Checkout source after making a clone')}</span> </div>