Changeset - b5795554c2ca
[Not reviewed]
default
0 25 0
Sean Farley - 11 years ago 2014-10-30 19:57:26
sean.michael.farley@gmail.com
icon-remove: use new icon-minus-circled instead

To remove the css that set the background of the submit input (h.submit), the
element needed to be changed to <button>.
25 files changed with 36 insertions and 45 deletions:
0 comments (0 inline, 0 general)
kallithea/lib/helpers.py
Show inline comments
 
@@ -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):
kallithea/public/css/contextbar.css
Show inline comments
 
@@ -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-'] {
kallithea/public/css/style.css
Show inline comments
 
@@ -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;
kallithea/public/js/base.js
Show inline comments
 
@@ -1479,8 +1479,8 @@ var addReviewMember = function(id,fname,
 
        '         <div style="float:left;">{1}</div>\n'+
 
        '         <input type="hidden" value="{2}" name="review_members" />\n'+
 
        '         <div class="reviewer_member_remove action_button" onclick="removeReviewMember({2})">\n'+
 
        '             <i class="icon-remove-sign" style="color: #FF4444;"></i>\n'+
 
        '         </div> *\n'+
 
        '             <i class="icon-minus-circled" style="color: #FF4444;"></i>\n'+
 
        '         </div>\n'+
 
        '       </div>\n'+
 
        '     </li>\n'
 
        ).format(gravatar_link, displayname, id);
kallithea/templates/admin/my_account/my_account_api_keys.html
Show inline comments
 
@@ -38,7 +38,7 @@
 
                    ${h.hidden('del_api_key',api_key.api_key)}
 
                    <button class="btn btn-mini btn-danger" type="submit"
 
                            onclick="return confirm('${_('Confirm to remove this api key: %s') % api_key.api_key}');">
 
                        <i class="icon-remove-sign"></i>
 
                        <i class="icon-minus-circled"></i>
 
                        ${_('remove')}
 
                    </button>
 
                ${h.end_form()}
kallithea/templates/admin/my_account/my_account_emails.html
Show inline comments
 
@@ -15,7 +15,7 @@
 
            <td>
 
                ${h.form(url('my_account_emails'),method='delete')}
 
                    ${h.hidden('del_email_id',em.email_id)}
 
                    <i class="icon-remove-sign" style="color:#FF4444"></i>
 
                    <i class="icon-minus-circled" style="color:#FF4444"></i>
 
                    ${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()}
kallithea/templates/admin/notifications/notifications_data.html
Show inline comments
 
