Mercurial > kallithea
changeset 7093:73406e83b038
icons: replace icon-minus-circled with icon-trashcan if it means deleting
A trashcan represents represents much better a delete action then a circled
minus does.
line wrap: on
line diff
--- a/kallithea/templates/admin/my_account/my_account_api_keys.html Sun Jan 21 02:49:15 2018 +0100 +++ b/kallithea/templates/admin/my_account/my_account_api_keys.html Thu Oct 12 22:17:03 2017 +0200 @@ -37,7 +37,7 @@ ${h.hidden('del_api_key',api_key.api_key)} <button class="btn btn-danger btn-xs" type="submit" onclick="return confirm('${_('Confirm to remove this API key: %s') % api_key.api_key}');"> - <i class="icon-minus-circled"></i> + <i class="icon-trashcan"></i> ${_('Remove')} </button> ${h.end_form()}
--- a/kallithea/templates/admin/my_account/my_account_emails.html Sun Jan 21 02:49:15 2018 +0100 +++ b/kallithea/templates/admin/my_account/my_account_emails.html Thu Oct 12 22:17:03 2017 +0200 @@ -19,7 +19,7 @@ <td> ${h.form(url('my_account_emails_delete'))} ${h.hidden('del_email_id',em.email_id)} - <i class="icon-minus-circled"></i> + <i class="icon-trashcan"></i> ${h.submit('remove_',_('Delete'),id="remove_email_%s" % em.email_id, class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this email: %s') % em.email+"');")} ${h.end_form()}
--- a/kallithea/templates/admin/notifications/notifications_data.html Sun Jan 21 02:49:15 2018 +0100 +++ b/kallithea/templates/admin/notifications/notifications_data.html Thu Oct 12 22:17:03 2017 +0200 @@ -11,7 +11,7 @@ %if not notification.read: <button type="button" id="${notification.notification.notification_id}" class="btn btn-default btn-xs read-notification"><i class="icon-ok"></i> ${_('Mark as read')}</button> %endif - <button type="button" id="${notification.notification.notification_id}" class="btn btn-default btn-xs delete-notification"><i class="icon-minus-circled"></i> ${_('Delete')}</button> + <button type="button" id="${notification.notification.notification_id}" class="btn btn-default btn-xs delete-notification"><i class="icon-trashcan"></i> ${_('Delete')}</button> </span> </div> %endfor
--- a/kallithea/templates/admin/notifications/show_notification.html Sun Jan 21 02:49:15 2018 +0100 +++ b/kallithea/templates/admin/notifications/show_notification.html Thu Oct 12 22:17:03 2017 +0200 @@ -27,7 +27,7 @@ <span class="pull-left"> ${c.notification.description} </span> - <button type="button" id="${c.notification.notification_id}" class="delete-notification btn btn-default pull-right"><i class="icon-minus-circled"></i>${_('Delete')}</button> + <button type="button" id="${c.notification.notification_id}" class="delete-notification btn btn-default pull-right"><i class="icon-trashcan"></i>${_('Delete')}</button> </div> <div> %if c.notification.subject:
--- a/kallithea/templates/admin/permissions/permissions_ips.html Sun Jan 21 02:49:15 2018 +0100 +++ b/kallithea/templates/admin/permissions/permissions_ips.html Thu Oct 12 22:17:03 2017 +0200 @@ -8,7 +8,7 @@ ${h.form(url('edit_user_ips_delete', id=c.user.user_id))} ${h.hidden('del_ip_id',ip.ip_id)} ${h.hidden('default_user', 'True')} - <i class="icon-minus-circled"></i> ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id, + <i class="icon-trashcan"></i> ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id, class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")} ${h.end_form()} </td>
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html Sun Jan 21 02:49:15 2018 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html Thu Oct 12 22:17:03 2017 +0200 @@ -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)}');"> - <i class="icon-minus-circled"></i> + <i class="icon-trashcan"></i> ${_('Delete this repository group')} </button> ${h.end_form()}
--- a/kallithea/templates/admin/repos/repo_edit_advanced.html Sun Jan 21 02:49:15 2018 +0100 +++ b/kallithea/templates/admin/repos/repo_edit_advanced.html Thu Oct 12 22:17:03 2017 +0200 @@ -70,7 +70,7 @@ <div class="form"> <button class="btn btn-danger btn-sm" type="submit" onclick="return confirm('${_('Confirm to delete this repository: %s') % c.repo_name}');"> - <i class="icon-minus-circled"></i> + <i class="icon-trashcan"></i> ${_('Delete this Repository')} </button> %if c.repo_info.forks.count():
--- a/kallithea/templates/admin/repos/repo_edit_fields.html Sun Jan 21 02:49:15 2018 +0100 +++ b/kallithea/templates/admin/repos/repo_edit_fields.html Thu Oct 12 22:17:03 2017 +0200 @@ -15,7 +15,7 @@ <td>${field.field_type}</td> <td> ${h.form(url('delete_repo_fields', repo_name=c.repo_info.repo_name, field_id=field.repo_field_id))} - <i class="icon-minus-circled"></i> + <i class="icon-trashcan"></i> ${h.submit('remove_%s' % field.repo_field_id, _('Delete'), id="remove_field_%s" % field.repo_field_id, class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this field: %s') % field.field_key+"');")} ${h.end_form()}
--- a/kallithea/templates/admin/settings/settings_hooks.html Sun Jan 21 02:49:15 2018 +0100 +++ b/kallithea/templates/admin/settings/settings_hooks.html Thu Oct 12 22:17:03 2017 +0200 @@ -26,7 +26,7 @@ ${h.text('hook_ui_value_new',hook.ui_value,id=input_id,size=60,class_='form-control')} <button type="button" class="btn btn-default btn-xs" onclick="delete_hook(${hook.ui_id},'${'id%s' % hook.ui_id }')"> - <i class="icon-minus-circled"></i> + <i class="icon-trashcan"></i> ${_('Delete')} </button> </div>
--- a/kallithea/templates/admin/user_groups/user_group_edit_advanced.html Sun Jan 21 02:49:15 2018 +0100 +++ b/kallithea/templates/admin/user_groups/user_group_edit_advanced.html Thu Oct 12 22:17:03 2017 +0200 @@ -17,7 +17,7 @@ ${h.form(h.url('delete_users_group', id=c.user_group.users_group_id))} <button class="btn btn-danger btn-sm" type="submit" onclick="return confirm('${_('Confirm to delete this user group: %s') % c.user_group.users_group_name}');"> - <i class="icon-minus-circled"></i> + <i class="icon-trashcan"></i> ${_('Delete this user group')} </button> ${h.end_form()}
--- a/kallithea/templates/admin/users/user_edit_advanced.html Sun Jan 21 02:49:15 2018 +0100 +++ b/kallithea/templates/admin/users/user_edit_advanced.html Thu Oct 12 22:17:03 2017 +0200 @@ -19,7 +19,7 @@ ${h.form(h.url('delete_user', id=c.user.user_id))} <button class="btn btn-danger btn-sm" type="submit" onclick="return confirm('${_('Confirm to delete this user: %s') % c.user.username}');"> - <i class="icon-minus-circled"></i> + <i class="icon-trashcan"></i> ${_('Delete this user')} </button> ${h.end_form()}
--- a/kallithea/templates/admin/users/user_edit_api_keys.html Sun Jan 21 02:49:15 2018 +0100 +++ b/kallithea/templates/admin/users/user_edit_api_keys.html Thu Oct 12 22:17:03 2017 +0200 @@ -37,7 +37,7 @@ ${h.hidden('del_api_key',api_key.api_key)} <button class="btn btn-danger btn-xs" type="submit" onclick="return confirm('${_('Confirm to remove this API key: %s') % api_key.api_key}');"> - <i class="icon-minus-circled"></i> + <i class="icon-trashcan"></i> ${_('Remove')} </button> ${h.end_form()}
--- a/kallithea/templates/admin/users/user_edit_emails.html Sun Jan 21 02:49:15 2018 +0100 +++ b/kallithea/templates/admin/users/user_edit_emails.html Thu Oct 12 22:17:03 2017 +0200 @@ -19,7 +19,7 @@ <td> ${h.form(url('edit_user_emails_delete', id=c.user.user_id))} ${h.hidden('del_email_id',em.email_id)} - <i class="icon-minus-circled"></i> + <i class="icon-trashcan"></i> ${h.submit('remove_',_('Delete'),id="remove_email_%s" % em.email_id, class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this email: %s') % em.email+"');")} ${h.end_form()}
--- a/kallithea/templates/admin/users/user_edit_ips.html Sun Jan 21 02:49:15 2018 +0100 +++ b/kallithea/templates/admin/users/user_edit_ips.html Thu Oct 12 22:17:03 2017 +0200 @@ -17,7 +17,7 @@ <td> ${h.form(url('edit_user_ips_delete', id=c.user.user_id))} ${h.hidden('del_ip_id',ip.ip_id)} - <i class="icon-minus-circled"></i> + <i class="icon-trashcan"></i> ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id, class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")} ${h.end_form()}
--- a/kallithea/templates/data_table/_dt_elements.html Sun Jan 21 02:49:15 2018 +0100 +++ b/kallithea/templates/data_table/_dt_elements.html Thu Oct 12 22:17:03 2017 +0200 @@ -72,7 +72,7 @@ ${h.form(h.url('delete_repo', repo_name=repo_name))} <button name="${'remove_%s' % repo_name}" class="btn btn-default btn-xs" onclick="return confirm('${_('Confirm to delete this repository: %s') % repo_name}');"> - <i class="icon-minus-circled text-danger"></i> ${_('Delete')} + <i class="icon-trashcan"></i> ${_('Delete')} </button> ${h.end_form()} </div> @@ -101,7 +101,7 @@ ${h.form(h.url('delete_user', id=user_id))} <button id="${'remove_user_%s' % user_id}" name="${'remove_user_%s' % repo_name}" class="btn btn-default btn-xs" title="${_('Delete')}" onclick="return confirm('${_('Confirm to delete this user: %s') % username}');"> - <i class="icon-minus-circled text-danger"></i> ${_('Delete')} + <i class="icon-trashcan"></i> ${_('Delete')} </button> ${h.end_form()} </div> @@ -117,7 +117,7 @@ ${h.form(h.url('delete_users_group', id=user_group_id))} <button id="${'remove_group_%s' % user_group_id}" name="${'remove_user_%s' % repo_name}" class="btn btn-default btn-xs" title="${_('Delete')}" onclick="return confirm('${_('Confirm to delete this user group: %s') % user_group_name}');"> - <i class="icon-minus-circled text-danger"></i> ${_('Delete')} + <i class="icon-trashcan"></i> ${_('Delete')} </button> ${h.end_form()} </div> @@ -140,7 +140,7 @@ ${h.form(h.url('delete_repo_group', group_name=repo_group_name))} <button id="${'remove_%s' % repo_group_name}" name="${'remove_%s' % repo_group_name}" class="btn btn-default btn-xs" title="${_('Delete')}" 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)}')"> - <i class="icon-minus-circled text-danger"></i> ${_('Delete')} + <i class="icon-trashcan"></i> ${_('Delete')} </button> ${h.end_form()} </div>
--- a/kallithea/templates/pullrequests/pullrequest_data.html Sun Jan 21 02:49:15 2018 +0100 +++ b/kallithea/templates/pullrequests/pullrequest_data.html Thu Oct 12 22:17:03 2017 +0200 @@ -69,7 +69,7 @@ && ((${len(pr.comments)} == 0) || confirm('${_('Confirm again to delete this pull request with %s comments') % len(pr.comments)}')) "> - <i class="icon-minus-circled text-danger"></i> + <i class="icon-trashcan"></i> </button> ${h.end_form()} %endif