Mercurial > kallithea
changeset 7094:2d8f2a419edb
style: remove whitespace after icons
Where the additional spacing is needed, we already have a padding-right, so
these spaces are unnecessary. But more importantly they cause trouble if
text-decoration is used (i.e. underline on hover).
line wrap: on
line diff
--- a/kallithea/templates/admin/gists/index.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/admin/gists/index.html Sun Nov 05 19:25:51 2017 +0100 @@ -34,7 +34,7 @@ </div> %if request.authuser.username != 'default': <div class="pull-right"> - <a href="${h.url('new_gist')}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Create New Gist')}</a> + <a href="${h.url('new_gist')}" class="btn btn-success btn-xs"><i class="icon-plus"></i>${_('Create New Gist')}</a> </div> %endif </div>
--- a/kallithea/templates/admin/gists/show.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/admin/gists/show.html Sun Nov 05 19:25:51 2017 +0100 @@ -22,7 +22,7 @@ </div> %if request.authuser.username != 'default': <div class="pull-right"> - <a href="${h.url('new_gist')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Create New Gist')}</a> + <a href="${h.url('new_gist')}" class="btn btn-success btn-sm"><i class="icon-plus"></i>${_('Create New Gist')}</a> </div> %endif </div>
--- a/kallithea/templates/admin/notifications/notifications_data.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/admin/notifications/notifications_data.html Sun Nov 05 19:25:51 2017 +0100 @@ -9,9 +9,9 @@ </span> <span class="pull-right"> %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> + <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-trashcan"></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/permissions/permissions_ips.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/admin/permissions/permissions_ips.html Sun Nov 05 19:25:51 2017 +0100 @@ -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-trashcan"></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.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit.html Sun Nov 05 19:25:51 2017 +0100 @@ -26,7 +26,7 @@ ${self.breadcrumbs()} </div> <div class="pull-right"> - <a href="${h.url('new_repos_group', parent_group=c.repo_group.group_id)}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add Child Group')}</a> + <a href="${h.url('new_repos_group', parent_group=c.repo_group.group_id)}" class="btn btn-success btn-xs"><i class="icon-plus"></i>${_('Add Child Group')}</a> </div> </div>
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html Sun Nov 05 19:25:51 2017 +0100 @@ -31,7 +31,7 @@ <td> %if r2p.user.username !='default': <button type="button" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')"> - <i class="icon-minus-circled"></i> ${_('Revoke')} + <i class="icon-minus-circled"></i>${_('Revoke')} </button> %endif </td> @@ -44,7 +44,7 @@ ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)} ${r2p.user.username if r2p.user.username != 'default' else _('Default')} </td> - <td><i class="icon-user"></i> ${_('Admin')}</td> + <td><i class="icon-user"></i>${_('Admin')}</td> %endif </tr> %endfor @@ -68,7 +68,7 @@ </td> <td> <button type="button" class="btn btn-default btn-xs" 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-minus-circled"></i> ${_('Revoke')} + <i class="icon-minus-circled"></i>${_('Revoke')} </button> </td> </tr> @@ -78,7 +78,7 @@ <tr> <td colspan="6"> <button type="button" id="add_perm" class="btn btn-link btn-xs"> - <i class="icon-plus"></i> ${_('Add new')} + <i class="icon-plus"></i>${_('Add new')} </button> </td> </tr>
--- a/kallithea/templates/admin/repo_groups/repo_groups.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_groups.html Sun Nov 05 19:25:51 2017 +0100 @@ -22,7 +22,7 @@ </div> <div class="pull-right"> %if h.HasPermissionAny('hg.admin')(): - <a href="${h.url('new_repos_group')}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add Repository Group')}</a> + <a href="${h.url('new_repos_group')}" class="btn btn-success btn-xs"><i class="icon-plus"></i>${_('Add Repository Group')}</a> %endif </div> </div>
--- a/kallithea/templates/admin/repos/repo_edit_permissions.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_permissions.html Sun Nov 05 19:25:51 2017 +0100 @@ -20,7 +20,7 @@ ${_('Private Repository')} </span> </td> - <td class="private_repo_msg"><i class="icon-user"></i> ${_('Default')}</td> + <td class="private_repo_msg"><i class="icon-user"></i>${_('Default')}</td> </tr> %else: <tr id="id${id(r2p.user.username)}"> @@ -39,7 +39,7 @@ <td> %if r2p.user.username !='default': <button type="button" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')"> - <i class="icon-minus-circled"></i> ${_('Revoke')} + <i class="icon-minus-circled"></i>${_('Revoke')} </button> %endif </td> @@ -64,7 +64,7 @@ </td> <td> <button type="button" class="btn btn-default btn-xs" 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-minus-circled"></i> ${_('Revoke')} + <i class="icon-minus-circled"></i>${_('Revoke')} </button> </td> </tr> @@ -74,7 +74,7 @@ <tr> <td colspan="6"> <button type="button" id="add_perm" class="btn btn-link btn-xs"> - <i class="icon-plus"></i> ${_('Add new')} + <i class="icon-plus"></i>${_('Add new')} </button> </td> </tr>
--- a/kallithea/templates/admin/repos/repos.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/admin/repos/repos.html Sun Nov 05 19:25:51 2017 +0100 @@ -20,7 +20,7 @@ </div> <div class="pull-right"> %if h.HasPermissionAny('hg.admin','hg.create.repository')(): - <a href="${h.url('new_repo')}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add Repository')}</a> + <a href="${h.url('new_repo')}" class="btn btn-success btn-xs"><i class="icon-plus"></i>${_('Add Repository')}</a> %endif </div> </div>
--- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html Sun Nov 05 19:25:51 2017 +0100 @@ -31,7 +31,7 @@ <td> %if r2p.user.username !='default': <button type="button" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')"> - <i class="icon-minus-circled"></i> ${_('Revoke')} + <i class="icon-minus-circled"></i>${_('Revoke')} </button> %endif </td> @@ -44,7 +44,7 @@ ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)} ${r2p.user.username if r2p.user.username != 'default' else _('Default')} </td> - <td><i class="icon-user"></i> ${_('Admin')}</td> + <td><i class="icon-user"></i>${_('Admin')}</td> %endif </tr> %endfor @@ -68,7 +68,7 @@ </td> <td> <button class="btn btn-default btn-xs" 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-minus-circled"></i> ${_('Revoke')} + <i class="icon-minus-circled"></i>${_('Revoke')} </button> </td> </tr> @@ -78,7 +78,7 @@ <tr> <td colspan="6"> <button id="add_perm" class="btn btn-link btn-xs"> - <i class="icon-plus"></i> ${_('Add new')} + <i class="icon-plus"></i>${_('Add new')} </button> </td> </tr>
--- a/kallithea/templates/admin/user_groups/user_groups.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/admin/user_groups/user_groups.html Sun Nov 05 19:25:51 2017 +0100 @@ -21,7 +21,7 @@ </div> <div class="pull-right"> %if h.HasPermissionAny('hg.admin', 'hg.usergroup.create.true')(): - <a href="${h.url('new_users_group')}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add User Group')}</a> + <a href="${h.url('new_users_group')}" class="btn btn-success btn-xs"><i class="icon-plus"></i>${_('Add User Group')}</a> %endif </div> </div>
--- a/kallithea/templates/admin/users/users.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/admin/users/users.html Sun Nov 05 19:25:51 2017 +0100 @@ -20,7 +20,7 @@ ${self.breadcrumbs()} </div> <div class="pull-right"> - <a href="${h.url('new_user')}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add User')}</a> + <a href="${h.url('new_user')}" class="btn btn-success btn-xs"><i class="icon-plus"></i>${_('Add User')}</a> </div> </div> <div class="panel-body">
--- a/kallithea/templates/base/base.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/base/base.html Sun Nov 05 19:25:51 2017 +0100 @@ -52,15 +52,15 @@ <%def name="admin_menu()"> <ul class="dropdown-menu" role="menu"> - <li><a href="${h.url('admin_home')}"><i class="icon-book"></i> ${_('Admin Journal')}</a></li> - <li><a href="${h.url('repos')}"><i class="icon-database"></i> ${_('Repositories')}</a></li> - <li><a href="${h.url('repos_groups')}"><i class="icon-folder"></i> ${_('Repository Groups')}</a></li> - <li><a href="${h.url('users')}"><i class="icon-user"></i> ${_('Users')}</a></li> - <li><a href="${h.url('users_groups')}"><i class="icon-users"></i> ${_('User Groups')}</a></li> - <li><a href="${h.url('admin_permissions')}"><i class="icon-block"></i> ${_('Default Permissions')}</a></li> - <li><a href="${h.url('auth_home')}"><i class="icon-key"></i> ${_('Authentication')}</a></li> - <li><a href="${h.url('defaults')}"><i class="icon-wrench"></i> ${_('Repository Defaults')}</a></li> - <li class="last"><a href="${h.url('admin_settings')}"><i class="icon-gear"></i> ${_('Settings')}</a></li> + <li><a href="${h.url('admin_home')}"><i class="icon-book"></i>${_('Admin Journal')}</a></li> + <li><a href="${h.url('repos')}"><i class="icon-database"></i>${_('Repositories')}</a></li> + <li><a href="${h.url('repos_groups')}"><i class="icon-folder"></i>${_('Repository Groups')}</a></li> + <li><a href="${h.url('users')}"><i class="icon-user"></i>${_('Users')}</a></li> + <li><a href="${h.url('users_groups')}"><i class="icon-users"></i>${_('User Groups')}</a></li> + <li><a href="${h.url('admin_permissions')}"><i class="icon-block"></i>${_('Default Permissions')}</a></li> + <li><a href="${h.url('auth_home')}"><i class="icon-key"></i>${_('Authentication')}</a></li> + <li><a href="${h.url('defaults')}"><i class="icon-wrench"></i>${_('Repository Defaults')}</a></li> + <li class="last"><a href="${h.url('admin_settings')}"><i class="icon-gear"></i>${_('Settings')}</a></li> </ul> </%def> @@ -70,13 +70,13 @@ <%def name="admin_menu_simple(repositories=None, repository_groups=None, user_groups=None)"> <ul class="dropdown-menu" role="menu"> %if repositories: - <li><a href="${h.url('repos')}"><i class="icon-database"></i> ${_('Repositories')}</a></li> + <li><a href="${h.url('repos')}"><i class="icon-database"></i>${_('Repositories')}</a></li> %endif %if repository_groups: - <li><a href="${h.url('repos_groups')}"><i class="icon-folder"></i> ${_('Repository Groups')}</a></li> + <li><a href="${h.url('repos_groups')}"><i class="icon-folder"></i>${_('Repository Groups')}</a></li> %endif %if user_groups: - <li><a href="${h.url('users_groups')}"><i class="icon-users"></i> ${_('User Groups')}</a></li> + <li><a href="${h.url('users_groups')}"><i class="icon-users"></i>${_('User Groups')}</a></li> %endif </ul> </%def> @@ -124,39 +124,39 @@ </div> <div id="context-pages" class="navbar-collapse collapse"> <ul class="nav navbar-nav navbar-right"> - <li class="${'active' if current == 'summary' else ''}" data-context="summary"><a href="${h.url('summary_home', repo_name=c.repo_name)}"><i class="icon-doc-text"></i> ${_('Summary')}</a></li> + <li class="${'active' if current == 'summary' else ''}" data-context="summary"><a href="${h.url('summary_home', repo_name=c.repo_name)}"><i class="icon-doc-text"></i>${_('Summary')}</a></li> %if rev: - <li class="${'active' if current == 'changelog' else ''}" data-context="changelog"><a href="${h.url('changelog_file_home', repo_name=c.repo_name, revision=rev, f_path='')}"><i class="icon-clock"></i> ${_('Changelog')}</a></li> + <li class="${'active' if current == 'changelog' else ''}" data-context="changelog"><a href="${h.url('changelog_file_home', repo_name=c.repo_name, revision=rev, f_path='')}"><i class="icon-clock"></i>${_('Changelog')}</a></li> %else: - <li class="${'active' if current == 'changelog' else ''}" data-context="changelog"><a href="${h.url('changelog_home', repo_name=c.repo_name)}"><i class="icon-clock"></i> ${_('Changelog')}</a></li> + <li class="${'active' if current == 'changelog' else ''}" data-context="changelog"><a href="${h.url('changelog_home', repo_name=c.repo_name)}"><i class="icon-clock"></i>${_('Changelog')}</a></li> %endif - <li class="${'active' if current == 'files' else ''}" data-context="files"><a href="${h.url('files_home', repo_name=c.repo_name, revision=rev or 'tip')}"><i class="icon-doc-inv"></i> ${_('Files')}</a></li> + <li class="${'active' if current == 'files' else ''}" data-context="files"><a href="${h.url('files_home', repo_name=c.repo_name, revision=rev or 'tip')}"><i class="icon-doc-inv"></i>${_('Files')}</a></li> <li class="${'active' if current == 'switch-to' else ''}" data-context="switch-to"> <input id="branch_switcher" name="branch_switcher" type="hidden"> </li> <li class="${'active' if current == 'options' else ''} dropdown" data-context="options"> %if h.HasRepoPermissionLevel('admin')(c.repo_name): - <a href="${h.url('edit_repo',repo_name=c.repo_name)}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true"><i class="icon-wrench"></i> ${_('Options')} <i class="caret"></i></a> + <a href="${h.url('edit_repo',repo_name=c.repo_name)}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true"><i class="icon-wrench"></i>${_('Options')} <i class="caret"></i></a> %else: - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true"><i class="icon-wrench"></i> ${_('Options')} <i class="caret"></i></a> + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true"><i class="icon-wrench"></i>${_('Options')} <i class="caret"></i></a> %endif <ul class="dropdown-menu" role="menu" aria-hidden="true"> %if h.HasRepoPermissionLevel('admin')(c.repo_name): - <li><a href="${h.url('edit_repo',repo_name=c.repo_name)}"><i class="icon-gear"></i> ${_('Settings')}</a></li> + <li><a href="${h.url('edit_repo',repo_name=c.repo_name)}"><i class="icon-gear"></i>${_('Settings')}</a></li> %endif %if c.db_repo.fork: <li><a href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1], other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}"> - <i class="icon-git-compare"></i> ${_('Compare Fork')}</a></li> + <i class="icon-git-compare"></i>${_('Compare Fork')}</a></li> %endif - <li><a href="${h.url('compare_home',repo_name=c.repo_name)}"><i class="icon-git-compare"></i> ${_('Compare')}</a></li> + <li><a href="${h.url('compare_home',repo_name=c.repo_name)}"><i class="icon-git-compare"></i>${_('Compare')}</a></li> - <li><a href="${h.url('search_repo',repo_name=c.repo_name)}"><i class="icon-search"></i> ${_('Search')}</a></li> + <li><a href="${h.url('search_repo',repo_name=c.repo_name)}"><i class="icon-search"></i>${_('Search')}</a></li> %if h.HasRepoPermissionLevel('write')(c.repo_name) and c.db_repo.enable_locking: %if c.db_repo.locked[0]: - <li><a href="${h.url('toggle_locking', repo_name=c.repo_name)}"><i class="icon-lock"></i> ${_('Unlock')}</a></li> + <li><a href="${h.url('toggle_locking', repo_name=c.repo_name)}"><i class="icon-lock"></i>${_('Unlock')}</a></li> %else: - <li><a href="${h.url('toggle_locking', repo_name=c.repo_name)}"><i class="icon-lock-open-alt"></i> ${_('Lock')}</a></li> + <li><a href="${h.url('toggle_locking', repo_name=c.repo_name)}"><i class="icon-lock-open-alt"></i>${_('Lock')}</a></li> %endif %endif ## TODO: this check feels wrong, it would be better to have a check for permissions @@ -164,17 +164,17 @@ %if request.authuser.username != 'default': <li> <a href="#" class="${'following' if c.repository_following else 'follow'}" onclick="toggleFollowingRepo(this, ${c.db_repo.repo_id});"> - <span class="show-follow"><i class="icon-heart-empty"></i> ${_('Follow')}</span> - <span class="show-following"><i class="icon-heart"></i> ${_('Unfollow')}</span> + <span class="show-follow"><i class="icon-heart-empty"></i>${_('Follow')}</span> + <span class="show-following"><i class="icon-heart"></i>${_('Unfollow')}</span> </a> </li> - <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}"><i class="icon-git-pull-request"></i> ${_('Fork')}</a></li> - <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-git-pull-request"></i> ${_('Create Pull Request')}</a></li> + <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}"><i class="icon-git-pull-request"></i>${_('Fork')}</a></li> + <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-git-pull-request"></i>${_('Create Pull Request')}</a></li> %endif </ul> </li> <li class="${'active' if current == 'showpullrequest' else ''}" data-context="showpullrequest"> - <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests for %s') % c.repo_name}"> <i class="icon-git-pull-request"></i> ${_('Pull Requests')} + <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests for %s') % c.repo_name}"> <i class="icon-git-pull-request"></i>${_('Pull Requests')} %if c.repository_pull_requests: <span class="badge">${c.repository_pull_requests}</span> %endif @@ -189,7 +189,7 @@ var bcache = {}; $("#branch_switcher").select2({ - placeholder: '<i class="icon-exchange"></i> ' + ${h.jshtml(_('Switch To'))} + ' <span class="caret"></span>', + placeholder: '<i class="icon-exchange"></i>' + ${h.jshtml(_('Switch To'))} + ' <span class="caret"></span>', dropdownAutoWidth: true, sortResults: prefixFirstSort, formatResult: function(obj) { @@ -296,45 +296,45 @@ %if request.authuser.username != 'default': <li class="${'active' if current == 'journal' else ''}"> <a class="menu_link" title="${_('Show recent activity')}" href="${h.url('journal')}"> - <i class="icon-book"></i> ${_('Journal')} + <i class="icon-book"></i>${_('Journal')} </a> </li> %else: <li class="${'active' if current == 'journal' else ''}"> <a class="menu_link" title="${_('Public journal')}" href="${h.url('public_journal')}"> - <i class="icon-book"></i> ${_('Public journal')} + <i class="icon-book"></i>${_('Public journal')} </a> </li> %endif <li class="${'active' if current == 'gists' else ''} dropdown"> <a class="menu_link dropdown-toggle" data-toggle="dropdown" role="button" title="${_('Show public gists')}" href="${h.url('gists')}"> - <i class="icon-clippy"></i> ${_('Gists')} <span class="caret"></span> + <i class="icon-clippy"></i>${_('Gists')} <span class="caret"></span> </a> <ul class="dropdown-menu" role="menu"> - <li><a href="${h.url('new_gist', public=1)}"><i class="icon-paste"></i> ${_('Create New Gist')}</a></li> - <li><a href="${h.url('gists')}"><i class="icon-globe"></i> ${_('All Public Gists')}</a></li> + <li><a href="${h.url('new_gist', public=1)}"><i class="icon-paste"></i>${_('Create New Gist')}</a></li> + <li><a href="${h.url('gists')}"><i class="icon-globe"></i>${_('All Public Gists')}</a></li> %if request.authuser.username != 'default': - <li><a href="${h.url('gists', public=1)}"><i class="icon-user"></i> ${_('My Public Gists')}</a></li> - <li><a href="${h.url('gists', private=1)}"><i class="icon-keyhole-circled"></i> ${_('My Private Gists')}</a></li> + <li><a href="${h.url('gists', public=1)}"><i class="icon-user"></i>${_('My Public Gists')}</a></li> + <li><a href="${h.url('gists', private=1)}"><i class="icon-keyhole-circled"></i>${_('My Private Gists')}</a></li> %endif </ul> </li> <li class="${'active' if current == 'search' else ''}"> <a class="menu_link" title="${_('Search in repositories')}" href="${h.url('search')}"> - <i class="icon-search"></i> ${_('Search')} + <i class="icon-search"></i>${_('Search')} </a> </li> % if h.HasPermissionAny('hg.admin')('access admin main page'): <li class="${'active' if current == 'admin' else ''} dropdown"> <a class="menu_link dropdown-toggle" data-toggle="dropdown" role="button" title="${_('Admin')}" href="${h.url('admin_home')}"> - <i class="icon-gear"></i> ${_('Admin')} <span class="caret"></span> + <i class="icon-gear"></i>${_('Admin')} <span class="caret"></span> </a> ${admin_menu()} </li> % elif request.authuser.repositories_admin or request.authuser.repository_groups_admin or request.authuser.user_groups_admin: <li class="${'active' if current == 'admin' else ''} dropdown"> <a class="menu_link dropdown-toggle" data-toggle="dropdown" role="button" title="${_('Admin')}" href=""> - <i class="icon-gear"></i> ${_('Admin')} + <i class="icon-gear"></i>${_('Admin')} </a> ${admin_menu_simple(request.authuser.repositories_admin, request.authuser.repository_groups_admin, @@ -344,7 +344,7 @@ <li class="${'active' if current == 'my_pullrequests' else ''}"> <a class="menu_link" title="${_('My Pull Requests')}" href="${h.url('my_pullrequests')}"> - <i class="icon-git-pull-request"></i> ${_('My Pull Requests')} + <i class="icon-git-pull-request"></i>${_('My Pull Requests')} %if c.my_pr_count != 0: <span class="badge">${c.my_pr_count}</span> %endif @@ -439,22 +439,22 @@ tmpl += '<span class="repotag" title="${_('Git repository')}">git</span> '; } if(obj_dict['private']){ - tmpl += '<i class="icon-keyhole-circled"></i> '; + tmpl += '<i class="icon-keyhole-circled"></i>'; } else if(visual_show_public_icon){ - tmpl += '<i class="icon-globe"></i> '; + tmpl += '<i class="icon-globe"></i>'; } tmpl += '</span>'; } if(obj_dict && state.type == 'group'){ - tmpl += '<i class="icon-folder"></i> '; + tmpl += '<i class="icon-folder"></i>'; } tmpl += state.text; return tmpl; } $("#repo_switcher").select2({ - placeholder: '<i class="icon-database"></i> ' + ${h.jshtml(_('Repositories'))} + ' <span class="caret"></span>', + placeholder: '<i class="icon-database"></i>' + ${h.jshtml(_('Repositories'))} + ' <span class="caret"></span>', dropdownAutoWidth: true, sortResults: prefixFirstSort, formatResult: format, @@ -535,7 +535,7 @@ data-ajax-url="${h.url('changeset_parents',repo_name=c.repo_name, revision=c.changeset.raw_id)}" data-linktype="parent" data-reponame="${c.repo_name}"> - <i class="icon-left-open"></i> <a href="#">${_('Parent rev.')}</a> + <i class="icon-left-open"></i><a href="#">${_('Parent rev.')}</a> </div> </div> @@ -544,7 +544,7 @@ data-ajax-url="${h.url('changeset_children',repo_name=c.repo_name, revision=c.changeset.raw_id)}" data-linktype="child" data-reponame="${c.repo_name}"> - <a href="#">${_('Child rev.')}</a> <i class="icon-right-open"></i> + <a href="#">${_('Child rev.')}</a><i class="icon-right-open"></i> </div> </div>
--- a/kallithea/templates/changelog/changelog.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/changelog/changelog.html Sun Nov 05 19:25:51 2017 +0100 @@ -58,7 +58,7 @@ <a id="compare_fork" title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}" href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}" - class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare fork with parent repository (%s)' % c.db_repo.fork.repo_name)}</a> + class="btn btn-default btn-sm"><i class="icon-git-compare"></i>${_('Compare fork with parent repository (%s)' % c.db_repo.fork.repo_name)}</a> %endif ## text and href of open_new_pr is controlled from javascript <a id="open_new_pr" class="btn btn-default btn-sm"></a>
--- a/kallithea/templates/changeset/changeset.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/changeset/changeset.html Sun Nov 05 19:25:51 2017 +0100 @@ -39,15 +39,15 @@ %endif </div> <div class="diff-actions pull-left"> - <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" data-toggle="tooltip" title="${_('Raw diff')}"> - <i class="icon-diff"></i> - </a> - <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" data-toggle="tooltip" title="${_('Patch diff')}"> - <i class="icon-file-powerpoint"></i> - </a> - <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" data-toggle="tooltip" title="${_('Download diff')}"> - <i class="icon-floppy"></i> - </a> + <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" + data-toggle="tooltip" + title="${_('Raw diff')}"><i class="icon-diff"></i></a> + <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" + data-toggle="tooltip" + title="${_('Patch diff')}"><i class="icon-file-powerpoint"></i></a> + <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" + data-toggle="tooltip" + title="${_('Download diff')}"><i class="icon-floppy"></i></a> ${c.ignorews_url(request.GET)} ${c.context_url(request.GET)} </div> @@ -151,8 +151,7 @@ %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data: <div class="cs_${op} clearfix"> <span class="node"> - <i class="icon-diff-${op}"></i> - ${h.link_to(h.safe_unicode(path), '#%s' % fid)} + <i class="icon-diff-${op}"></i>${h.link_to(h.safe_unicode(path), '#%s' % fid)} </span> <div class="changes">${h.fancy_file_stats(stats)}</div> </div>
--- a/kallithea/templates/changeset/changeset_range.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/changeset/changeset_range.html Sun Nov 05 19:25:51 2017 +0100 @@ -24,7 +24,7 @@ ${self.breadcrumbs()} </div> <div class="pull-right"> - <a href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-default btn-sm"><i class="icon-git-compare"></i> Compare Revisions</a> + <a href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-default btn-sm"><i class="icon-git-compare"></i>Compare Revisions</a> </div> </div> <div class="panel-body">
--- a/kallithea/templates/compare/compare_diff.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/compare/compare_diff.html Sun Nov 05 19:25:51 2017 +0100 @@ -36,9 +36,9 @@ ${h.hidden('compare_other')} </span><span> %if not c.compare_home: - <a class="btn btn-default btn-sm" href="${c.swap_url}"><i class="icon-arrows-cw"></i> ${_('Swap')}</a> + <a class="btn btn-default btn-sm" href="${c.swap_url}"><i class="icon-arrows-cw"></i>${_('Swap')}</a> %endif - <button type="button" id="compare_revs" class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare Revisions')}</button> + <button type="button" id="compare_revs" class="btn btn-default btn-sm"><i class="icon-git-compare"></i>${_('Compare Revisions')}</button> </span> </div> </div>
--- a/kallithea/templates/data_table/_dt_elements.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/data_table/_dt_elements.html Sun Nov 05 19:25:51 2017 +0100 @@ -65,14 +65,14 @@ <div> <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')} + <i class="icon-pencil"></i>${_('Edit')} </a> </div> <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-trashcan"></i> ${_('Delete')} + <i class="icon-trashcan"></i>${_('Delete')} </button> ${h.end_form()} </div> @@ -94,14 +94,14 @@ <%def name="user_actions(user_id, username)"> <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')} + <i class="icon-pencil"></i>${_('Edit')} </a> </div> <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-trashcan"></i> ${_('Delete')} + <i class="icon-trashcan"></i>${_('Delete')} </button> ${h.end_form()} </div> @@ -110,14 +110,14 @@ <%def name="user_group_actions(user_group_id, user_group_name)"> <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')} + <i class="icon-pencil"></i>${_('Edit')} </a> </div> <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-trashcan"></i> ${_('Delete')} + <i class="icon-trashcan"></i>${_('Delete')} </button> ${h.end_form()} </div> @@ -133,14 +133,14 @@ <%def name="repo_group_actions(repo_group_id, repo_group_name, gr_count)"> <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')} + <i class="icon-pencil"></i>${_('Edit')} </a> </div> <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-trashcan"></i> ${_('Delete')} + <i class="icon-trashcan"></i>${_('Delete')} </button> ${h.end_form()} </div> @@ -153,13 +153,13 @@ <%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(' » '.join(children_groups))}</a> + <i class="icon-folder" title="${_('Repository group')}"></i>${h.literal(' » '.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> + <i class="icon-users" title="${_('User group')}"></i>${user_group_name}</a> </div> </%def>
--- a/kallithea/templates/files/diff_2way.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/files/diff_2way.html Sun Nov 05 19:25:51 2017 +0100 @@ -38,18 +38,20 @@ revision=c.cs2.raw_id,f_path=h.safe_unicode(c.node1.path)))} </div> <div class="pull-left diff-actions"> - <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" data-toggle="tooltip" title="${_('Show full diff for this file')}"> - <i class="icon-file-code"></i> - </a> - <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" data-toggle="tooltip" title="${_('Show full side-by-side diff for this file')}"> - <i class="icon-docs"></i> - </a> - <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='raw')}" data-toggle="tooltip" title="${_('Raw diff')}"> - <i class="icon-diff"></i> - </a> - <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='download')}" data-toggle="tooltip" title="${_('Download diff')}"> - <i class="icon-floppy"></i> - </a> + <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" + data-toggle="tooltip" + title="${_('Show full diff for this file')}"> + <i class="icon-file-code"></i></a> + <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" + data-toggle="tooltip" + title="${_('Show full side-by-side diff for this file')}"> + <i class="icon-docs"></i></a> + <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='raw')}" + data-toggle="tooltip" + title="${_('Raw diff')}"><i class="icon-diff"></i></a> + <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='download')}" + data-toggle="tooltip" + title="${_('Download diff')}"><i class="icon-floppy"></i></a> ${h.checkbox('ignorews', label=_('Ignore whitespace'))} ${h.checkbox('edit_mode', label=_('Edit'))} </div>
--- a/kallithea/templates/forks/forks_data.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/forks/forks_data.html Sun Nov 05 19:25:51 2017 +0100 @@ -15,7 +15,7 @@ <span data-toggle="tooltip" title="${h.fmt_date(f.created_on)}"> ${h.age(f.created_on)}</span> <a title="${_('Compare fork with %s') % c.repo_name}" href="${h.url('compare_url',repo_name=c.repo_name, org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=f.repo_name,other_ref_type=c.db_repo.landing_rev[0],other_ref_name=c.db_repo.landing_rev[1], merge=1)}" - class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare Fork')}</a> + class="btn btn-default btn-sm"><i class="icon-git-compare"></i>${_('Compare Fork')}</a> </div> </div> % endfor
--- a/kallithea/templates/index_base.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/index_base.html Sun Nov 05 19:25:51 2017 +0100 @@ -22,19 +22,19 @@ %> %if h.HasPermissionAny('hg.admin','hg.create.repository')() or (group_admin or (group_write and create_on_write)): %if c.group: - <a href="${h.url('new_repo',parent_group=c.group.group_id)}" class="btn btn-default btn-xs"><i class="icon-plus"></i> ${_('Add Repository')}</a> + <a href="${h.url('new_repo',parent_group=c.group.group_id)}" class="btn btn-default btn-xs"><i class="icon-plus"></i>${_('Add Repository')}</a> %if h.HasPermissionAny('hg.admin')() or h.HasRepoGroupPermissionLevel('admin')(c.group.group_name): - <a href="${h.url('new_repos_group', parent_group=c.group.group_id)}" class="btn btn-default btn-xs"><i class="icon-plus"></i> ${_('Add Repository Group')}</a> + <a href="${h.url('new_repos_group', parent_group=c.group.group_id)}" class="btn btn-default btn-xs"><i class="icon-plus"></i>${_('Add Repository Group')}</a> %endif %else: - <a href="${h.url('new_repo')}" class="btn btn-default btn-xs"><i class="icon-plus"></i> ${_('Add Repository')}</a> + <a href="${h.url('new_repo')}" class="btn btn-default btn-xs"><i class="icon-plus"></i>${_('Add Repository')}</a> %if h.HasPermissionAny('hg.admin')(): - <a href="${h.url('new_repos_group')}" class="btn btn-default btn-xs"><i class="icon-plus"></i> ${_('Add Repository Group')}</a> + <a href="${h.url('new_repos_group')}" class="btn btn-default btn-xs"><i class="icon-plus"></i>${_('Add Repository Group')}</a> %endif %endif %endif %if c.group and h.HasRepoGroupPermissionLevel('admin')(c.group.group_name): - <a href="${h.url('edit_repo_group',group_name=c.group.group_name)}" title="${_('You have admin right to this group, and can edit it')}" class="btn btn-default btn-xs"><i class="icon-pencil"></i> ${_('Edit Repository Group')}</a> + <a href="${h.url('edit_repo_group',group_name=c.group.group_name)}" title="${_('You have admin right to this group, and can edit it')}" class="btn btn-default btn-xs"><i class="icon-pencil"></i>${_('Edit Repository Group')}</a> %endif </div> %endif
--- a/kallithea/templates/journal/journal.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/journal/journal.html Sun Nov 05 19:25:51 2017 +0100 @@ -30,8 +30,8 @@ ${self.breadcrumbs()} </div> <div class="pull-right panel-title"> - <a href="${h.url('my_account_watched')}"><i class="icon-eye"></i> ${_('Watched Repositories')}</a> - <a href="${h.url('my_account_repos')}"><i class="icon-database"></i> ${_('My Repositories')}</a> + <a href="${h.url('my_account_watched')}"><i class="icon-eye"></i>${_('Watched Repositories')}</a> + <a href="${h.url('my_account_repos')}"><i class="icon-database"></i>${_('My Repositories')}</a> <a id="refresh" href="${h.url('journal')}"><i class="icon-arrows-cw"></i></a> <a href="${h.url('journal_atom', api_key=request.authuser.api_key)}"><i class="icon-rss-squared"></i></a> </div>
--- a/kallithea/templates/pullrequests/pullrequest_show_all.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show_all.html Sun Nov 05 19:25:51 2017 +0100 @@ -28,12 +28,12 @@ </div> <div class="pull-right"> %if request.authuser.username != 'default': - <a id="open_new_pr" class="btn btn-success btn-xs" href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-plus"></i> ${_('Open New Pull Request')}</a> + <a id="open_new_pr" class="btn btn-success btn-xs" href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-plus"></i>${_('Open New Pull Request')}</a> %endif %if c.from_: - <a class="btn btn-default btn-xs" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed)}"><i class="icon-git-compare"></i> ${_('Show Pull Requests to %s') % c.repo_name}</a> + <a class="btn btn-default btn-xs" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed)}"><i class="icon-git-compare"></i>${_('Show Pull Requests to %s') % c.repo_name}</a> %else: - <a class="btn btn-default btn-xs" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed,from_=1)}"><i class="icon-git-compare"></i> ${_("Show Pull Requests from '%s'") % c.repo_name}</a> + <a class="btn btn-default btn-xs" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed,from_=1)}"><i class="icon-git-compare"></i>${_("Show Pull Requests from '%s'") % c.repo_name}</a> %endif </div> </div>
--- a/kallithea/templates/summary/summary.html Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/templates/summary/summary.html Sun Nov 05 19:25:51 2017 +0100 @@ -19,12 +19,12 @@ ##FORK %if c.db_repo.fork: - - <i class="icon-fork"></i> ${_('Fork of')} "<a href="${h.url('summary_home',repo_name=c.db_repo.fork.repo_name)}">${c.db_repo.fork.repo_name}</a>" + - <i class="icon-fork"></i>${_('Fork of')} "<a href="${h.url('summary_home',repo_name=c.db_repo.fork.repo_name)}">${c.db_repo.fork.repo_name}</a>" %endif ##REMOTE %if c.db_repo.clone_uri: - - <i class="icon-fork"></i> ${_('Clone from')} "<a href="${h.url(str(h.hide_credentials(c.db_repo.clone_uri)))}">${h.hide_credentials(c.db_repo.clone_uri)}</a>" + - <i class="icon-fork"></i>${_('Clone from')} "<a href="${h.url(str(h.hide_credentials(c.db_repo.clone_uri)))}">${h.hide_credentials(c.db_repo.clone_uri)}</a>" %endif </%def> @@ -106,7 +106,7 @@ %endif %else: <span id="${'zip_link'}"> - <a class="btn btn-default btn-sm" href="${h.url('files_archive_home',repo_name=c.db_repo.repo_name,fname='tip.zip')}"><i class="icon-file-zip"></i> ${_('Download as zip')}</a> + <a class="btn btn-default btn-sm" href="${h.url('files_archive_home',repo_name=c.db_repo.repo_name,fname='tip.zip')}"><i class="icon-file-zip"></i>${_('Download as zip')}</a> </span> ${h.hidden('download_options')} <span> @@ -122,19 +122,19 @@ <ul id="summary-menu-stats" class="list-group pull-right"> <li class="list-group-item"> <a title="${_('Owner')} ${c.db_repo.owner.email}"> - <i class="icon-user"></i> ${c.db_repo.owner.username} + <i class="icon-user"></i>${c.db_repo.owner.username} ${h.gravatar_div(c.db_repo.owner.email, size=18, div_class="pull-right")} </a> </li> <li class="list-group-item"> <a title="${_('Followers')}" href="${h.url('repo_followers_home',repo_name=c.repo_name)}"> - <i class="icon-heart"></i> ${_('Followers')} + <i class="icon-heart"></i>${_('Followers')} <span class="badge pull-right" id="current_followers_count">${c.repository_followers}</span> </a> </li> <li class="list-group-item"> <a title="${_('Forks')}" href="${h.url('repo_forks_home',repo_name=c.repo_name)}"> - <i class="icon-fork"></i> ${_('Forks')} + <i class="icon-fork"></i>${_('Forks')} <span class="badge pull-right">${c.repository_forks}</span> </a> </li> @@ -142,7 +142,7 @@ %if request.authuser.username != 'default': <li class="list-group-item clearfix"> <a href="#" onclick="javascript:showRepoSize('repo_size_2','${c.db_repo.repo_name}')"> - <i class="icon-ruler"></i> ${_('Size')} + <i class="icon-ruler"></i>${_('Size')} <span class="badge pull-right" id="repo_size_2"></span> </a> </li> @@ -150,16 +150,16 @@ <li class="list-group-item"> %if request.authuser.username != 'default': - <a href="${h.url('atom_feed_home',repo_name=c.db_repo.repo_name,api_key=request.authuser.api_key)}"><i class="icon-rss-squared"></i> ${_('Feed')}</a> + <a href="${h.url('atom_feed_home',repo_name=c.db_repo.repo_name,api_key=request.authuser.api_key)}"><i class="icon-rss-squared"></i>${_('Feed')}</a> %else: - <a href="${h.url('atom_feed_home',repo_name=c.db_repo.repo_name)}"><i class="icon-rss-squared"></i> ${_('Feed')}</a> + <a href="${h.url('atom_feed_home',repo_name=c.db_repo.repo_name)}"><i class="icon-rss-squared"></i>${_('Feed')}</a> %endif </li> %if c.show_stats: <li class="list-group-item"> <a title="${_('Statistics')}" href="${h.url('repo_stats_home',repo_name=c.repo_name)}"> - <i class="icon-graph"></i> ${_('Statistics')} + <i class="icon-graph"></i>${_('Statistics')} </a> </li> %endif @@ -298,7 +298,7 @@ var title_tmpl = ${h.jshtml(_('Download %s as %s') % ('__CS_NAME__','__CS_EXT__'))}; title_tmpl= title_tmpl.replace('__CS_NAME__',new_cs.text); title_tmpl = title_tmpl.replace('__CS_EXT__',k); - title_tmpl = '<i class="icon-file-zip"></i> '+ title_tmpl; + title_tmpl = '<i class="icon-file-zip"></i>'+ title_tmpl; var url = tmpl_links[k].replace('__CS__',new_cs.id); var subrepos = $('#archive_subrepos').is(':checked'); url = url.replace('__SUB__',subrepos);
--- a/kallithea/tests/functional/test_compare.py Thu Oct 12 22:17:03 2017 +0200 +++ b/kallithea/tests/functional/test_compare.py Sun Nov 05 19:25:51 2017 +0100 @@ -74,7 +74,7 @@ ## files response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""") # swap - response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) + response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i>Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) def test_compare_forks_on_branch_extra_commits_git(self): self.log_user() @@ -125,7 +125,7 @@ ## files response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""") # swap - response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) + response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i>Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) def test_compare_forks_on_branch_extra_commits_origin_has_incoming_hg(self): self.log_user() @@ -184,7 +184,7 @@ ## files response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""") # swap - response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) + response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i>Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) def test_compare_forks_on_branch_extra_commits_origin_has_incoming_git(self): self.log_user() @@ -243,7 +243,7 @@ ## files response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""") # swap - response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) + response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&merge=True"><i class="icon-arrows-cw"></i>Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name)) def test_compare_cherry_pick_changesets_from_bottom(self): pass