diff --git a/app/templates/macros/stats.html b/app/templates/macros/stats.html index 9d60accc..b712ad92 100644 --- a/app/templates/macros/stats.html +++ b/app/templates/macros/stats.html @@ -5,6 +5,30 @@ {% endmacro %} +{% macro render_package_selector(user, package=None) %} + + + {% if package %} + {{ package.title }} + {% else %} + {{ _("%(display_name)s's packages", display_name=user.display_name) }} + {% endif %} + + + + {{ _("%(display_name)s's packages", display_name=user.display_name) }} + + + {% for package in user.packages.filter_by(state='APPROVED').all() %} + + {{ package.title }} + + {% endfor %} + + +{% endmacro %} + + {% macro render_package_stats(source, downloads) %} diff --git a/app/templates/packages/stats.html b/app/templates/packages/stats.html index 8da03132..5495b38a 100644 --- a/app/templates/packages/stats.html +++ b/app/templates/packages/stats.html @@ -4,17 +4,20 @@ {{ _("Statistics") }} - {{ package.title }} {% endblock %} -{% from "macros/stats.html" import render_package_stats, render_package_stats_js %} +{% from "macros/stats.html" import render_package_stats, render_package_stats_js, render_package_selector %} {% block scriptextra %} {{ render_package_stats_js() }} {% endblock %} {% block content %} - - - {{ _("Download (.csv)") }} - + + + + {{ _("Download (.csv)") }} + + {{ render_package_selector(package.author, package=package) }} + {{ _("Statistics") }} {{ render_package_stats(package.getURL('api.package_stats'), package.downloads) }} {% endblock %} diff --git a/app/templates/users/stats.html b/app/templates/users/stats.html index b2a08eda..dd3dd318 100644 --- a/app/templates/users/stats.html +++ b/app/templates/users/stats.html @@ -11,6 +11,9 @@ {% endblock %} {% block content %} + + {{ render_package_selector(user, package=None) }} + {{ self.title() }} {{ render_package_stats(url_for("api.user_stats", username=user.username), downloads) }} {% endblock %}
diff --git a/app/templates/packages/stats.html b/app/templates/packages/stats.html index 8da03132..5495b38a 100644 --- a/app/templates/packages/stats.html +++ b/app/templates/packages/stats.html @@ -4,17 +4,20 @@ {{ _("Statistics") }} - {{ package.title }} {% endblock %} -{% from "macros/stats.html" import render_package_stats, render_package_stats_js %} +{% from "macros/stats.html" import render_package_stats, render_package_stats_js, render_package_selector %} {% block scriptextra %} {{ render_package_stats_js() }} {% endblock %} {% block content %} - - - {{ _("Download (.csv)") }} - +