diff --git a/kallithea/templates/admin/gists/index.html b/kallithea/templates/admin/gists/index.html --- a/kallithea/templates/admin/gists/index.html +++ b/kallithea/templates/admin/gists/index.html @@ -34,7 +34,7 @@ %if request.authuser.username != 'default':
- ${_('Create New Gist')} + ${_('Create New Gist')}
%endif diff --git a/kallithea/templates/admin/gists/show.html b/kallithea/templates/admin/gists/show.html --- a/kallithea/templates/admin/gists/show.html +++ b/kallithea/templates/admin/gists/show.html @@ -22,7 +22,7 @@ %if request.authuser.username != 'default':
- ${_('Create New Gist')} + ${_('Create New Gist')}
%endif diff --git a/kallithea/templates/admin/notifications/notifications_data.html b/kallithea/templates/admin/notifications/notifications_data.html --- a/kallithea/templates/admin/notifications/notifications_data.html +++ b/kallithea/templates/admin/notifications/notifications_data.html @@ -9,9 +9,9 @@ %if not notification.read: - + %endif - + %endfor diff --git a/kallithea/templates/admin/permissions/permissions_ips.html b/kallithea/templates/admin/permissions/permissions_ips.html --- a/kallithea/templates/admin/permissions/permissions_ips.html +++ b/kallithea/templates/admin/permissions/permissions_ips.html @@ -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')} - ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id, + ${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()} diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit.html b/kallithea/templates/admin/repo_groups/repo_group_edit.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit.html +++ b/kallithea/templates/admin/repo_groups/repo_group_edit.html @@ -26,7 +26,7 @@ ${self.breadcrumbs()}
- ${_('Add Child Group')} + ${_('Add Child Group')}
diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html @@ -31,7 +31,7 @@ ${h.form(url('edit_repo_group_perms', gr %if r2p.user.username !='default': %endif @@ -44,7 +44,7 @@ ${h.form(url('edit_repo_group_perms', gr ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)} ${r2p.user.username if r2p.user.username != 'default' else _('Default')} - ${_('Admin')} + ${_('Admin')} %endif %endfor @@ -68,7 +68,7 @@ ${h.form(url('edit_repo_group_perms', gr @@ -78,7 +78,7 @@ ${h.form(url('edit_repo_group_perms', gr diff --git a/kallithea/templates/admin/repo_groups/repo_groups.html b/kallithea/templates/admin/repo_groups/repo_groups.html --- a/kallithea/templates/admin/repo_groups/repo_groups.html +++ b/kallithea/templates/admin/repo_groups/repo_groups.html @@ -22,7 +22,7 @@
%if h.HasPermissionAny('hg.admin')(): - ${_('Add Repository Group')} + ${_('Add Repository Group')} %endif
diff --git a/kallithea/templates/admin/repos/repo_edit_permissions.html b/kallithea/templates/admin/repos/repo_edit_permissions.html --- a/kallithea/templates/admin/repos/repo_edit_permissions.html +++ b/kallithea/templates/admin/repos/repo_edit_permissions.html @@ -20,7 +20,7 @@ ${h.form(url('edit_repo_perms_update', r ${_('Private Repository')} - ${_('Default')} + ${_('Default')} %else: @@ -39,7 +39,7 @@ ${h.form(url('edit_repo_perms_update', r %if r2p.user.username !='default': %endif @@ -64,7 +64,7 @@ ${h.form(url('edit_repo_perms_update', r @@ -74,7 +74,7 @@ ${h.form(url('edit_repo_perms_update', r diff --git a/kallithea/templates/admin/repos/repos.html b/kallithea/templates/admin/repos/repos.html --- a/kallithea/templates/admin/repos/repos.html +++ b/kallithea/templates/admin/repos/repos.html @@ -20,7 +20,7 @@
%if h.HasPermissionAny('hg.admin','hg.create.repository')(): - ${_('Add Repository')} + ${_('Add Repository')} %endif
diff --git a/kallithea/templates/admin/user_groups/user_group_edit_perms.html b/kallithea/templates/admin/user_groups/user_group_edit_perms.html --- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html +++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html @@ -31,7 +31,7 @@ ${h.form(url('edit_user_group_perms_upda %if r2p.user.username !='default': %endif @@ -44,7 +44,7 @@ ${h.form(url('edit_user_group_perms_upda ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)} ${r2p.user.username if r2p.user.username != 'default' else _('Default')} - ${_('Admin')} + ${_('Admin')} %endif %endfor @@ -68,7 +68,7 @@ ${h.form(url('edit_user_group_perms_upda @@ -78,7 +78,7 @@ ${h.form(url('edit_user_group_perms_upda diff --git a/kallithea/templates/admin/user_groups/user_groups.html b/kallithea/templates/admin/user_groups/user_groups.html --- a/kallithea/templates/admin/user_groups/user_groups.html +++ b/kallithea/templates/admin/user_groups/user_groups.html @@ -21,7 +21,7 @@
%if h.HasPermissionAny('hg.admin', 'hg.usergroup.create.true')(): - ${_('Add User Group')} + ${_('Add User Group')} %endif
diff --git a/kallithea/templates/admin/users/users.html b/kallithea/templates/admin/users/users.html --- a/kallithea/templates/admin/users/users.html +++ b/kallithea/templates/admin/users/users.html @@ -20,7 +20,7 @@ ${self.breadcrumbs()}
- ${_('Add User')} + ${_('Add User')}
diff --git a/kallithea/templates/base/base.html b/kallithea/templates/base/base.html --- a/kallithea/templates/base/base.html +++ b/kallithea/templates/base/base.html @@ -52,15 +52,15 @@ <%def name="admin_menu()"> @@ -70,13 +70,13 @@ <%def name="admin_menu_simple(repositories=None, repository_groups=None, user_groups=None)"> @@ -124,39 +124,39 @@
@@ -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}"> - ${_('Child rev.')} + ${_('Child rev.')} diff --git a/kallithea/templates/changelog/changelog.html b/kallithea/templates/changelog/changelog.html --- a/kallithea/templates/changelog/changelog.html +++ b/kallithea/templates/changelog/changelog.html @@ -58,7 +58,7 @@ ${self.repo_context_bar('changelog', c.f ${_('Compare fork with parent repository (%s)' % c.db_repo.fork.repo_name)} + class="btn btn-default btn-sm">${_('Compare fork with parent repository (%s)' % c.db_repo.fork.repo_name)} %endif ## text and href of open_new_pr is controlled from javascript diff --git a/kallithea/templates/changeset/changeset.html b/kallithea/templates/changeset/changeset.html --- a/kallithea/templates/changeset/changeset.html +++ b/kallithea/templates/changeset/changeset.html @@ -39,15 +39,15 @@ ${self.repo_context_bar('changelog', c.c %endif
- - - - - - - - - + + + ${c.ignorews_url(request.GET)} ${c.context_url(request.GET)}
@@ -151,8 +151,7 @@ ${self.repo_context_bar('changelog', c.c %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:
- - ${h.link_to(h.safe_unicode(path), '#%s' % fid)} + ${h.link_to(h.safe_unicode(path), '#%s' % fid)}
${h.fancy_file_stats(stats)}
diff --git a/kallithea/templates/changeset/changeset_range.html b/kallithea/templates/changeset/changeset_range.html --- a/kallithea/templates/changeset/changeset_range.html +++ b/kallithea/templates/changeset/changeset_range.html @@ -24,7 +24,7 @@ ${self.repo_context_bar('changelog')} ${self.breadcrumbs()}
- Compare Revisions + Compare Revisions
diff --git a/kallithea/templates/compare/compare_diff.html b/kallithea/templates/compare/compare_diff.html --- a/kallithea/templates/compare/compare_diff.html +++ b/kallithea/templates/compare/compare_diff.html @@ -36,9 +36,9 @@ ${self.repo_context_bar('changelog')} ${h.hidden('compare_other')} %if not c.compare_home: - ${_('Swap')} + ${_('Swap')} %endif - +
diff --git a/kallithea/templates/data_table/_dt_elements.html b/kallithea/templates/data_table/_dt_elements.html --- a/kallithea/templates/data_table/_dt_elements.html +++ b/kallithea/templates/data_table/_dt_elements.html @@ -65,14 +65,14 @@
- ${_('Edit')} + ${_('Edit')}
${h.form(h.url('delete_repo', repo_name=repo_name))} ${h.end_form()}
@@ -94,14 +94,14 @@ <%def name="user_actions(user_id, username)">
- ${_('Edit')} + ${_('Edit')}
${h.form(h.url('delete_user', id=user_id))} ${h.end_form()}
@@ -110,14 +110,14 @@ <%def name="user_group_actions(user_group_id, user_group_name)">
- ${_('Edit')} + ${_('Edit')}
${h.form(h.url('delete_users_group', id=user_group_id))} ${h.end_form()}
@@ -133,14 +133,14 @@ <%def name="repo_group_actions(repo_group_id, repo_group_name, gr_count)">
- ${_('Edit')} + ${_('Edit')}
${h.form(h.url('delete_repo_group', group_name=repo_group_name))} ${h.end_form()}
@@ -153,13 +153,13 @@ <%def name="repo_group_name(repo_group_name, children_groups)">
- ${h.literal(' » '.join(children_groups))} + ${h.literal(' » '.join(children_groups))}
<%def name="user_group_name(user_group_id, user_group_name)">
- ${user_group_name} + ${user_group_name}
diff --git a/kallithea/templates/files/diff_2way.html b/kallithea/templates/files/diff_2way.html --- a/kallithea/templates/files/diff_2way.html +++ b/kallithea/templates/files/diff_2way.html @@ -38,18 +38,20 @@ ${self.repo_context_bar('changelog')} revision=c.cs2.raw_id,f_path=h.safe_unicode(c.node1.path)))}
- - - - - - - - - - - - + + + + + + ${h.checkbox('ignorews', label=_('Ignore whitespace'))} ${h.checkbox('edit_mode', label=_('Edit'))}
diff --git a/kallithea/templates/forks/forks_data.html b/kallithea/templates/forks/forks_data.html --- a/kallithea/templates/forks/forks_data.html +++ b/kallithea/templates/forks/forks_data.html @@ -15,7 +15,7 @@ ${h.age(f.created_on)} ${_('Compare Fork')} + class="btn btn-default btn-sm">${_('Compare Fork')} % endfor diff --git a/kallithea/templates/index_base.html b/kallithea/templates/index_base.html --- a/kallithea/templates/index_base.html +++ b/kallithea/templates/index_base.html @@ -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: - ${_('Add Repository')} + ${_('Add Repository')} %if h.HasPermissionAny('hg.admin')() or h.HasRepoGroupPermissionLevel('admin')(c.group.group_name): - ${_('Add Repository Group')} + ${_('Add Repository Group')} %endif %else: - ${_('Add Repository')} + ${_('Add Repository')} %if h.HasPermissionAny('hg.admin')(): - ${_('Add Repository Group')} + ${_('Add Repository Group')} %endif %endif %endif %if c.group and h.HasRepoGroupPermissionLevel('admin')(c.group.group_name): - ${_('Edit Repository Group')} + ${_('Edit Repository Group')} %endif %endif diff --git a/kallithea/templates/journal/journal.html b/kallithea/templates/journal/journal.html --- a/kallithea/templates/journal/journal.html +++ b/kallithea/templates/journal/journal.html @@ -30,8 +30,8 @@ ${self.breadcrumbs()}
- ${_('Watched Repositories')} - ${_('My Repositories')} + ${_('Watched Repositories')} + ${_('My Repositories')}
diff --git a/kallithea/templates/pullrequests/pullrequest_show_all.html b/kallithea/templates/pullrequests/pullrequest_show_all.html --- a/kallithea/templates/pullrequests/pullrequest_show_all.html +++ b/kallithea/templates/pullrequests/pullrequest_show_all.html @@ -28,12 +28,12 @@ ${self.repo_context_bar('showpullrequest
%if request.authuser.username != 'default': - ${_('Open New Pull Request')} + ${_('Open New Pull Request')} %endif %if c.from_: - ${_('Show Pull Requests to %s') % c.repo_name} + ${_('Show Pull Requests to %s') % c.repo_name} %else: - ${_("Show Pull Requests from '%s'") % c.repo_name} + ${_("Show Pull Requests from '%s'") % c.repo_name} %endif
diff --git a/kallithea/templates/summary/summary.html b/kallithea/templates/summary/summary.html --- a/kallithea/templates/summary/summary.html +++ b/kallithea/templates/summary/summary.html @@ -19,12 +19,12 @@ ##FORK %if c.db_repo.fork: - - ${_('Fork of')} "${c.db_repo.fork.repo_name}" + - ${_('Fork of')} "${c.db_repo.fork.repo_name}" %endif ##REMOTE %if c.db_repo.clone_uri: - - ${_('Clone from')} "${h.hide_credentials(c.db_repo.clone_uri)}" + - ${_('Clone from')} "${h.hide_credentials(c.db_repo.clone_uri)}" %endif @@ -106,7 +106,7 @@ ${self.repo_context_bar('summary')} %endif %else: - ${_('Download as zip')} + ${_('Download as zip')} ${h.hidden('download_options')} @@ -122,19 +122,19 @@ ${self.repo_context_bar('summary')}