Mercurial > kallithea
changeset 6283:d27572fa323c
style: put all admin form buttons in a form-group, as our future Bootstrap likes it
Based on work by Dominik Ruf.
line wrap: on
line diff
--- a/kallithea/templates/admin/auth/auth_settings.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/auth/auth_settings.html Mon Oct 24 22:38:25 2016 +0200 @@ -36,8 +36,10 @@ %for plugin_path in c.available_plugins: <li> <div style="padding:3px 0px 3px 0px"> - <span style="margin: 0px 10px 0px 0px" plugin_id="${plugin_path}" class="toggle-plugin btn btn-default btn-xs ${'active' if plugin_path in c.enabled_plugins else ''}"> - ${_('Enabled') if plugin_path in c.enabled_plugins else _('Disabled')}</span>${plugin_path} + <span style="margin: 0px 10px 0px 0px" plugin_id="${plugin_path}" class="toggle-plugin btn btn-default btn-xs ${'active' if plugin_path in c.enabled_plugins else ''}"> + ${_('Enabled') if plugin_path in c.enabled_plugins else _('Disabled')} + </span> + ${plugin_path} </div> </li> %endfor @@ -97,8 +99,10 @@ </div> %endfor <div class="form-horizontal"> - <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('save',_('Save'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/defaults/defaults.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/defaults/defaults.html Mon Oct 24 22:38:25 2016 +0200 @@ -78,8 +78,10 @@ </div> </div> - <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('save',_('Save'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/gists/show.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/gists/show.html Mon Oct 24 22:38:25 2016 +0200 @@ -48,7 +48,7 @@ %else: ${_('Expires')}: ${h.age(h.time_to_datetime(c.gist.gist_expires))} %endif - </div> + </div> %if h.HasPermissionAny('hg.admin')() or c.gist.gist_owner == c.authuser.user_id: <div style="float:right">
--- a/kallithea/templates/admin/my_account/my_account_api_keys.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_api_keys.html Mon Oct 24 22:38:25 2016 +0200 @@ -56,7 +56,7 @@ <div class="form"> <!-- fields --> <div class="form-horizontal"> - <div class="form-group"> + <div class="form-group"> <div class="label"> <label for="description">${_('New API key')}:</label> </div> @@ -64,10 +64,12 @@ ${h.text('description', class_='medium', placeholder=_('Description'))} ${h.select('lifetime', '', c.lifetime_options)} </div> - </div> - <div class="buttons"> - ${h.submit('save',_('Add'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + </div> + <div class="form-group"> + <div class="buttons"> + ${h.submit('save',_('Add'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/my_account/my_account_emails.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_emails.html Mon Oct 24 22:38:25 2016 +0200 @@ -45,9 +45,11 @@ ${h.text('new_email', class_='medium')} </div> </div> - <div class="buttons"> - ${h.submit('save',_('Add'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('save',_('Add'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/my_account/my_account_password.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_password.html Mon Oct 24 22:38:25 2016 +0200 @@ -4,39 +4,41 @@ ${h.form(url('my_account_password'), method='post')} <div class="form"> - <div class="form-horizontal"> - <div class="form-group"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> <label class="control-label" for="current_password">${_('Current password')}:</label> </div> <div class="input"> ${h.password('current_password',class_='medium')} </div> - </div> + </div> - <div class="form-group"> + <div class="form-group"> <div class="label"> <label class="control-label" for="new_password">${_('New password')}:</label> </div> <div class="input"> ${h.password('new_password',class_='medium')} </div> - </div> + </div> - <div class="form-group"> + <div class="form-group"> <div class="label"> <label class="control-label" for="new_password_confirmation">${_('Confirm new password')}:</label> </div> <div class="input"> ${h.password('new_password_confirmation',class_='medium')} </div> - </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")} + ${h.submit('save',_('Save'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> + </div> </div> ${h.end_form()}
--- a/kallithea/templates/admin/my_account/my_account_profile.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_profile.html Mon Oct 24 22:38:25 2016 +0200 @@ -54,9 +54,11 @@ </div> </div> - <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + <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>
--- a/kallithea/templates/admin/permissions/permissions_globals.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/permissions/permissions_globals.html Mon Oct 24 22:38:25 2016 +0200 @@ -108,9 +108,11 @@ ${h.select('default_extern_activate','',c.extern_activate_choices)} </div> </div> - <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + <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>
--- a/kallithea/templates/admin/permissions/permissions_ips.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/permissions/permissions_ips.html Mon Oct 24 22:38:25 2016 +0200 @@ -34,9 +34,11 @@ ${h.text('new_ip', class_='medium')} </div> </div> - <div class="buttons"> - ${h.submit('save',_('Add'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('save',_('Add'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/repo_groups/repo_group_add.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_add.html Mon Oct 24 22:38:25 2016 +0200 @@ -65,8 +65,10 @@ </div> </div> - <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('save',_('Save'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html Mon Oct 24 22:38:25 2016 +0200 @@ -1,6 +1,6 @@ ${h.form(url('edit_repo_group_perms', group_name=c.repo_group.group_name))} <div class="form"> - <div class="fields"> + <div class="fields"> <div class="field"> <table id="permissions_manage" class="noborder"> <tr> @@ -111,10 +111,10 @@ </table> </div> <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + ${h.submit('save',_('Save'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> - </div> + </div> </div> ${h.end_form()}
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Mon Oct 24 22:38:25 2016 +0200 @@ -29,6 +29,7 @@ ${h.select('group_parent_id','',c.repo_groups,class_="medium")} </div> </div> + <div class="form-group"> <div class="label label-checkbox"> <label class="control-label" for="enable_locking">${_('Enable locking')}:</label> @@ -38,9 +39,12 @@ <span class="help-block">${_('Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside')}</span> </div> </div> - <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + + <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> @@ -49,8 +53,10 @@ ${h.form(url('delete_repo_group', group_name=c.repo_group.group_name))} <div class="form"> <div class="form-horizontal"> - <div class="buttons"> - ${h.submit('remove_%s' % c.repo_group.group_name,_('Remove this group'),class_="btn btn-danger",onclick="return confirm('"+_('Confirm to delete this group')+"');")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('remove_%s' % c.repo_group.group_name,_('Remove this group'),class_="btn btn-danger",onclick="return confirm('"+_('Confirm to delete this group')+"');")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/repos/repo_add_base.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_add_base.html Mon Oct 24 22:38:25 2016 +0200 @@ -77,8 +77,10 @@ <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span> </div> </div> - <div class="buttons"> - ${h.submit('add',_('Add'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('add',_('Add'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/repos/repo_edit_fields.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_fields.html Mon Oct 24 22:38:25 2016 +0200 @@ -54,9 +54,11 @@ </div> </div> - <div class="buttons"> - ${h.submit('save',_('Add'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('save',_('Add'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/repos/repo_edit_permissions.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_permissions.html Mon Oct 24 22:38:25 2016 +0200 @@ -97,9 +97,9 @@ </tr> </table> </div> - <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + <div class="form-group"> + ${h.submit('save',_('Save'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/repos/repo_edit_settings.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_settings.html Mon Oct 24 22:38:25 2016 +0200 @@ -123,9 +123,11 @@ </div> %endfor %endif - <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + <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>
--- a/kallithea/templates/admin/settings/settings_email.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_email.html Mon Oct 24 22:38:25 2016 +0200 @@ -11,8 +11,10 @@ </div> </div> - <div class="buttons"> - ${h.submit('send',_('Send'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('send',_('Send'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/settings/settings_global.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_global.html Mon Oct 24 22:38:25 2016 +0200 @@ -57,9 +57,11 @@ </div> </div> - <div class="buttons"> - ${h.submit('save',_('Save Settings'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('save',_('Save Settings'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/settings/settings_hooks.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_hooks.html Mon Oct 24 22:38:25 2016 +0200 @@ -49,8 +49,10 @@ ${h.text('new_hook_ui_value',size=60)} </div> </div> - <div class="buttons" style="margin-left:280px"> - ${h.submit('save',_('Save'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons" style="margin-left:280px"> + ${h.submit('save',_('Save'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/settings/settings_mapping.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_mapping.html Mon Oct 24 22:38:25 2016 +0200 @@ -31,8 +31,10 @@ </div> </div> - <div class="buttons"> - ${h.submit('rescan',_('Rescan Repositories'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('rescan',_('Rescan Repositories'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/settings/settings_search.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_search.html Mon Oct 24 22:38:25 2016 +0200 @@ -16,8 +16,10 @@ </div> </div> - <div class="buttons"> - ${h.submit('reindex',_('Reindex'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('reindex',_('Reindex'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/settings/settings_vcs.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_vcs.html Mon Oct 24 22:38:25 2016 +0200 @@ -63,9 +63,11 @@ ## form still requires this but we cannot internally change it anyway ${h.hidden('paths_root_path',size=30,readonly="readonly")} %endif - <div class="buttons"> - ${h.submit('save',_('Save Settings'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('save',_('Save Settings'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/settings/settings_visual.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_visual.html Mon Oct 24 22:38:25 2016 +0200 @@ -73,7 +73,7 @@ </div> </div> - <div class="form-group"> + <div class="form-group"> <div class="label label-checkbox"> <label>${_('Icons')}:</label> </div> @@ -88,9 +88,9 @@ </div> <span class="help-block">${_('Show public/private icons next to repository names.')}</span> </div> - </div> + </div> - <div class="form-group"> + <div class="form-group"> <div class="label label-checkbox"> <label>${_('Meta Tagging')}:</label> </div> @@ -113,12 +113,14 @@ </div> <span class="help-block">${_('Parses meta tags from the repository description field and turns them into colored tags.')}</span> </div> - </div> + </div> - <div class="buttons"> - ${h.submit('save',_('Save Settings'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} - </div> + <div class="form-group"> + <div class="buttons"> + ${h.submit('save',_('Save Settings'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} + </div> + </div> </div> </div>
--- a/kallithea/templates/admin/user_groups/user_group_add.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_add.html Mon Oct 24 22:38:25 2016 +0200 @@ -53,8 +53,10 @@ </div> </div> - <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('save',_('Save'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html Mon Oct 24 22:38:25 2016 +0200 @@ -93,7 +93,7 @@ <tr class="new_members last_new_member" id="add_perm_input"></tr> <tr> <td colspan="6"> - <span id="add_perm" style="cursor: pointer;"> + <span id="add_perm" class="btn"> <i class="icon-plus"></i> ${_('Add new')} </span> </td> @@ -101,8 +101,8 @@ </table> </div> <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + ${h.submit('save',_('Save'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> </div> </div>
--- a/kallithea/templates/admin/user_groups/user_group_edit_settings.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_edit_settings.html Mon Oct 24 22:38:25 2016 +0200 @@ -56,8 +56,10 @@ </div> </div> - <div class="buttons"> - ${h.submit('Save',_('Save'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('Save',_('Save'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/users/user_add.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/users/user_add.html Mon Oct 24 22:38:25 2016 +0200 @@ -92,8 +92,11 @@ ${h.hidden('extern_type', c.default_extern_type)} ${h.hidden('extern_name', c.default_extern_name)} - <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn btn-default")} + + <div class="form-group"> + <div class="buttons"> + ${h.submit('save',_('Save'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/users/user_edit_api_keys.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_api_keys.html Mon Oct 24 22:38:25 2016 +0200 @@ -56,7 +56,7 @@ <div class="form"> <!-- fields --> <div class="form-horizontal"> - <div class="form-group"> + <div class="form-group"> <div class="label"> <label class="control-label" for="description">${_('New API key')}:</label> </div> @@ -64,10 +64,13 @@ ${h.text('description', class_='medium', placeholder=_('Description'))} ${h.select('lifetime', '', c.lifetime_options)} </div> - </div> - <div class="buttons"> - ${h.submit('save',_('Add'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + </div> + + <div class="form-group"> + <div class="buttons"> + ${h.submit('save',_('Add'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/users/user_edit_emails.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_emails.html Mon Oct 24 22:38:25 2016 +0200 @@ -45,9 +45,11 @@ ${h.text('new_email', class_='medium')} </div> </div> - <div class="buttons"> - ${h.submit('save',_('Add'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('save',_('Add'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/users/user_edit_ips.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_ips.html Mon Oct 24 22:38:25 2016 +0200 @@ -45,9 +45,11 @@ ${h.text('new_ip', class_='medium')} </div> </div> - <div class="buttons"> - ${h.submit('save',_('Add'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + <div class="form-group"> + <div class="buttons"> + ${h.submit('save',_('Add'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/admin/users/user_edit_profile.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_profile.html Mon Oct 24 22:38:25 2016 +0200 @@ -109,9 +109,11 @@ </div> </div> - <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + <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>
--- a/kallithea/templates/base/default_perms_box.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/base/default_perms_box.html Mon Oct 24 22:38:25 2016 +0200 @@ -9,7 +9,7 @@ <div class="form"> <!-- fields --> <div class="form-horizontal"> - <div class="form-group"> + <div class="form-group"> <div class="label label-checkbox"> <label class="control-label" for="inherit_default_permissions">${_('Inherit defaults')}:</label> </div> @@ -20,10 +20,10 @@ % h.link_to('default permissions', url('admin_permissions')))} </span> </div> - </div> + </div> - <div id="inherit_overlay"> - <div class="form-group"> + <div id="inherit_overlay"> + <div class="form-group"> <div class="label label-checkbox"> <label class="control-label" for="create_repo_perm">${_('Create repositories')}:</label> </div> @@ -33,9 +33,9 @@ ${h.literal(_('Select this option to allow repository creation for this user'))} </span> </div> - </div> + </div> - <div class="form-group"> + <div class="form-group"> <div class="label label-checkbox"> <label class="control-label" for="create_user_group_perm">${_('Create user groups')}:</label> </div> @@ -45,9 +45,9 @@ ${h.literal(_('Select this option to allow user group creation for this user'))} </span> </div> - </div> + </div> - <div class="form-group"> + <div class="form-group"> <div class="label label-checkbox"> <label class="control-label" for="fork_repo_perm">${_('Fork repositories')}:</label> </div> @@ -57,12 +57,15 @@ ${h.literal(_('Select this option to allow repository forking for this user'))} </span> </div> - </div> + </div> </div> - <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} + + <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>
--- a/kallithea/templates/forks/fork.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/forks/fork.html Mon Oct 24 22:38:25 2016 +0200 @@ -72,6 +72,7 @@ <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span> </div> </div> + <div class="form-group"> <div class="label label-checkbox"> <label class="control-label" for="private">${_('Copy permissions')}:</label> @@ -81,6 +82,7 @@ <span class="help-block">${_('Copy permissions from forked repository')}</span> </div> </div> + %if c.can_update: <div class="form-group"> <div class="label label-checkbox"> @@ -92,8 +94,11 @@ </div> </div> %endif - <div class="buttons"> - ${h.submit('',_('Fork this Repository'),class_="btn btn-default")} + + <div class="form-group"> + <div class="buttons"> + ${h.submit('',_('Fork this Repository'),class_="btn btn-default")} + </div> </div> </div> </div>
--- a/kallithea/templates/password_reset_confirmation.html Thu Oct 20 19:55:58 2016 +0200 +++ b/kallithea/templates/password_reset_confirmation.html Mon Oct 24 22:38:25 2016 +0200 @@ -25,35 +25,38 @@ <div class="form"> <!-- fields --> <div class="form-horizontal"> - <div class="form-group"> + <div class="form-group"> <div class="label"> <label class="control-label" for="token">${_('Code you received in the email')}:</label> </div> <div class="input"> ${h.text('token', class_='focus')} </div> - </div> + </div> - <div class="form-group"> + <div class="form-group"> <div class="label"> <label class="control-label" for="password">${_('New Password')}:</label> </div> <div class="input"> ${h.password('password',class_='focus')} </div> - </div> + </div> - <div class="form-group"> + <div class="form-group"> <div class="label"> <label class="control-label" for="password_confirm">${_('Confirm New Password')}:</label> </div> <div class="input"> ${h.password('password_confirm',class_='focus')} </div> - </div> - <div class="buttons"> - <div class="nohighlight"> - ${h.submit('send',_('Confirm'),class_="btn btn-default")} + </div> + + <div class="form-group"> + <div class="buttons"> + <div class="nohighlight"> + ${h.submit('send',_('Confirm'),class_="btn btn-default")} + </div> </div> </div> </div>