From 7538f93ca56e2e82d10d9c57567bfb25a3debdc2 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jan 25 2016 10:22:42 +0000 Subject: Fix showing the last commits at their right place Adjust the HTML so that the tags are correctly indented and closes fine --- diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html index 092f348..edd30bf 100644 --- a/pagure/templates/repo_info.html +++ b/pagure/templates/repo_info.html @@ -189,149 +189,147 @@ git push -u origin master {% for user in repo.users %} -
- - {{ user.default_email | avatar(20) | safe }} - {{ user.fullname }} ({{ user.user }}) - -
+
+ + {{ user.default_email | avatar(20) | safe }} + {{ user.fullname }} ({{ user.user }}) + +
{% endfor %} {% for group in repo.groups %} -
- - @{{ group.group_name }} - -
- {% endfor %} - -
Branches
-
- {% for branch in branches %}
- {% if not branchname == branch %} - - {% endif %} - {{branch}} - {% if not branchname == branch %} + + @{{ group.group_name }} - {% endif %} -
- {% endfor %} +
+ {% endfor %} -
Source GIT URLs{% if - (authenticated and repo_admin) or - (config['DOC_APP_URL'] and repo and - repo.settings.get('project_documentation', True)) - %} - {%endif%}
+ +
Branches
+
+ {% for branch in branches %}
+ {% if not branchname == branch %} + + {% endif %} + {{branch}} + {% if not branchname == branch %} + + {% endif %} +
+ {% endfor %} +
+
Source GIT URLs{% if + (authenticated and repo_admin) or + (config['DOC_APP_URL'] and repo and + repo.settings.get('project_documentation', True)) + %} + {%endif%}
+
+
+
+
SSH
+ +
+
+
+
+
GIT
+ +
+
+
+ {% if config['DOC_APP_URL'] + and repo + and repo.settings.get('project_documentation', True) %} +
Docs GIT URLs
+ {% if authenticated and repo_admin %}
SSH
+ config.get('GIT_URL_SSH') }}docs/{{ repo.fullname }}.git" readonly>
+ {% endif %}
GIT
+ config.get('GIT_URL_GIT') }}docs/{{ repo.fullname }}.git" readonly>
-
- {% if config['DOC_APP_URL'] - and repo - and repo.settings.get('project_documentation', True) %} -
Docs GIT URLs
- {% if authenticated and repo_admin %} -
-
-
SSH
- -
-
- {% endif %} -
-
-
GIT
- -
-
- {%endif%} - {% if authenticated and repo_admin %} - {% if config.get('ENABLE_TICKETS', True) %} -
Issues GIT URLs
-
-
-
SSH
- -
-
- {%endif%} -
Pull Requests GIT URLs
-
-
-
SSH
- -
-
{% endif %} + {% if authenticated and repo_admin %} + {% if config.get('ENABLE_TICKETS', True) %} +
Issues GIT URLs
+
+
+
SSH
+
+
+ {% endif %} +
Pull Requests GIT URLs
+
+
+
SSH
+
+ {% endif %}
+
- - {% if last_commits %} -
-
- Recent Commits in - - - {{branchname}} - - -
-
-
- {% for commit in last_commits %} - -
- - - {{ commit.author | author2avatar(20) | safe }} - {{ commit.author.name }} - - commited {{ commit.commit_time|humanize }} - -
-
- {{ commit.message.split('\n')[0] }} - {% if diff_commits and commit.oid.hex in diff_commits %} - * - {% endif %} -
- - {% endfor %} + {% if last_commits %} +
+
+ Recent Commits in + + + {{branchname}} + + +
+
+
+ {% for commit in last_commits %} + +
+ + + {{ commit.author | author2avatar(20) | safe }} + {{ commit.author.name }} + + commited {{ commit.commit_time|humanize }} + +
+
+ {{ commit.message.split('\n')[0] }} + {% if diff_commits and commit.oid.hex in diff_commits %} + * + {% endif %} +
+ + {% endfor %} +
+
+ {% endif %}
- {% endif %} -
{% endif %} - {% endblock %} diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html index c7b5c03..13c3048 100644 --- a/pagure/templates/repo_master.html +++ b/pagure/templates/repo_master.html @@ -143,6 +143,7 @@ +
{% block repo %} {% endblock %}