diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html index cb1b5ea..f45d9cd 100644 --- a/pagure/templates/issues.html +++ b/pagure/templates/issues.html @@ -1,5 +1,7 @@ {% extends "repo_master.html" %} +{% from "_render_repo.html" import pagination_link %} + {% block title %}Issues - {{ repo.namespace + '/' if repo.namespace }}{{ repo.name }}{% endblock %} {% set tag = "home"%} @@ -10,9 +12,9 @@

{% if status|lower in ['open', 'true'] %} - {{ issues|count }} Open Issues + {{ issues|count }} Open Issues (on {{ issues_cnt }}) {% elif status|lower not in ['open', 'true', 'all', 'none'] %} - {{ issues|count }} Closed Issues + {{ issues|count }} Closed Issues (on {{ issues_cnt }}) {% else %} {{ issues|count }} Issues {% endif %} @@ -251,6 +253,8 @@ +{{ pagination_link('page', g.page, total_page) }} + {% endblock %} {% block jscripts %} {{ super() }} diff --git a/pagure/templates/requests.html b/pagure/templates/requests.html index 9fc5709..12e0c02 100644 --- a/pagure/templates/requests.html +++ b/pagure/templates/requests.html @@ -1,5 +1,7 @@ {% extends "repo_master.html" %} +{% from "_render_repo.html" import pagination_link %} + {% block title %}Pull requests - {{ repo.namespace + '/' if repo.namespace }}{{ repo.name }}{% endblock %} {% set tag = "home" %} @@ -9,10 +11,12 @@

- {% if status|lower != 'open' and status|lower != 'false' %} - {{ status }} {% elif status|lower != 'open' -%} - Closed/Merged {% endif -%} - Pull Requests {{ requests|count }} + {{ requests|count }} {% + if status and status|lower != 'open' and status|lower != 'false' + %} {{ status }} {% + elif status and status|lower != 'open' + %} Closed/Merged {% endif -%} + Pull Requests (on {{ requests_cnt }}) {% if authenticated and repo.settings.get('pull_requests', True) %} @@ -190,6 +194,7 @@

+{{ pagination_link('page', g.page, total_page) }} {% endblock %}