# HG changeset patch # User Sean Farley # Date 1414695446 25200 # Node ID b5795554c2caecdc333b911de847fb0a4fbc5b1d # Parent 5fecce90c3d6dbf7f441563a17a060923d3899a1 icon-remove: use new icon-minus-circled instead To remove the css that set the background of the submit input (h.submit), the element needed to be changed to ${h.end_form()} diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/admin/my_account/my_account_emails.html --- a/kallithea/templates/admin/my_account/my_account_emails.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/admin/my_account/my_account_emails.html Thu Oct 30 11:57:26 2014 -0700 @@ -15,7 +15,7 @@ ${h.form(url('my_account_emails'),method='delete')} ${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+"');")} ${h.end_form()} diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/admin/notifications/notifications_data.html --- a/kallithea/templates/admin/notifications/notifications_data.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/admin/notifications/notifications_data.html Thu Oct 30 11:57:26 2014 -0700 @@ -17,7 +17,7 @@
- +
%if not notification.read:
diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/admin/notifications/show_notification.html --- a/kallithea/templates/admin/notifications/show_notification.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/admin/notifications/show_notification.html Thu Oct 30 11:57:26 2014 -0700 @@ -34,7 +34,7 @@ ${c.notification.description}
- +
diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/admin/permissions/permissions_ips.html --- a/kallithea/templates/admin/permissions/permissions_ips.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/admin/permissions/permissions_ips.html Thu Oct 30 11:57:26 2014 -0700 @@ -11,7 +11,7 @@ ${h.form(url('edit_user_ips', id=c.user.user_id),method='delete')} ${h.hidden('del_ip_id',ip.ip_id)} ${h.hidden('default_user', 'True')} - ${h.submit('remove_',_('delete'),id="remove_ip_%s" % 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: %s') % ip.ip_addr+"');")} ${h.end_form()} diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html Thu Oct 30 11:57:26 2014 -0700 @@ -21,7 +21,7 @@ onclick="return confirm('${ungettext('Confirm to delete this group: %s with %s repository', 'Confirm to delete this group: %s with %s repositories', c.repo_group.repositories_recursive_count) % (c.repo_group.group_name, c.repo_group.repositories_recursive_count)}');"> - + ${_('Delete this repository group')} ${h.end_form()} diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/admin/repo_groups/repo_group_edit_perms.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html Thu Oct 30 11:57:26 2014 -0700 @@ -31,7 +31,7 @@ %if r2p.user.username !='default': - ${_('revoke')} + ${_('revoke')} %endif @@ -68,7 +68,7 @@ - ${_('revoke')} + ${_('revoke')} diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/admin/repos/repo_edit_advanced.html --- a/kallithea/templates/admin/repos/repo_edit_advanced.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/admin/repos/repo_edit_advanced.html Thu Oct 30 11:57:26 2014 -0700 @@ -78,7 +78,7 @@
%if c.repo_info.forks.count(): diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/admin/repos/repo_edit_fields.html --- a/kallithea/templates/admin/repos/repo_edit_fields.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/admin/repos/repo_edit_fields.html Thu Oct 30 11:57:26 2014 -0700 @@ -14,7 +14,7 @@ ${field.field_type} ${h.form(url('delete_repo_fields', repo_name=c.repo_info.repo_name, field_id=field.repo_field_id),method='delete')} - + ${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+"');")} ${h.end_form()} diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/admin/repos/repo_edit_permissions.html --- a/kallithea/templates/admin/repos/repo_edit_permissions.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/admin/repos/repo_edit_permissions.html Thu Oct 30 11:57:26 2014 -0700 @@ -40,7 +40,7 @@ %if r2p.user.username !='default': - ${_('revoke')} + ${_('revoke')} %endif @@ -65,7 +65,7 @@ - ${_('revoke')} + ${_('revoke')} diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/admin/settings/settings_hooks.html --- a/kallithea/templates/admin/settings/settings_hooks.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/admin/settings/settings_hooks.html Thu Oct 30 11:57:26 2014 -0700 @@ -32,7 +32,7 @@ ${h.text('hook_ui_value_new',hook.ui_value,size=60)} - + ${_('delete')}
diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/admin/user_groups/user_group_edit_advanced.html --- a/kallithea/templates/admin/user_groups/user_group_edit_advanced.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/admin/user_groups/user_group_edit_advanced.html Thu Oct 30 11:57:26 2014 -0700 @@ -17,7 +17,7 @@ ${h.form(h.url('users_group', id=c.user_group.users_group_id),method='delete')} ${h.end_form()} diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/admin/user_groups/user_group_edit_perms.html --- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html Thu Oct 30 11:57:26 2014 -0700 @@ -31,7 +31,7 @@ %if r2p.user.username !='default': - ${_('revoke')} + ${_('revoke')} %endif @@ -68,7 +68,7 @@ - ${_('revoke')} + ${_('revoke')} diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/admin/users/user_edit_advanced.html --- a/kallithea/templates/admin/users/user_edit_advanced.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/admin/users/user_edit_advanced.html Thu Oct 30 11:57:26 2014 -0700 @@ -19,7 +19,7 @@ ${h.form(h.url('delete_user', id=c.user.user_id),method='delete')} ${h.end_form()} diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/admin/users/user_edit_api_keys.html --- a/kallithea/templates/admin/users/user_edit_api_keys.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/admin/users/user_edit_api_keys.html Thu Oct 30 11:57:26 2014 -0700 @@ -38,7 +38,7 @@ ${h.hidden('del_api_key',api_key.api_key)} ${h.end_form()} diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/admin/users/user_edit_emails.html --- a/kallithea/templates/admin/users/user_edit_emails.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/admin/users/user_edit_emails.html Thu Oct 30 11:57:26 2014 -0700 @@ -15,7 +15,7 @@ ${h.form(url('edit_user_emails', id=c.user.user_id),method='delete')} ${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+"');")} ${h.end_form()} diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/admin/users/user_edit_ips.html --- a/kallithea/templates/admin/users/user_edit_ips.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/admin/users/user_edit_ips.html Thu Oct 30 11:57:26 2014 -0700 @@ -18,7 +18,7 @@ ${h.form(url('edit_user_ips', id=c.user.user_id),method='delete')} ${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: %s') % ip.ip_addr+"');")} ${h.end_form()} diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/data_table/_dt_elements.html --- a/kallithea/templates/data_table/_dt_elements.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/data_table/_dt_elements.html Thu Oct 30 11:57:26 2014 -0700 @@ -135,7 +135,7 @@
${h.form(h.url('repo', repo_name=repo_name),method='delete')} - + ${h.submit('remove_%s' % repo_name,_('delete'),class_="action_button", onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo_name+"');")} ${h.end_form()} @@ -163,7 +163,7 @@
${h.form(h.url('delete_user', id=user_id),method='delete')} - + ${h.submit('remove_',_('delete'),id="remove_user_%s" % user_id, class_="action_button", onclick="return confirm('"+_('Confirm to delete this user: %s') % username+"');")} ${h.end_form()} @@ -179,7 +179,7 @@
${h.form(h.url('users_group', id=user_group_id),method='delete')} - + ${h.submit('remove_',_('delete'),id="remove_group_%s" % user_group_id, class_="action_button", onclick="return confirm('"+_('Confirm to delete this user group: %s') % user_group_name+"');")} ${h.end_form()} @@ -195,7 +195,7 @@
${h.form(h.url('repos_group', group_name=repo_group_name),method='delete')} - + ${h.submit('remove_%s' % repo_group_name,_('delete'),class_="action_button", 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 -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/pullrequests/pullrequest.html --- a/kallithea/templates/pullrequests/pullrequest.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/pullrequests/pullrequest.html Thu Oct 30 11:57:26 2014 -0700 @@ -106,7 +106,7 @@
${member.firstname} ${member.lastname} (${_('owner')})
- +
diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/pullrequests/pullrequest_show.html --- a/kallithea/templates/pullrequests/pullrequest_show.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Thu Oct 30 11:57:26 2014 -0700 @@ -222,7 +222,7 @@ %if not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.user_id == c.authuser.user_id):
- +
%endif diff -r 5fecce90c3d6 -r b5795554c2ca kallithea/templates/pullrequests/pullrequest_show_my_data.html --- a/kallithea/templates/pullrequests/pullrequest_show_my_data.html Tue Jul 15 00:58:23 2014 -0500 +++ b/kallithea/templates/pullrequests/pullrequest_show_my_data.html Thu Oct 30 11:57:26 2014 -0700 @@ -22,7 +22,13 @@ (${_('Closed')}) %endif ${h.form(url('pullrequest_delete', repo_name=pull_request.other_repo.repo_name, pull_request_id=pull_request.pull_request_id),method='delete', style="display:inline-block")} - ${h.submit('remove_%s' % pull_request.pull_request_id, '', title=_('Delete Pull Request'),class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")} + ${h.end_form()}