From b3813a2d0e80323e98113c713070c541b5cfdc9e Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Oct 20 2014 07:23:21 +0000 Subject: Fix indentation in some templates --- diff --git a/progit/templates/file.html b/progit/templates/file.html index 650f747..288b521 100644 --- a/progit/templates/file.html +++ b/progit/templates/file.html @@ -42,9 +42,14 @@ {{ content | format_loc}} {% endautoescape %} {% elif output_type == 'binary' or output_type == 'image' %} -

Binary files cannot be rendered.
Please + Binary files cannot be rendered.
+ Please +
view the raw version

+ filename=filename) }}">view the raw version + +

{% endif %} {% else %} diff --git a/progit/templates/index.html b/progit/templates/index.html index 10bbd65..a3e0292 100644 --- a/progit/templates/index.html +++ b/progit/templates/index.html @@ -17,14 +17,23 @@

{{ username | avatar(36) | safe }} {{ username }} {% if g.fas_user and g.fas_user.username == username %} - + {% endif %}

{{ repos_switch() }} - {{ render_repos(user_repos, total_page_repos, repopage, 'My Projects', user_repos_length, 'myrepos', username) }} - {{ render_repos(user_forks, total_page_forks, forkpage, 'My Forks', user_forks_length, 'myforks', username) }} + {{ render_repos( + user_repos, total_page_repos, repopage, + 'My Projects', user_repos_length, 'myrepos', username) }} + {{ render_repos( + user_forks, total_page_forks, forkpage, + 'My Forks', user_forks_length, 'myforks', username) }} {% endif %} - {{ render_repos(repos, total_page, page, 'All Projects', repos_length, 'repos', username) }} + {{ render_repos( + repos, total_page, page, + 'All Projects', repos_length, 'repos', username) }} {% endblock %} {% block jscripts %} diff --git a/progit/templates/pull_request.html b/progit/templates/pull_request.html index a261f88..3f75063 100644 --- a/progit/templates/pull_request.html +++ b/progit/templates/pull_request.html @@ -94,14 +94,16 @@ Author - {{ diff_commits[loop.index - 1].author.name }} {{ '<' + diff_commits[loop.index - 1].author.email + '>' }} + {{ diff_commits[loop.index - 1].author.name }} + {{ '<' + diff_commits[loop.index - 1].author.email + '>' }} - {{ diff_commits[loop.index - 1].commit_time | format_ts }} Committer - {{ diff_commits[loop.index - 1].committer.name }} {{ '<' + diff_commits[loop.index - 1].committer.email + '>' }} + {{ diff_commits[loop.index - 1].committer.name }} + {{ '<' + diff_commits[loop.index - 1].committer.email + '>' }} - {{ diff_commits[loop.index - 1].commit_time | format_ts }} diff --git a/progit/templates/render_repo.html b/progit/templates/render_repo.html index 33d8a88..8ad66e4 100644 --- a/progit/templates/render_repo.html +++ b/progit/templates/render_repo.html @@ -3,8 +3,13 @@ {% if loop.index == 1 %}
{% endif %} + {% if repo.is_fork %} + {% set url = url_for('view_repo', username=repo.user.username, repo=repo.name) %} + {% else %} + {% set url = url_for('view_repo', repo=repo.name) %} + {% endif %} {# TODO: get project logo #} {{ repo.name }}