diff --git a/kallithea/lib/helpers.py b/kallithea/lib/helpers.py --- a/kallithea/lib/helpers.py +++ b/kallithea/lib/helpers.py @@ -590,7 +590,7 @@ def boolicon(value): if value: return HTML.tag('i', class_="icon-ok-sign") else: - return HTML.tag('i', class_="icon-minus-sign") + return HTML.tag('i', class_="icon-minus-circled") def action_parser(user_log, feed=False, parse_cs=False): diff --git a/kallithea/public/css/contextbar.css b/kallithea/public/css/contextbar.css --- a/kallithea/public/css/contextbar.css +++ b/kallithea/public/css/contextbar.css @@ -12,11 +12,8 @@ i.icon-git { background-image: url('../i i.icon-hg { background-image: url('../images/icons/hgicon.png');} i.icon-refresh { background-image: url('../images/icons/arrow_refresh.png');} i.icon-pencil { background-image: url('../images/icons/application_form_edit.png');} -i.icon-remove { background-image: url('../images/icons/delete.png');} -i.icon-remove-sign { background-image: url('../images/icons/delete.png');} i.icon-resize-vertical { background-image: url('../images/icons/text_align_left.png');} i.icon-ok-sign { background-image: url('../images/icons/tick.png');} -i.icon-minus-sign { background-image: url('../images/icons/delete.png');} i.icon-disabled { background-image: url('../images/icons/shading.png');} /* todo: use instead of minus sign */ i[class^='icon-'] { 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 @@ -540,11 +540,6 @@ div.header img { background-image: url("../images/icons/arrow_join.png") ; } -#header #header-inner #quick li ul li a.delete, -#header #header-inner #quick li ul li a.delete:hover { - background-image: url("../images/icons/delete.png"); -} - .groups_breadcrumbs a { color: #fff; } @@ -3301,13 +3296,6 @@ table.code-browser i[class^='icon-'] { text-align: left; } -.delete_icon { - background: url("../images/icons/delete.png") no-repeat scroll 3px; - padding-left: 20px; - padding-top: 0px; - text-align: left; -} - .refresh_icon { background: url("../images/icons/arrow_refresh.png") no-repeat scroll 3px; diff --git a/kallithea/public/js/base.js b/kallithea/public/js/base.js --- a/kallithea/public/js/base.js +++ b/kallithea/public/js/base.js @@ -1479,8 +1479,8 @@ var addReviewMember = function(id,fname, '
{1}
\n'+ ' \n'+ '
\n'+ - ' \n'+ - '
*\n'+ + ' \n'+ + ' \n'+ ' \n'+ ' \n' ).format(gravatar_link, displayname, id); diff --git a/kallithea/templates/admin/my_account/my_account_api_keys.html b/kallithea/templates/admin/my_account/my_account_api_keys.html --- a/kallithea/templates/admin/my_account/my_account_api_keys.html +++ b/kallithea/templates/admin/my_account/my_account_api_keys.html @@ -38,7 +38,7 @@ ${h.hidden('del_api_key',api_key.api_key)} ${h.end_form()} 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 @@ -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 --git a/kallithea/templates/admin/notifications/notifications_data.html b/kallithea/templates/admin/notifications/notifications_data.html --- a/kallithea/templates/admin/notifications/notifications_data.html +++ b/kallithea/templates/admin/notifications/notifications_data.html @@ -17,7 +17,7 @@ unread = lambda n:{False:'unread'}.get(n
- +
%if not notification.read:
diff --git a/kallithea/templates/admin/notifications/show_notification.html b/kallithea/templates/admin/notifications/show_notification.html --- a/kallithea/templates/admin/notifications/show_notification.html +++ b/kallithea/templates/admin/notifications/show_notification.html @@ -34,7 +34,7 @@ ${c.notification.description}
- +
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 @@ -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 --git a/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html b/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html @@ -21,7 +21,7 @@ ${h.form(h.url('repos_group', group_name 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 --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 @@ -31,7 +31,7 @@ ${h.form(url('edit_repo_group_perms', gr %if r2p.user.username !='default': - ${_('revoke')} + ${_('revoke')} %endif @@ -68,7 +68,7 @@ ${h.form(url('edit_repo_group_perms', gr - ${_('revoke')} + ${_('revoke')} diff --git a/kallithea/templates/admin/repos/repo_edit_advanced.html b/kallithea/templates/admin/repos/repo_edit_advanced.html --- a/kallithea/templates/admin/repos/repo_edit_advanced.html +++ b/kallithea/templates/admin/repos/repo_edit_advanced.html @@ -78,7 +78,7 @@ ${h.form(url('repo', repo_name=c.repo_na
%if c.repo_info.forks.count(): 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 @@ -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 --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 @@ -40,7 +40,7 @@ ${h.form(url('edit_repo_perms_update', r %if r2p.user.username !='default': - ${_('revoke')} + ${_('revoke')} %endif @@ -65,7 +65,7 @@ ${h.form(url('edit_repo_perms_update', r - ${_('revoke')} + ${_('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 @@ -32,7 +32,7 @@ ${h.form(url('admin_settings_hooks'), me ${h.text('hook_ui_value_new',hook.ui_value,size=60)} - + ${_('delete')}
diff --git a/kallithea/templates/admin/user_groups/user_group_edit_advanced.html b/kallithea/templates/admin/user_groups/user_group_edit_advanced.html --- a/kallithea/templates/admin/user_groups/user_group_edit_advanced.html +++ b/kallithea/templates/admin/user_groups/user_group_edit_advanced.html @@ -17,7 +17,7 @@ ${h.form(h.url('users_group', id=c.user_group.users_group_id),method='delete')} ${h.end_form()} 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 @@ -31,7 +31,7 @@ ${h.form(url('edit_user_group_perms', id %if r2p.user.username !='default': - ${_('revoke')} + ${_('revoke')} %endif @@ -68,7 +68,7 @@ ${h.form(url('edit_user_group_perms', id - ${_('revoke')} + ${_('revoke')} diff --git a/kallithea/templates/admin/users/user_edit_advanced.html b/kallithea/templates/admin/users/user_edit_advanced.html --- a/kallithea/templates/admin/users/user_edit_advanced.html +++ b/kallithea/templates/admin/users/user_edit_advanced.html @@ -19,7 +19,7 @@ ${h.form(h.url('delete_user', id=c.user.user_id),method='delete')} ${h.end_form()} diff --git a/kallithea/templates/admin/users/user_edit_api_keys.html b/kallithea/templates/admin/users/user_edit_api_keys.html --- a/kallithea/templates/admin/users/user_edit_api_keys.html +++ b/kallithea/templates/admin/users/user_edit_api_keys.html @@ -38,7 +38,7 @@ ${h.hidden('del_api_key',api_key.api_key)} ${h.end_form()} 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 @@ -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 --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 @@ -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 --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 @@ -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 --git a/kallithea/templates/pullrequests/pullrequest.html b/kallithea/templates/pullrequests/pullrequest.html --- a/kallithea/templates/pullrequests/pullrequest.html +++ b/kallithea/templates/pullrequests/pullrequest.html @@ -106,7 +106,7 @@ ${self.repo_context_bar('showpullrequest
${member.firstname} ${member.lastname} (${_('owner')})
- +
diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html --- a/kallithea/templates/pullrequests/pullrequest_show.html +++ b/kallithea/templates/pullrequests/pullrequest_show.html @@ -222,7 +222,7 @@ ${self.repo_context_bar('showpullrequest %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 --git a/kallithea/templates/pullrequests/pullrequest_show_my_data.html b/kallithea/templates/pullrequests/pullrequest_show_my_data.html --- a/kallithea/templates/pullrequests/pullrequest_show_my_data.html +++ b/kallithea/templates/pullrequests/pullrequest_show_my_data.html @@ -22,7 +22,13 @@ ${h.checkbox('show_closed',checked="chec (${_('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()}