@@ -17,7 +17,7 @@ unread = lambda n:{False:'unread'}.get(n
 

	
 
      </div>
 
      <div class="delete-notifications">
 
        <span id="${notification.notification.notification_id}" class="delete-notification"><i class="icon-minus-sign" id="yui-gen24" style="color: #b94a48; padding: 2px;"></i></span>
 
        <span id="${notification.notification.notification_id}" class="delete-notification"><i class="icon-minus-circled" id="yui-gen24" style="color: #b94a48; padding: 2px;"></i></span>
 
      </div>
 
      %if not notification.read:
 
      <div class="read-notifications">
kallithea/templates/admin/notifications/show_notification.html
Show inline comments
 
@@ -34,7 +34,7 @@
 
              ${c.notification.description}
 
          </div>
 
          <div class="delete-notifications">
 
            <span id="${c.notification.notification_id}" class="delete-notification action"><i class="icon-minus-sign" id="yui-gen24"></i></span>
 
            <span id="${c.notification.notification_id}" class="delete-notification action"><i class="icon-minus-circled" id="yui-gen24"></i></span>
 
          </div>
 
        </div>
 
        <div class="notification-body">
kallithea/templates/admin/permissions/permissions_ips.html
Show inline comments
 
@@ -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')}
 
                    <i class="icon-remove-sign" style="color:#FF4444"></i> ${h.submit('remove_',_('delete'),id="remove_ip_%s" % ip.ip_id,
 
                    <i class="icon-minus-circled" style="color:#FF4444"></i> ${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()}
 
              </td>
kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html
Show inline comments
 
@@ -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)}');">
 
        <i class="icon-remove-sign"></i>
 
        <i class="icon-minus-circled"></i>
 
        ${_('Delete this repository group')}
 
    </button>
 
${h.end_form()}
kallithea/templates/admin/repo_groups/repo_group_edit_perms.html
Show inline comments
 
@@ -31,7 +31,7 @@ ${h.form(url('edit_repo_group_perms', gr
 
                        <td>
 
                          %if r2p.user.username !='default':
 
                            <span style="color:#da4f49" class="action_button" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')">
 
                             <i class="icon-remove"></i> ${_('revoke')}
 
                             <i class="icon-minus-circled"></i> ${_('revoke')}
 
                            </span>
 
                          %endif
 
                        </td>
 
@@ -68,7 +68,7 @@ ${h.form(url('edit_repo_group_perms', gr
 
                        </td>
 
                        <td>
 
                            <span style="color:#da4f49" class="action_button" onclick="ajaxActionRevoke(${g2p.users_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.users_group.users_group_name)}', '${g2p.users_group.users_group_name}')">
 
                            <i class="icon-remove"></i> ${_('revoke')}
 
                            <i class="icon-minus-circled"></i> ${_('revoke')}
 
                            </span>
 
                        </td>
 
                    </tr>
kallithea/templates/admin/repos/repo_edit_advanced.html
Show inline comments
 
@@ -78,7 +78,7 @@ ${h.form(url('repo', repo_name=c.repo_na
 
<div class="form">
 
    <button class="btn btn-small btn-danger" type="submit"
 
            onclick="return confirm('${_('Confirm to delete this repository: %s') % c.repo_name}');">
 
        <i class="icon-remove-sign"></i>
 
        <i class="icon-remove-circled"></i>
 
        ${_('Delete this Repository')}
 
    </button>
 
    %if c.repo_info.forks.count():
kallithea/templates/admin/repos/repo_edit_fields.html
Show inline comments
 
@@ -14,7 +14,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),method='delete')}
 
                  <i class="icon-remove-sign" style="color:#FF4444"></i>
 
                  <i class="icon-minus-circled" style="color:#FF4444"></i>
 
                  ${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()}
kallithea/templates/admin/repos/repo_edit_permissions.html
Show inline comments
 
@@ -40,7 +40,7 @@ ${h.form(url('edit_repo_perms_update', r
 
                        <td>
 
                          %if r2p.user.username !='default':
 
                            <span style="color:#da4f49" class="action_button" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')">
 
                            <i class="icon-remove"></i> ${_('revoke')}
 
                            <i class="icon-minus-circled"></i> ${_('revoke')}
 
                            </span>
 
                          %endif
 
                        </td>
 
@@ -65,7 +65,7 @@ ${h.form(url('edit_repo_perms_update', r
 
                        </td>
 
                        <td>
 
                            <span style="color:#da4f49" class="action_button" onclick="ajaxActionRevoke(${g2p.users_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.users_group.users_group_name)}', '${g2p.users_group.users_group_name}')">
 
                            <i class="icon-remove"></i> ${_('revoke')}
 
                            <i class="icon-minus-circled"></i> ${_('revoke')}
 
                            </span>
 
                        </td>
 
                    </tr>
kallithea/templates/admin/settings/settings_hooks.html
Show inline comments
 
@@ -32,7 +32,7 @@ ${h.form(url('admin_settings_hooks'), me
 
            ${h.text('hook_ui_value_new',hook.ui_value,size=60)}
 
            <span class="action_button"
 
            onclick="ajaxActionHook(${hook.ui_id},'${'id%s' % hook.ui_id }')">
 
            <i class="icon-remove-sign" style="color:#FF4444"></i>
 
            <i class="icon-minus-circled" style="color:#FF4444"></i>
 
            ${_('delete')}
 
            </span>
 
        </div>
kallithea/templates/admin/user_groups/user_group_edit_advanced.html
Show inline comments
 
@@ -17,7 +17,7 @@
 
${h.form(h.url('users_group', id=c.user_group.users_group_id),method='delete')}
 
    <button class="btn btn-small btn-danger" type="submit"
 
            onclick="return confirm('${_('Confirm to delete this user group: %s') % c.user_group.users_group_name}');">
 
        <i class="icon-remove-sign"></i>
 
        <i class="icon-minus-circled"></i>
 
        ${_('Delete this user group')}
 
    </button>
 
${h.end_form()}
kallithea/templates/admin/user_groups/user_group_edit_perms.html
Show inline comments
 
@@ -31,7 +31,7 @@ ${h.form(url('edit_user_group_perms', id
 
                        <td>
 
                          %if r2p.user.username !='default':
 
                            <span style="color:#da4f49" class="action_button" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')">
 
                             <i class="icon-remove"></i> ${_('revoke')}
 
                             <i class="icon-minus-circled"></i> ${_('revoke')}
 
                            </span>
 
                          %endif
 
                        </td>
 
@@ -68,7 +68,7 @@ ${h.form(url('edit_user_group_perms', id
 
                        </td>
 
                        <td>
 
                            <span style="color:#da4f49" class="action_button" onclick="ajaxActionRevoke(${g2p.user_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.user_group.users_group_name)}', '${g2p.user_group.users_group_name}')">
 
                            <i class="icon-remove"></i> ${_('revoke')}
 
                            <i class="icon-minus-circled"></i> ${_('revoke')}
 
                            </span>
 
                        </td>
 
                    </tr>
kallithea/templates/admin/users/user_edit_advanced.html
Show inline comments
 
@@ -19,7 +19,7 @@
 
${h.form(h.url('delete_user', id=c.user.user_id),method='delete')}
 
    <button class="btn btn-small btn-danger" type="submit"
 
            onclick="return confirm('${_('Confirm to delete this user: %s') % c.user.username}');">
 
        <i class="icon-remove-sign"></i>
 
        <i class="icon-minus-circled"></i>
 
        ${_('Delete this user')}
 
    </button>
 
${h.end_form()}
kallithea/templates/admin/users/user_edit_api_keys.html
Show inline comments
 
@@ -38,7 +38,7 @@
 
                    ${h.hidden('del_api_key',api_key.api_key)}
 
                    <button class="btn btn-mini btn-danger" type="submit"
 
                            onclick="return confirm('${_('Confirm to remove this api key: %s') % api_key.api_key}');">
 
                        <i class="icon-remove-sign"></i>
 
                        <i class="icon-minus-circled"></i>
 
                        ${_('remove')}
 
                    </button>
 
                ${h.end_form()}
kallithea/templates/admin/users/user_edit_emails.html
Show inline comments
 
@@ -15,7 +15,7 @@
 
            <td>
 
                ${h.form(url('edit_user_emails', id=c.user.user_id),method='delete')}
 
                    ${h.hidden('del_email_id',em.email_id)}
 
                    <i class="icon-remove-sign" style="color:#FF4444"></i>
 
                    <i class="icon-minus-circled" style="color:#FF4444"></i>
 
                    ${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()}
kallithea/templates/admin/users/user_edit_ips.html
Show inline comments
 
@@ -18,7 +18,7 @@
 
            <td>
 
                ${h.form(url('edit_user_ips', id=c.user.user_id),method='delete')}
 
                    ${h.hidden('del_ip_id',ip.ip_id)}
 
                    <i class="icon-remove-sign" style="color:#FF4444"></i>
 
                    <i class="icon-minus-circled" style="color:#FF4444"></i>
 
                    ${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()}
kallithea/templates/data_table/_dt_elements.html
Show inline comments
 
@@ -135,7 +135,7 @@
 
    </div>
 
    <div style="float:left" class="grid_delete">
 
      ${h.form(h.url('repo', repo_name=repo_name),method='delete')}
 
        <i class="icon-remove-sign" style="color:#FF4444"></i>
 
        <i class="icon-minus-circled" style="color:#FF4444"></i>
 
        ${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 @@
 
 </div>
 
 <div style="float:left" class="grid_delete">
 
  ${h.form(h.url('delete_user', id=user_id),method='delete')}
 
    <i class="icon-remove-sign" style="color:#FF4444"></i>
 
    <i class="icon-minus-circled" style="color:#FF4444"></i>
 
    ${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 @@
 
 </div>
 
 <div style="float:left" class="grid_delete">
 
    ${h.form(h.url('users_group', id=user_group_id),method='delete')}
 
      <i class="icon-remove-sign" style="color:#FF4444"></i>
 
      <i class="icon-minus-circled" style="color:#FF4444"></i>
 
      ${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 @@
 
 </div>
 
 <div style="float:left" class="grid_delete">
 
    ${h.form(h.url('repos_group', group_name=repo_group_name),method='delete')}
 
        <i class="icon-remove-sign" style="color:#FF4444"></i>
 
        <i class="icon-minus-circled" style="color:#FF4444"></i>
 
        ${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()}
kallithea/templates/pullrequests/pullrequest.html
Show inline comments
 
@@ -106,7 +106,7 @@ ${self.repo_context_bar('showpullrequest
 
                      <div style="float:left">${member.firstname} ${member.lastname} (${_('owner')})</div>
 
                      <input type="hidden" value="${member.user_id}" name="review_members" />
 
                      <span class="action_button" style="padding: 3px" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">
 
                          <i class="icon-remove-sign" style="color: #FF4444;"></i>
 
                          <i class="icon-remove-circled" style="color: #FF4444;"></i>
 
                      </span>
 
                    </div>
 
                  </li>
kallithea/templates/pullrequests/pullrequest_show.html
Show inline comments
 
@@ -222,7 +222,7 @@ ${self.repo_context_bar('showpullrequest
 
                  <input type="hidden" value="${member.user_id}" name="review_members" />
 
                  %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):
 
                  <div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">
 
                      <i class="icon-remove-sign" style="color: #FF4444;"></i>
 
                      <i class="icon-minus-circled" style="color: #FF4444;"></i>
 
                  </div>
 
                  %endif
 
                </div>
kallithea/templates/pullrequests/pullrequest_show_my_data.html
Show inline comments
 
@@ -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')+"');")}
 
            <button class="action_button"
 
                    id="remove_${pull_request.pull_request_id}"
 
                    name="remove_${pull_request.pull_request_id}"
 
                    title="${_('Delete Pull Request')}"
 
                    onclick="return confirm('${_('Confirm to delete this pull request')}');">
 
              <i class="icon-minus-circled"></i>
 
            </button>
 
            ${h.end_form()}
 
        </div>
 
      </li>
0 comments (0 inline, 0 general)