diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css index 1941395..a8abce1 100644 --- a/pagure/static/pagure.css +++ b/pagure/static/pagure.css @@ -488,11 +488,19 @@ a.notblue:hover { background-color: #FDD; } +.addrem_bar.closed { + background-color: #DBFFDB; +} + .addrem_bar > span { display: block; background-color: #DBFFDB; } +.addrem_bar.closed > span { + background-color: #FDD; +} + .comment_body img { max-width: 100%; border: 5px solid #fff; diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html index de15abe..f12ac27 100644 --- a/pagure/templates/issues.html +++ b/pagure/templates/issues.html @@ -12,9 +12,9 @@

{% if status|lower in ['open', 'true'] %} - {{ issues|count }} Open Issues (of {{ total_issues_cnt }}) + {{ issues|count }} Open Issues (of {{ issues_cnt }}) {% elif status|lower not in ['open', 'true', 'all', 'none'] %} - {{ issues|count }} Closed Issues (of {{ total_issues_cnt }}) + {{ issues|count }} Closed Issues (of {{ issues_cnt }}) {% else %} {{ issues|count }} Issues {% endif %} @@ -49,9 +49,9 @@

{% if oth_issues %} -
+
{% if (issues | length + oth_issues) %} - + {{ (100.0 * (issues_cnt / total_issues_cnt))|round|int }}% {% endif %} diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py index 0e385c2..fe9ba1c 100644 --- a/pagure/ui/issues.py +++ b/pagure/ui/issues.py @@ -506,6 +506,7 @@ def view_issues(repo, username=None, namespace=None): status = None oth_issues = None + oth_issues_cnt = None total_issues_cnt = pagure.lib.search_issues( SESSION, repo, tags=tags, assignee=assignee, author=author, private=private, priority=priority, count=True) @@ -552,6 +553,7 @@ def view_issues(repo, username=None, namespace=None): search_pattern=search_pattern, custom_search=custom_search, ) + oth_issues_cnt = total_issues_cnt ^ issues_cnt else: issues = pagure.lib.search_issues( SESSION, repo, tags=tags, assignee=assignee, @@ -577,6 +579,7 @@ def view_issues(repo, username=None, namespace=None): issues_cnt=issues_cnt, total_issues_cnt=total_issues_cnt, oth_issues=oth_issues, + oth_issues_cnt=oth_issues_cnt, tags=tags, assignee=assignee, author=author,