diff --git a/kallithea/public/css/contextbar.css b/kallithea/public/css/contextbar.css --- a/kallithea/public/css/contextbar.css +++ b/kallithea/public/css/contextbar.css @@ -51,6 +51,8 @@ i[class^='icon-'] { #content #context-bar h2 { display: inline-block; color: #FFF; + margin: 8px 20px 3px; + padding-bottom: 2px; } #header #header-inner #quick a, diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css --- a/kallithea/public/css/style.css +++ b/kallithea/public/css/style.css @@ -3941,11 +3941,6 @@ div.pr-details-title.closed { background: #eee; } -div.pr-details-title { - font-size: 1.6em; - padding: 5px 0px; -} - div.pr { margin: 0px 20px; padding: 4px 4px; diff --git a/kallithea/templates/admin/my_account/my_account_password.html b/kallithea/templates/admin/my_account/my_account_password.html --- a/kallithea/templates/admin/my_account/my_account_password.html +++ b/kallithea/templates/admin/my_account/my_account_password.html @@ -1,4 +1,4 @@ -
${_('Change Your Account Password')}
+

${_('Change Your Account Password')}

%if c.can_change_password: diff --git a/kallithea/templates/admin/my_account/my_account_repos.html b/kallithea/templates/admin/my_account/my_account_repos.html --- a/kallithea/templates/admin/my_account/my_account_repos.html +++ b/kallithea/templates/admin/my_account/my_account_repos.html @@ -1,4 +1,4 @@ -
${_('Repositories You Own')}
+

${_('Repositories You Own')}

diff --git a/kallithea/templates/admin/my_account/my_account_watched.html b/kallithea/templates/admin/my_account/my_account_watched.html --- a/kallithea/templates/admin/my_account/my_account_watched.html +++ b/kallithea/templates/admin/my_account/my_account_watched.html @@ -1,4 +1,4 @@ -
${_('Repositories You are Watching')}
+

${_('Repositories You are Watching')}

diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html b/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html @@ -1,4 +1,4 @@ -
${_('Repository Group: %s') % c.repo_group.group_name}
+

${_('Repository Group: %s') % c.repo_group.group_name}

<% diff --git a/kallithea/templates/admin/repos/repo_creating.html b/kallithea/templates/admin/repos/repo_creating.html --- a/kallithea/templates/admin/repos/repo_creating.html +++ b/kallithea/templates/admin/repos/repo_creating.html @@ -23,7 +23,9 @@
+

${_('Repository "%(repo_name)s" is being created, you will be redirected when this process is finished.' % {'repo_name':c.repo_name})} +

diff --git a/kallithea/templates/admin/repos/repo_edit_caches.html b/kallithea/templates/admin/repos/repo_edit_caches.html --- a/kallithea/templates/admin/repos/repo_edit_caches.html +++ b/kallithea/templates/admin/repos/repo_edit_caches.html @@ -9,13 +9,13 @@ ${h.form(url('update_repo_caches', repo_
- ${_('List of Cached Values')} - - +
${_('List of Cached Values')}
+
+ - + %for cache in c.repo_info.cache_keys: @@ -23,7 +23,7 @@ ${h.form(url('update_repo_caches', repo_ %endfor -
${_('Prefix')} ${_('Key')} ${_('Active')}
${cache.get_prefix() or '-'}${h.boolicon(cache.cache_active)}
+
diff --git a/kallithea/templates/admin/repos/repo_edit_fields.html b/kallithea/templates/admin/repos/repo_edit_fields.html --- a/kallithea/templates/admin/repos/repo_edit_fields.html +++ b/kallithea/templates/admin/repos/repo_edit_fields.html @@ -58,7 +58,7 @@ ${h.end_form()} %else: -
+

${_('Extra fields are disabled.')} -

+ %endif diff --git a/kallithea/templates/admin/repos/repo_edit_remote.html b/kallithea/templates/admin/repos/repo_edit_remote.html --- a/kallithea/templates/admin/repos/repo_edit_remote.html +++ b/kallithea/templates/admin/repos/repo_edit_remote.html @@ -1,7 +1,7 @@ %if c.repo_info.clone_uri: -
+

${_('Remote repository URL')}: ${c.repo_info.clone_uri_hidden} -

+ ${h.form(url('edit_repo_remote_update', repo_name=c.repo_name))}
@@ -13,7 +13,7 @@ ${h.form(url('edit_repo_remote_update',
${h.end_form()} %else: -
+

${_('This repository does not have a remote repository URL.')} -

+ %endif diff --git a/kallithea/templates/admin/user_groups/user_group_edit_advanced.html b/kallithea/templates/admin/user_groups/user_group_edit_advanced.html --- a/kallithea/templates/admin/user_groups/user_group_edit_advanced.html +++ b/kallithea/templates/admin/user_groups/user_group_edit_advanced.html @@ -1,4 +1,4 @@ -
${_('User Group: %s') % c.user_group.users_group_name}
+

${_('User Group: %s') % c.user_group.users_group_name}

<% diff --git a/kallithea/templates/admin/users/user_edit_advanced.html b/kallithea/templates/admin/users/user_edit_advanced.html --- a/kallithea/templates/admin/users/user_edit_advanced.html +++ b/kallithea/templates/admin/users/user_edit_advanced.html @@ -1,4 +1,4 @@ -
${_('User: %s') % c.user.username}
+

${_('User: %s') % c.user.username}

<% diff --git a/kallithea/templates/base/perms_summary.html b/kallithea/templates/base/perms_summary.html --- a/kallithea/templates/base/perms_summary.html +++ b/kallithea/templates/base/perms_summary.html @@ -7,7 +7,7 @@
%for section in sorted(permissions.keys()):
- ${section.replace("_"," ").capitalize()} +

${section.replace("_"," ").capitalize()}

%if section != 'global':
${_('Show')}: 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 @@ -54,10 +54,10 @@ ${self.repo_context_bar('changelog')} %endfor
-
${_('Files affected')}
+

${_('Files affected')}

%for cs in c.cs_ranges: -
${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}
+
${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}
<% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %> %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:
diff --git a/kallithea/templates/compare/compare_cs.html b/kallithea/templates/compare/compare_cs.html --- a/kallithea/templates/compare/compare_cs.html +++ b/kallithea/templates/compare/compare_cs.html @@ -95,7 +95,7 @@
%if c.as_form: -
+
## links should perhaps use ('rev', c.a_rev) instead ... ${h.link_to(_('Show merge diff'), h.url('compare_url', @@ -105,7 +105,7 @@ other_ref_type=c.cs_ref_type, other_ref_name=c.cs_ref_name, merge='1') )} -
+ %endif %if c.cs_ranges_org is not None: ## TODO: list actual changesets? 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 @@ -44,17 +44,16 @@ ${self.repo_context_bar('changelog')} %if c.compare_home:
-
${_('Compare revisions, branches, bookmarks, or tags.')}
+

${_('Compare revisions, branches, bookmarks, or tags.')}

%else:
##CS -
${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}
+
${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}
<%include file="compare_cs.html" /> ## FILES -
- +
% if c.limited_diff: ${ungettext('%s file changed', '%s files changed', len(c.file_diff_data)) % len(c.file_diff_data)}: % else: @@ -63,8 +62,7 @@ ${self.repo_context_bar('changelog')} ${c.ignorews_url(request.GET)} ${c.context_url(request.GET)} - -
+
%if not c.file_diff_data: ${_('No files')} diff --git a/kallithea/templates/errors/error_document.html b/kallithea/templates/errors/error_document.html --- a/kallithea/templates/errors/error_document.html +++ b/kallithea/templates/errors/error_document.html @@ -35,7 +35,7 @@
-
${c.site_name}
+

${c.site_name}

${c.error_message}

${c.error_explanation}

diff --git a/kallithea/templates/journal/journal_data.html b/kallithea/templates/journal/journal_data.html --- a/kallithea/templates/journal/journal_data.html +++ b/kallithea/templates/journal/journal_data.html @@ -2,7 +2,7 @@ %if c.journal_day_aggregate: %for day,items in c.journal_day_aggregate: -
${day}
+

${day}

% for user,entries in items:
${h.gravatar_div(user.email if user else 'anonymous@kallithea-scm.org', size=24)} diff --git a/kallithea/templates/pullrequests/pullrequest_data.html b/kallithea/templates/pullrequests/pullrequest_data.html --- a/kallithea/templates/pullrequests/pullrequest_data.html +++ b/kallithea/templates/pullrequests/pullrequest_data.html @@ -3,11 +3,11 @@ <%def name="pullrequest_overview(pullrequests)"> %if not len(pullrequests): -
${_('No entries')}
+
${_('No entries')}
<% return %> %endif -
+
diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html --- a/kallithea/templates/pullrequests/pullrequest_show.html +++ b/kallithea/templates/pullrequests/pullrequest_show.html @@ -25,10 +25,12 @@ ${self.repo_context_bar('showpullrequest ${h.form(url('pullrequest_post', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), method='post', id='pull_request_form')}
+

${_('Title')}: ${c.pull_request.title} %if c.pull_request.is_closed(): (${_('Closed')}) %endif +

@@ -204,8 +206,8 @@ ${self.repo_context_bar('showpullrequest
## REVIEWERS -
-
${_('Pull Request Reviewers')}
+
+

${_('Pull Request Reviewers')}

## members goes here !
@@ -251,7 +253,7 @@ ${self.repo_context_bar('showpullrequest
%if not c.pull_request_reviewers: -
${_('Potential Reviewers')}
+

${_('Potential Reviewers')}

${_('Click to add the repository owner as reviewer:')} @@ -260,6 +262,7 @@ ${self.repo_context_bar('showpullrequest %for u in [c.pull_request.other_repo.owner]:
  • -
    +
    ${comment.comment_count(c.inline_cnt, len(c.comments))} -
    + ##CS -
    +
    ${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)} -
    + <%include file="/compare/compare_cs.html" /> -
    +
    ${_('Common ancestor')}: ${h.link_to(h.short_id(c.a_rev),h.url('changeset_home',repo_name=c.a_repo.repo_name,revision=c.a_rev), class_="changeset_hash")} -
    + ## FILES -
    - +
    % if c.limited_diff: ${ungettext('%s file changed', '%s files changed', len(c.file_diff_data)) % len(c.file_diff_data)}: % else: ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.file_diff_data)) % (len(c.file_diff_data),c.lines_added,c.lines_deleted)}: %endif - -
    +
    %if not c.file_diff_data: ${_('No files')} diff --git a/kallithea/templates/pullrequests/pullrequest_show_my.html b/kallithea/templates/pullrequests/pullrequest_show_my.html --- a/kallithea/templates/pullrequests/pullrequest_show_my.html +++ b/kallithea/templates/pullrequests/pullrequest_show_my.html @@ -29,16 +29,15 @@ ${h.link_to(_('Show closed pull requests (in addition to open pull requests)'), h.url('my_pullrequests',closed=1))} %endif
    -
    -
    ${_('Pull Requests Created by Me')}
    - ${pullrequest_data.pullrequest_overview(c.my_pull_requests)} +

    ${_('Pull Requests Created by Me')}

    + ${pullrequest_data.pullrequest_overview(c.my_pull_requests)} -
    ${_('Pull Requests Needing My Review')}
    - ${pullrequest_data.pullrequest_overview(c.participate_in_pull_requests_todo)} +

    ${_('Pull Requests Needing My Review')}

    + ${pullrequest_data.pullrequest_overview(c.participate_in_pull_requests_todo)} -
    ${_('Pull Requests I Participate In')}
    - ${pullrequest_data.pullrequest_overview(c.participate_in_pull_requests)} - +

    ${_('Pull Requests I Participate In')}

    + ${pullrequest_data.pullrequest_overview(c.participate_in_pull_requests)} +
    • diff --git a/kallithea/tests/functional/test_journal.py b/kallithea/tests/functional/test_journal.py --- a/kallithea/tests/functional/test_journal.py +++ b/kallithea/tests/functional/test_journal.py @@ -8,7 +8,7 @@ class TestJournalController(TestControll self.log_user() response = self.app.get(url(controller='journal', action='index')) - response.mustcontain("""
    %s
    """ % datetime.date.today()) + response.mustcontain("""

    %s

    """ % datetime.date.today()) def test_stop_following_repository(self): session = self.log_user()