Changeset - 91182a358fb3
[Not reviewed]
default
0 2 0
Mads Kiilerich - 8 years ago 2017-08-14 00:40:04
mads@kiilerich.com
templates: drop odd grid_edit and grid_delete classes

We really should have both buttons inside the same float-left so they get
proper spacing ... but that doesn't work when one is wrapped in a form ...
2 files changed with 8 insertions and 12 deletions:
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
Show inline comments
 
@@ -3220,52 +3220,48 @@ body table.dataTable thead .sorting_desc
 
}
 

	
 
.dataTables_wrapper .dataTables_paginate {
 
  padding-top: 0;
 
}
 

	
 
.dataTables_wrapper .dataTables_paginate .paginate_button {
 
    padding: 3px 10px;
 
}
 

	
 
.dataTables_wrapper .dataTables_paginate > a.paginate_button {
 
  padding-top: 1px;
 
  border: 0 !important;
 
}
 

	
 
.dataTables_wrapper label {
 
    margin-bottom: 0;
 
    font-weight: inherit;
 
}
 

	
 
.text-muted {
 
    color: #777777;
 
}
 

	
 
.grid_edit a {
 
    text-decoration: none;
 
}
 

	
 
.changes_txt {
 
    clear: both;
 
}
 

	
 
.text-nowrap {
 
    white-space: nowrap;
 
}
 

	
 
div.codeblock div.code-header div.author {
 
    height: auto;
 
    min-height: 25px;
 
}
 

	
 
ul.user_group_member li {
 
    clear: both;
 
}
 

	
 
#content div.panel .changelog-panel > .changelog-heading,
 
#content div.panel .changelog-panel > ul.pagination {
 
    margin-left: 100px;
 
}
 

	
 
textarea.commit-message {
 
    width: 100% !important;
kallithea/templates/data_table/_dt_elements.html
Show inline comments
 
@@ -44,115 +44,115 @@
 
  %else:
 
      ${_('No changesets yet')}
 
  %endif
 
  </div>
 
</%def>
 

	
 
<%def name="rss(name)">
 
  %if request.authuser.username != 'default':
 
    <a title="${_('Subscribe to %s rss feed')% name}" href="${h.url('rss_feed_home',repo_name=name,api_key=request.authuser.api_key)}"><i class="icon-rss-squared"></i></a>
 
  %else:
 
    <a title="${_('Subscribe to %s rss feed')% name}" href="${h.url('rss_feed_home',repo_name=name)}"><i class="icon-rss-squared"></i></a>
 
  %endif
 
</%def>
 

	
 
<%def name="atom(name)">
 
  %if request.authuser.username != 'default':
 
    <a title="${_('Subscribe to %s atom feed')% name}" href="${h.url('atom_feed_home',repo_name=name,api_key=request.authuser.api_key)}"><i class="icon-rss-squared"></i></a>
 
  %else:
 
    <a title="${_('Subscribe to %s atom feed')% name}" href="${h.url('atom_feed_home',repo_name=name)}"><i class="icon-rss-squared"></i></a>
 
  %endif
 
</%def>
 

	
 
<%def name="repo_actions(repo_name, super_user=True)">
 
  <div>
 
    <div class="grid_edit pull-left">
 
    <div class="pull-left">
 
      <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">
 
    <div class="pull-left">
 
      ${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')}
 
        </button>
 
      ${h.end_form()}
 
    </div>
 
  </div>
 
</%def>
 

	
 
<%def name="repo_state(repo_state)">
 
  <div>
 
    %if repo_state == u'repo_state_pending':
 
        <div class="label label-info">${_('Creating')}</div>
 
    %elif repo_state == u'repo_state_created':
 
        <div class="label label-success">${_('Created')}</div>
 
    %else:
 
        <div class="label label-danger" title="${repo_state}">invalid</div>
 
    %endif
 
  </div>
 
</%def>
 

	
 
<%def name="user_actions(user_id, username)">
 
 <div class="grid_edit pull-left">
 
 <div class="pull-left">
 
   <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">
 
 <div class="pull-left">
 
  ${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')}
 
    </button>
 
  ${h.end_form()}
 
 </div>
 
</%def>
 

	
 
<%def name="user_group_actions(user_group_id, user_group_name)">
 
 <div class="grid_edit pull-left">
 
 <div class="pull-left">
 
    <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">
 
 <div class="pull-left">
 
    ${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')}
 
      </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">
 
 <div class="pull-left">
 
    <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">
 
 <div class="pull-left">
 
    ${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')}
 
      </button>
 
    ${h.end_form()}
 
 </div>
 
</%def>
 

	
 
<%def name="user_name(user_id, username)">
 
    ${h.link_to(username,h.url('edit_user', id=user_id))}
 
</%def>
 

	
 
<%def name="repo_group_name(repo_group_name, children_groups)">
 
  <div class="text-nowrap">
 
  <a href="${h.url('repos_group_home',group_name=repo_group_name)}">
 
    <i class="icon-folder" title="${_('Repository group')}"></i> ${h.literal(' &raquo; '.join(children_groups))}</a>
 
  </div>
 
</%def>
 

	
 
<%def name="user_group_name(user_group_id, user_group_name)">
 
  <div class="text-nowrap">
 
  <a href="${h.url('edit_users_group', id=user_group_id)}">
 
    <i class="icon-users" title="${_('User group')}"></i> ${user_group_name}</a>
0 comments (0 inline, 0 general)