Mercurial > kallithea
changeset 6435:94a9ce213964
templates: reduce html errors/warnings
author | domruf <dominikruf@gmail.com> |
---|---|
date | Wed, 11 Jan 2017 22:23:35 +0100 |
parents | 1ab38cd72704 |
children | b6eba3ea7af9 |
files | kallithea/templates/about.html kallithea/templates/admin/repos/repo_edit_fields.html kallithea/templates/admin/repos/repo_edit_remote.html kallithea/templates/admin/settings/settings_vcs.html kallithea/templates/changeset/changeset_file_comment.html kallithea/templates/changeset/diff_block.html kallithea/templates/files/files_add.html kallithea/templates/pullrequests/pullrequest_data.html kallithea/templates/search/search_commit.html |
diffstat | 9 files changed, 25 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/templates/about.html Tue Sep 20 20:01:59 2016 +0200 +++ b/kallithea/templates/about.html Wed Jan 11 22:23:35 2017 +0100 @@ -24,7 +24,7 @@ v 3.0 (GPLv3)</a>.</p> <p>Kallithea is copyrighted by various authors, including but not - necessarily limited to the following: + necessarily limited to the following:</p> <ul style="margin: 0 0 0 50px;"> <li>Copyright © 2012–2016, Mads Kiilerich</li> @@ -144,7 +144,7 @@ ## Stefan Engel <mail@engel-stefan.de> in 2012 ## Ton Plomp <tcplomp@gmail.com> in 2013 ## - </ul></p> + </ul> <p>The above are the copyright holders who have submitted direct contributions to the Kallithea repository. In
--- a/kallithea/templates/admin/repos/repo_edit_fields.html Tue Sep 20 20:01:59 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_fields.html Wed Jan 11 22:23:35 2017 +0100 @@ -2,11 +2,12 @@ %if c.repo_fields: <div class="emails_wrap"> <table class="table"> - <th>${_('Label')}</th> - <th>${_('Key')}</th> - <th>${_('Type')}</th> - <th>${_('Action')}</th> - + <tr> + <th>${_('Label')}</th> + <th>${_('Key')}</th> + <th>${_('Type')}</th> + <th>${_('Action')}</th> + </tr> %for field in c.repo_fields: <tr> <td>${field.field_label}</td>
--- a/kallithea/templates/admin/repos/repo_edit_remote.html Tue Sep 20 20:01:59 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_remote.html Wed Jan 11 22:23:35 2017 +0100 @@ -1,6 +1,6 @@ %if c.repo_info.clone_uri: <h4> - ${_('Remote repository URL')}: <a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri_hidden}</a></li> + ${_('Remote repository URL')}: <a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri_hidden}</a> </h4> ${h.form(url('edit_repo_remote_update', repo_name=c.repo_name))} <div class="form">
--- a/kallithea/templates/admin/settings/settings_vcs.html Tue Sep 20 20:01:59 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_vcs.html Wed Jan 11 22:23:35 2017 +0100 @@ -62,7 +62,7 @@ ${h.text('paths_root_path',size=60,readonly="readonly",class_='form-control')} <span id="path_unlock" data-toggle="tooltip" style="cursor: pointer" title="${_('Click to unlock. You must restart Kallithea in order to make this setting take effect.')}"> - <div class="btn btn-default btn-sm"><i id="path_unlock_icon" class="icon-lock"></i></div> + <span class="btn btn-default btn-sm"><i id="path_unlock_icon" class="icon-lock"></i></span> </span> <span class="help-block">${_('Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required.')}</span> </div>
--- a/kallithea/templates/changeset/changeset_file_comment.html Tue Sep 20 20:01:59 2016 +0200 +++ b/kallithea/templates/changeset/changeset_file_comment.html Wed Jan 11 22:23:35 2017 +0100 @@ -26,7 +26,7 @@ %if co.author_id == c.authuser.user_id or h.HasRepoPermissionAny('repository.admin')(c.repo_name): %if co.deletable(): - <div onClick="confirm('${_("Delete comment?")}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-default btn-xs" style="margin:0 5px">${_('Delete')}</div> + <div onClick="confirm('${_('Delete comment?')}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-default btn-xs" style="margin:0 5px">${_('Delete')}</div> %endif %endif </div>
--- a/kallithea/templates/changeset/diff_block.html Tue Sep 20 20:01:59 2016 +0200 +++ b/kallithea/templates/changeset/diff_block.html Wed Jan 11 22:23:35 2017 +0100 @@ -29,32 +29,32 @@ <div class="diff-actions"> <span style="margin: 0 10px"> %if op == 'A': - <span class="no-file" data-toggle="tooltip" title="${_("No file before")}"> + <span class="no-file" data-toggle="tooltip" title="${_('No file before')}"> <i class="icon-minus-circled"></i></span> %else: - <a href="${h.url('files_home', repo_name=a_repo_name, f_path=a_filename, revision=a_rev)}" data-toggle="tooltip" title="${_("File before")}"> + <a href="${h.url('files_home', repo_name=a_repo_name, f_path=a_filename, revision=a_rev)}" data-toggle="tooltip" title="${_('File before')}"> <i class="icon-doc"></i></a> %endif %if op == 'A': - <span class="arrow" data-toggle="tooltip" title="${_("Added")}">➞</span> + <span class="arrow" data-toggle="tooltip" title="${_('Added')}">➞</span> %elif op == 'M': - <span class="arrow" data-toggle="tooltip" title="${_("Modified")}">➞</span> + <span class="arrow" data-toggle="tooltip" title="${_('Modified')}">➞</span> %elif op == 'D': - <span class="arrow" data-toggle="tooltip" title="${_("Deleted")}">➞</span> + <span class="arrow" data-toggle="tooltip" title="${_('Deleted')}">➞</span> %elif op == 'R': - <span class="arrow" data-toggle="tooltip" title="${_("Renamed")}">➞</span> + <span class="arrow" data-toggle="tooltip" title="${_('Renamed')}">➞</span> %elif op is None: - <span class="arrow" data-toggle="tooltip" title="${_("No change")}">➞</span> + <span class="arrow" data-toggle="tooltip" title="${_('No change')}">➞</span> %else: - <span class="arrow" data-toggle="tooltip" title="${_("Unknown operation: %r") % op}">➞</span> + <span class="arrow" data-toggle="tooltip" title="${_('Unknown operation: %r') % op}">➞</span> %endif %if op == 'D': - <span class="no-file" data-toggle="tooltip" title="${_("No file after")}"> + <span class="no-file" data-toggle="tooltip" title="${_('No file after')}"> <i class="icon-minus-circled"></i></span> %else: - <a href="${h.url('files_home', repo_name=cs_repo_name, f_path=cs_filename, revision=cs_rev)}" data-toggle="tooltip" title="${_("File after")}"> + <a href="${h.url('files_home', repo_name=cs_repo_name, f_path=cs_filename, revision=cs_rev)}" data-toggle="tooltip" title="${_('File after')}"> <i class="icon-doc"></i></a> %endif </span>
--- a/kallithea/templates/files/files_add.html Tue Sep 20 20:01:59 2016 +0200 +++ b/kallithea/templates/files/files_add.html Wed Jan 11 22:23:35 2017 +0100 @@ -44,7 +44,7 @@ </span> <span id="upload_file_container" class="reviewer_ac" style="display:none"> <input class="form-control" type="file" size="20" name="upload_file" id="upload_file"> - ${_('or')} <div class="btn btn-default btn-sm" id="file_enable">${_('Create New File')}</div> + ${_('or')} <span class="btn btn-default btn-sm" id="file_enable">${_('Create New File')}</span> </span> </h3> <div id="body" class="codeblock">
--- a/kallithea/templates/pullrequests/pullrequest_data.html Tue Sep 20 20:01:59 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_data.html Wed Jan 11 22:23:35 2017 +0100 @@ -25,9 +25,9 @@ <td width="80px"> <% status = pr.user_review_status(c.authuser.user_id) %> %if status: - <i class="icon-circle changeset-status-${status}" title="${_("You voted: %s") % h.changeset_status_lbl(status)}"></i> + <i class="icon-circle changeset-status-${status}" title="${_('You voted: %s') % h.changeset_status_lbl(status)}"></i> %else: - <i class="icon-circle changeset-status-not_reviewed" title="${_("You didn't vote")}"></i> + <i class="icon-circle changeset-status-not_reviewed" title="${_('You didn\'t vote')}"></i> %endif </td> <td>
--- a/kallithea/templates/search/search_commit.html Tue Sep 20 20:01:59 2016 +0200 +++ b/kallithea/templates/search/search_commit.html Wed Jan 11 22:23:35 2017 +0100 @@ -13,7 +13,7 @@ <div class="author"> ${h.gravatar_div(h.email_or_none(sr['author']), size=20)} <span>${h.person(sr['author'])}</span><br/> - <span>${h.email_or_none(sr['author'])}</a></span><br/> + <span>${h.email_or_none(sr['author'])}</span><br/> </div> %if sr['message_hl']: <div class="search-code-body">