# HG changeset patch # User Mads Kiilerich # Date 2016-10-20 19:55:58 # Node ID b52a66c5755fbd66649f73823fee91337f3a937f # Parent d4b39ef6cadfb711882e998881e03fcf4bb0d444 style: replace action_button with Bootstrap compatible btn class names 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 @@ -2929,17 +2929,6 @@ table.code-browser i[class^='icon-'] { padding-bottom: 5px; } -.action_button { - border: 0; - display: inline; -} - -.action_button:hover { - border: 0; - text-decoration: underline; - cursor: pointer; -} - #switch_repos { position: absolute; height: 25px; diff --git a/kallithea/templates/admin/my_account/my_account_emails.html b/kallithea/templates/admin/my_account/my_account_emails.html --- a/kallithea/templates/admin/my_account/my_account_emails.html +++ b/kallithea/templates/admin/my_account/my_account_emails.html @@ -21,7 +21,7 @@ ${h.hidden('del_email_id',em.email_id)} ${h.submit('remove_',_('Delete'),id="remove_email_%s" % em.email_id, - class_="action_button", onclick="return confirm('"+_('Confirm to delete this email: %s') % em.email+"');")} + class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this email: %s') % em.email+"');")} ${h.end_form()} diff --git a/kallithea/templates/admin/permissions/permissions_ips.html b/kallithea/templates/admin/permissions/permissions_ips.html --- a/kallithea/templates/admin/permissions/permissions_ips.html +++ b/kallithea/templates/admin/permissions/permissions_ips.html @@ -10,7 +10,7 @@ ${h.hidden('del_ip_id',ip.ip_id)} ${h.hidden('default_user', 'True')} ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id, - class_="action_button", onclick="return confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")} + class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")} ${h.end_form()} diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html @@ -30,7 +30,7 @@ ${h.form(url('edit_repo_group_perms', gr %if r2p.user.username !='default': - + ${_('Revoke')} %endif @@ -67,7 +67,7 @@ ${h.form(url('edit_repo_group_perms', gr %endif - + ${_('Revoke')} diff --git a/kallithea/templates/admin/repos/repo_edit_fields.html b/kallithea/templates/admin/repos/repo_edit_fields.html --- a/kallithea/templates/admin/repos/repo_edit_fields.html +++ b/kallithea/templates/admin/repos/repo_edit_fields.html @@ -16,7 +16,7 @@ ${h.form(url('delete_repo_fields', repo_name=c.repo_info.repo_name, field_id=field.repo_field_id))} ${h.submit('remove_%s' % field.repo_field_id, _('Delete'), id="remove_field_%s" % field.repo_field_id, - class_="action_button", onclick="return confirm('"+_('Confirm to delete this field: %s') % field.field_key+"');")} + class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this field: %s') % field.field_key+"');")} ${h.end_form()} diff --git a/kallithea/templates/admin/repos/repo_edit_permissions.html b/kallithea/templates/admin/repos/repo_edit_permissions.html --- a/kallithea/templates/admin/repos/repo_edit_permissions.html +++ b/kallithea/templates/admin/repos/repo_edit_permissions.html @@ -39,7 +39,7 @@ ${h.form(url('edit_repo_perms_update', r %if r2p.user.username !='default': - + ${_('Revoke')} %endif @@ -64,7 +64,7 @@ ${h.form(url('edit_repo_perms_update', r %endif - + ${_('Revoke')} diff --git a/kallithea/templates/admin/settings/settings_hooks.html b/kallithea/templates/admin/settings/settings_hooks.html --- a/kallithea/templates/admin/settings/settings_hooks.html +++ b/kallithea/templates/admin/settings/settings_hooks.html @@ -30,7 +30,7 @@ ${h.form(url('admin_settings_hooks'), me ${h.hidden('hook_ui_key',hook.ui_key)} ${h.hidden('hook_ui_value',hook.ui_value)} ${h.text('hook_ui_value_new',hook.ui_value,size=60)} - ${_('Delete')} diff --git a/kallithea/templates/admin/user_groups/user_group_edit_perms.html b/kallithea/templates/admin/user_groups/user_group_edit_perms.html --- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html +++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html @@ -30,7 +30,7 @@ ${h.form(url('edit_user_group_perms_upda %if r2p.user.username !='default': - + ${_('Revoke')} %endif @@ -67,7 +67,7 @@ ${h.form(url('edit_user_group_perms_upda %endif - + ${_('Revoke')} diff --git a/kallithea/templates/admin/users/user_edit_emails.html b/kallithea/templates/admin/users/user_edit_emails.html --- a/kallithea/templates/admin/users/user_edit_emails.html +++ b/kallithea/templates/admin/users/user_edit_emails.html @@ -21,7 +21,7 @@ ${h.hidden('del_email_id',em.email_id)} ${h.submit('remove_',_('Delete'),id="remove_email_%s" % em.email_id, - class_="action_button", onclick="return confirm('"+_('Confirm to delete this email: %s') % em.email+"');")} + class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this email: %s') % em.email+"');")} ${h.end_form()} diff --git a/kallithea/templates/admin/users/user_edit_ips.html b/kallithea/templates/admin/users/user_edit_ips.html --- a/kallithea/templates/admin/users/user_edit_ips.html +++ b/kallithea/templates/admin/users/user_edit_ips.html @@ -20,7 +20,7 @@ ${h.hidden('del_ip_id',ip.ip_id)} ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id, - class_="action_button", onclick="return confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")} + class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")} ${h.end_form()} diff --git a/kallithea/templates/data_table/_dt_elements.html b/kallithea/templates/data_table/_dt_elements.html --- a/kallithea/templates/data_table/_dt_elements.html +++ b/kallithea/templates/data_table/_dt_elements.html @@ -120,13 +120,13 @@
${h.form(h.url('delete_repo', repo_name=repo_name))} - ${h.submit('remove_%s' % repo_name,_('Delete'),class_="action_button", + ${h.submit('remove_%s' % repo_name,_('Delete'),class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo_name+"');")} ${h.end_form()}
@@ -148,13 +148,13 @@ <%def name="user_actions(user_id, username)">
${h.form(h.url('delete_user', id=user_id))} - ${h.submit('remove_',_('Delete'),id="remove_user_%s" % user_id, class_="action_button", + ${h.submit('remove_',_('Delete'),id="remove_user_%s" % user_id, class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this user: %s') % username+"');")} ${h.end_form()}
@@ -164,13 +164,13 @@
${h.form(h.url('delete_users_group', id=user_group_id))} - ${h.submit('remove_',_('Delete'),id="remove_group_%s" % user_group_id, class_="action_button", + ${h.submit('remove_',_('Delete'),id="remove_group_%s" % user_group_id, class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this user group: %s') % user_group_name+"');")} ${h.end_form()}
@@ -180,13 +180,13 @@
${h.form(h.url('delete_repos_group', group_name=repo_group_name))} - ${h.submit('remove_%s' % repo_group_name,_('Delete'),class_="action_button", + ${h.submit('remove_%s' % repo_group_name,_('Delete'),class_="btn btn-default btn-xs", onclick="return confirm('"+ungettext('Confirm to delete this group: %s with %s repository','Confirm to delete this group: %s with %s repositories',gr_count) % (repo_group_name, gr_count)+"');")} ${h.end_form()}
diff --git a/kallithea/templates/pullrequests/pullrequest_data.html b/kallithea/templates/pullrequests/pullrequest_data.html --- a/kallithea/templates/pullrequests/pullrequest_data.html +++ b/kallithea/templates/pullrequests/pullrequest_data.html @@ -61,7 +61,7 @@ %if pr.owner_id == c.authuser.user_id: ${h.form(url('pullrequest_delete', repo_name=pr.other_repo.repo_name, pull_request_id=pr.pull_request_id), style="display:inline-block")} -