# HG changeset patch # User Mads Kiilerich # Date 2020-05-18 21:16:51 # Node ID 64cc63e186e62cefc8f2c2994731b16494db18d1 # Parent 96142cbb728fb7efedbc0fec6a67235f67f2028a html: make sure indented close tags always match indentation of open tag diff --git a/kallithea/templates/admin/gists/edit.html b/kallithea/templates/admin/gists/edit.html --- a/kallithea/templates/admin/gists/edit.html +++ b/kallithea/templates/admin/gists/edit.html @@ -61,7 +61,7 @@ %else: ${_('Expires')}: ${h.age(h.time_to_datetime(c.gist.gist_expires))} %endif - + 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 @@ -14,9 +14,9 @@ %endfor - %else: + %else:
${_('All IP addresses are allowed.')}
- %endif + %endif ${h.form(url('edit_user_ips_update', id=c.user.user_id))} diff --git a/kallithea/templates/admin/repos/repo_add_base.html b/kallithea/templates/admin/repos/repo_add_base.html --- a/kallithea/templates/admin/repos/repo_add_base.html +++ b/kallithea/templates/admin/repos/repo_add_base.html @@ -7,7 +7,7 @@ ${h.form(url('repos'))}
${h.text('repo_name',class_='form-control')}
- +
diff --git a/kallithea/templates/admin/repos/repo_edit_settings.html b/kallithea/templates/admin/repos/repo_edit_settings.html --- a/kallithea/templates/admin/repos/repo_edit_settings.html +++ b/kallithea/templates/admin/repos/repo_edit_settings.html @@ -49,7 +49,7 @@ ${h.form(url('update_repo', repo_name=c. ${h.text('owner',class_='form-control', placeholder=_('Type name of user'))} ${_('Change owner of this repository.')}
-
+
@@ -91,7 +91,7 @@ ${h.form(url('update_repo', repo_name=c. ${field.field_desc} %endif
-
+ %endfor %endif
diff --git a/kallithea/templates/admin/settings/settings_global.html b/kallithea/templates/admin/settings/settings_global.html --- a/kallithea/templates/admin/settings/settings_global.html +++ b/kallithea/templates/admin/settings/settings_global.html @@ -1,12 +1,12 @@ ${h.form(url('admin_settings_global'), method='post')}
-
+
${h.text('title',size=30,class_='form-control')} ${_('Set a custom title for your Kallithea Service.')}
-
+
@@ -49,6 +49,6 @@ ${h.form(url('admin_settings_global'), m ${h.submit('save',_('Save Settings'),class_="btn btn-default")} ${h.reset('reset',_('Reset'),class_="btn btn-default")}
-
+
${h.end_form()} diff --git a/kallithea/templates/admin/settings/settings_vcs.html b/kallithea/templates/admin/settings/settings_vcs.html --- a/kallithea/templates/admin/settings/settings_vcs.html +++ b/kallithea/templates/admin/settings/settings_vcs.html @@ -58,7 +58,7 @@ ${h.form(url('admin_settings'), method=' ${h.submit('save',_('Save Settings'),class_="btn btn-default")} ${h.reset('reset',_('Reset'),class_="btn btn-default")} - + ${h.end_form()} diff --git a/kallithea/templates/admin/settings/settings_visual.html b/kallithea/templates/admin/settings/settings_visual.html --- a/kallithea/templates/admin/settings/settings_visual.html +++ b/kallithea/templates/admin/settings/settings_visual.html @@ -95,7 +95,7 @@ ${h.form(url('admin_settings_visual'), m ${_('Show public/private icons next to repository names.')} - +
@@ -120,7 +120,7 @@ ${h.form(url('admin_settings_visual'), m
  • [see => URI] see => URI
  • - +
    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 @@ -171,7 +171,7 @@
  • ${_('Fork')}
  • ${_('Create Pull Request')}
  • %endif - +
    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 @@ -139,8 +139,8 @@ ${self.repo_context_bar('changelog', c.c % else: ${ungettext('%s file changed with %s insertions and %s deletions', '%s files changed with %s insertions and %s deletions', len(file_diff_data)) % (len(file_diff_data), c.lines_added, c.lines_deleted)}: %endif - -
    +
    +
    %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:
    @@ -182,7 +182,7 @@ ${self.repo_context_bar('changelog', c.c ## main comment form and it status ${comment.comments()} -
    +
    ## FORM FOR MAKING JS ACTION AS CHANGESET COMMENTS - + 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 @@ -30,11 +30,14 @@ ${self.repo_context_bar('changelog')} ## divs are "inline-block" and cannot have whitespace between them. ${h.hidden('compare_org')} - + - + ${h.hidden('compare_other')} - + %if not c.compare_home: ${_('Swap')} %endif diff --git a/kallithea/templates/files/files_browser.html b/kallithea/templates/files/files_browser.html --- a/kallithea/templates/files/files_browser.html +++ b/kallithea/templates/files/files_browser.html @@ -90,14 +90,15 @@ %if node.is_file(): - ${h.age(node.last_changeset.date)} + ${h.age(node.last_changeset.date)} + %endif %if node.is_file(): - ${h.person(node.last_changeset.author)} - + ${h.person(node.last_changeset.author)} + %endif diff --git a/kallithea/templates/password_reset_confirmation.html b/kallithea/templates/password_reset_confirmation.html --- a/kallithea/templates/password_reset_confirmation.html +++ b/kallithea/templates/password_reset_confirmation.html @@ -54,7 +54,7 @@ ${h.end_form()} - + diff --git a/kallithea/templates/register.html b/kallithea/templates/register.html --- a/kallithea/templates/register.html +++ b/kallithea/templates/register.html @@ -97,7 +97,7 @@ }); - - - - + + + + diff --git a/kallithea/templates/summary/statistics.html b/kallithea/templates/summary/statistics.html --- a/kallithea/templates/summary/statistics.html +++ b/kallithea/templates/summary/statistics.html @@ -22,7 +22,7 @@ <%def name="main()"> ${self.repo_context_bar('summary')} -
    +
    ${self.breadcrumbs()}
    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 @@ -126,13 +126,13 @@ ${self.repo_context_bar('summary')}