# HG changeset patch # User Mads Kiilerich # Date 1524437053 -7200 # Node ID 11f82976103278d3064d10beb1429b5e9513a924 # Parent af938280e76aae5109f9fc3e78c0366edee1d4e8 repos: clean up table button markup to give proper spacing Before, it used multiple divs with pull-left to make plain buttons and buttons within forms render horizontally. But by doing so, they were rendered without any space between the buttons. Instead, style forms after buttons to be shown inline. The whitespace will thus give the necessary spacing. The redundant divs are thus removed. diff -r af938280e76a -r 11f829761032 kallithea/public/less/style.less --- a/kallithea/public/less/style.less Mon Apr 23 00:44:13 2018 +0200 +++ b/kallithea/public/less/style.less Mon Apr 23 00:44:13 2018 +0200 @@ -155,6 +155,15 @@ } } +/* _dt_elements.html styling - some submit buttons have their own form but should still be shown inline */ +table.dataTable td > .btn + form { + display: inline; +} + +table.dataTable .dt_repo_pending { + opacity: 0.5; +} + /* language bars (summary page) */ #lang_stats { .progress-bar { @@ -195,10 +204,6 @@ padding-right: 0.3em; } -.dt_repo_pending { - opacity: 0.5; -} - div.panel-primary { border: none; } diff -r af938280e76a -r 11f829761032 kallithea/templates/data_table/_dt_elements.html --- a/kallithea/templates/data_table/_dt_elements.html Mon Apr 23 00:44:13 2018 +0200 +++ b/kallithea/templates/data_table/_dt_elements.html Mon Apr 23 00:44:13 2018 +0200 @@ -36,13 +36,11 @@ <%def name="revision(name,rev,tip,author,last_msg)"> -
%if rev >= 0: ${'r%s:%s' % (rev,h.short_id(tip))} %else: ${_('No changesets yet')} %endif -
<%def name="rss(name)"> @@ -62,25 +60,18 @@ <%def name="repo_actions(repo_name)"> -
- -
${h.form(h.url('delete_repo', repo_name=repo_name))} ${h.end_form()} -
-
<%def name="repo_state(repo_state)"> -
%if repo_state == u'repo_state_pending':
${_('Creating')}
%elif repo_state == u'repo_state_created': @@ -88,39 +79,30 @@ %else:
invalid
%endif -
<%def name="user_actions(user_id, username)"> -
${_('Edit')} -
-
${h.form(h.url('delete_user', id=user_id))} ${h.end_form()} -
<%def name="user_group_actions(user_group_id, user_group_name)"> -
${_('Edit')} -
-
${h.form(h.url('delete_users_group', id=user_group_id))} ${h.end_form()} -
<%def name="group_name_html(group_name,name)"> @@ -131,19 +113,15 @@ <%def name="repo_group_actions(repo_group_id, repo_group_name, gr_count)"> -
${_('Edit')} -
-
${h.form(h.url('delete_repo_group', group_name=repo_group_name))} ${h.end_form()} -
<%def name="user_name(user_id, username)">