Mercurial > kallithea
changeset 6809:4bd2c3590a22
templates: more consistently put icons inside 'Delete' and 'Edit' buttons
- on repo, repo group, user and user group list page.
For now, we keep the text and keep the button visible.
The Edit button was typically a submit button, not inside a form but inside an
<a>. It did thus not really trigger a submit but just followed the link.
Extracted by Mads Kiilerich.
author | domruf <dominikruf@gmail.com> |
---|---|
date | Mon, 26 Jun 2017 22:28:58 +0200 |
parents | 71033bd37b4c |
children | 91182a358fb3 |
files | kallithea/templates/data_table/_dt_elements.html |
diffstat | 1 files changed, 24 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/templates/data_table/_dt_elements.html Tue Aug 08 21:35:20 2017 +0200 +++ b/kallithea/templates/data_table/_dt_elements.html Mon Jun 26 22:28:58 2017 +0200 @@ -66,15 +66,16 @@ <%def name="repo_actions(repo_name, super_user=True)"> <div> <div class="grid_edit pull-left"> - <a href="${h.url('edit_repo',repo_name=repo_name)}" title="${_('Edit')}"> - <i class="icon-pencil"></i> ${h.submit('edit_%s' % repo_name,_('Edit'),class_="btn btn-default btn-xs")} + <a href="${h.url('edit_repo',repo_name=repo_name)}" title="${_('Edit')}" class="btn btn-default btn-xs"> + <i class="icon-pencil"></i> ${_('Edit')} </a> </div> <div class="grid_delete pull-left"> ${h.form(h.url('delete_repo', repo_name=repo_name))} - <i class="icon-minus-circled"></i> - ${h.submit('remove_%s' % repo_name,_('Delete'),class_="btn btn-default btn-xs", - onclick="return confirm('"+_('Confirm to delete this repository: %s') % 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')} + </button> ${h.end_form()} </div> </div> @@ -94,45 +95,48 @@ <%def name="user_actions(user_id, username)"> <div class="grid_edit pull-left"> - <a href="${h.url('edit_user',id=user_id)}" title="${_('Edit')}"> - <i class="icon-pencil"></i> ${h.submit('edit_%s' % username,_('Edit'),class_="btn btn-default btn-xs")} + <a href="${h.url('edit_user',id=user_id)}" title="${_('Edit')}" class="btn btn-default btn-xs"> + <i class="icon-pencil"></i> ${_('Edit')} </a> </div> <div class="grid_delete pull-left"> ${h.form(h.url('delete_user', id=user_id))} - <i class="icon-minus-circled"></i> - ${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+"');")} + <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')} + </button> ${h.end_form()} </div> </%def> <%def name="user_group_actions(user_group_id, user_group_name)"> <div class="grid_edit pull-left"> - <a href="${h.url('edit_users_group', id=user_group_id)}" title="${_('Edit')}"> - <i class="icon-pencil"></i> ${h.submit('edit_%s' % user_group_name,_('Edit'),class_="btn btn-default btn-xs", id_="submit_user_group_edit")} + <a href="${h.url('edit_users_group', id=user_group_id)}" title="${_('Edit')}" class="btn btn-default btn-xs"> + <i class="icon-pencil"></i> ${_('Edit')} </a> </div> <div class="grid_delete pull-left"> ${h.form(h.url('delete_users_group', id=user_group_id))} - <i class="icon-minus-circled"></i> - ${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+"');")} + <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')} + </button> ${h.end_form()} </div> </%def> <%def name="repo_group_actions(repo_group_id, repo_group_name, gr_count)"> <div class="grid_edit pull-left"> - <a href="${h.url('edit_repo_group',group_name=repo_group_name)}" title="${_('Edit')}"> - <i class="icon-pencil"></i> ${h.submit('edit_%s' % repo_group_name, _('Edit'),class_="btn btn-default btn-xs")} + <a href="${h.url('edit_repo_group',group_name=repo_group_name)}" title="${_('Edit')}" class="btn btn-default btn-xs"> + <i class="icon-pencil"></i> ${_('Edit')} </a> </div> <div class="grid_delete pull-left"> ${h.form(h.url('delete_repo_group', group_name=repo_group_name))} - <i class="icon-minus-circled"></i> - ${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)+"');")} + <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')} + </button> ${h.end_form()} </div> </%def>