diff --git a/templates/admin/_release_report_page_footer.html b/templates/admin/_release_report_page_footer.html new file mode 100644 index 00000000..0f1d741a --- /dev/null +++ b/templates/admin/_release_report_page_footer.html @@ -0,0 +1,7 @@ +{% load static %} +
+ +
+ {{ version.display_name }} +
+
diff --git a/templates/admin/_release_report_top_left_logo.html b/templates/admin/_release_report_top_left_logo.html deleted file mode 100644 index 00dbda4c..00000000 --- a/templates/admin/_release_report_top_left_logo.html +++ /dev/null @@ -1,10 +0,0 @@ -{% load static %} -
-

- - Boost -

-
- {{ version.display_name }} -
-
diff --git a/templates/admin/release_report_detail.html b/templates/admin/release_report_detail.html index dd502281..f102a93f 100644 --- a/templates/admin/release_report_detail.html +++ b/templates/admin/release_report_detail.html @@ -40,18 +40,18 @@

-
{{ commit_count|intcomma }} commit{{ commit_count|pluralize }} up through {{ version.display_name }}
-
{{ lines_added|intcomma }} line{{ lines_added|pluralize }} added, {{ lines_removed|intcomma }} line{{ lines_removed|pluralize }} removed
-
{{ version_commit_count|intcomma }} new commit{{ version_commit_count|pluralize }} in all library repositories
-
{{ commit_contributors_release_count }} commit contributors, {{ commit_contributors_new_count }} new
-
{{ opened_issues_count|intcomma }} issues opened, {{ closed_issues_count|intcomma }} closed
-
{{ mailinglist_total|intcomma }} posts to the developer's mailing list
-
{{ mailinglist_contributor_release_count }} unique mailing list users, {{ mailinglist_contributor_new_count }} new
+
{{ commit_count|intcomma }} commit{{ commit_count|pluralize }} up through {{ version.display_name }}
+
{{ lines_added|intcomma }} line{{ lines_added|pluralize }} added, {{ lines_removed|intcomma }} line{{ lines_removed|pluralize }} removed
+
{{ version_commit_count|intcomma }} new commit{{ version_commit_count|pluralize }} in all library repositories
+
{{ commit_contributors_release_count }} commit contributors, {{ commit_contributors_new_count }} new
+
{{ opened_issues_count|intcomma }} issues opened, {{ closed_issues_count|intcomma }} closed
+
{{ mailinglist_total|intcomma }} posts to the developer's mailing list
+
{{ mailinglist_contributor_release_count }} unique mailing list users, {{ mailinglist_contributor_new_count }} new
{% if added_library_count %} -
{{ added_library_count }} librar{{ added_library_count|pluralize:"y,ies" }} added
+
{{ added_library_count }} librar{{ added_library_count|pluralize:"y,ies" }} added
{% endif %} {% if removed_library_count %} -
{{ removed_library_count }} librar{{ removed_library_count|pluralize:"y,ies" }} removed
+
{{ removed_library_count }} librar{{ removed_library_count|pluralize:"y,ies" }} removed
{% endif %} {% if downloads %} @@ -122,12 +122,12 @@

{% endfor %}
-
0 commits
+
0 commits
{% for color in contribution_box_graph.colors %}
{% endfor %} -
{{ contribution_box_graph.max }} commits
+
{{ contribution_box_graph.max }} commits
{% endif %} @@ -137,7 +137,6 @@

{% if version.sponsor_message %}
- {% include "admin/_release_report_top_left_logo.html" %}

From the Fiscal Sponsorship Committee

+ {% include "admin/_release_report_page_footer.html" %} {% endif %} @@ -168,7 +168,7 @@

Boost {{ version.display_name }}

Git activity for this release

-
{{ version_commit_count|intcomma }} Commit{{ version_commit_count|pluralize }} Across {{ library_count }} Repositories
+
{{ version_commit_count|intcomma }} Commit{{ version_commit_count|pluralize }} Across {{ library_count }} Repositories
@@ -182,7 +182,7 @@

Git activity for this release

{{ author.name }}
-
{{ author.commit_count }} commit{{ author.commit_count|pluralize }}
+
{{ author.commit_count }} commit{{ author.commit_count|pluralize }}
{% endfor %} @@ -198,8 +198,6 @@

Most Committed Libraries

- {% include "admin/_release_report_top_left_logo.html" %} -
Top Contributors
@@ -211,7 +209,7 @@

Most Committed Libraries

{{ item.name }}
-
{{ item.total_count }} post{{ item.total_count|pluralize }}
+
{{ item.total_count }} post{{ item.total_count|pluralize }}
{% endfor %} @@ -223,7 +221,7 @@

Mailing List

There were {% if mailinglist_total %} - {{ mailinglist_total|intcomma }} + {{ mailinglist_total|intcomma }} {% else %} no {% endif %} @@ -232,30 +230,30 @@

Mailing List

There {{ mailinglist_contributor_release_count|pluralize:"was,were" }} - {{ mailinglist_contributor_release_count }} + {{ mailinglist_contributor_release_count }} poster{{ mailinglist_contributor_release_count|pluralize }} - in this version. ({{ mailinglist_contributor_new_count }} New) + in this version. ({{ mailinglist_contributor_new_count }} New)
+ {% include "admin/_release_report_page_footer.html" %} {% if wordcloud_base64 %}
- - {% include "admin/_release_report_top_left_logo.html" %} -

Mailing List Word Cloud

Mailing List Word Cloud
+ + {% include "admin/_release_report_page_footer.html" %} +
{% endif %} {% if slack %} {% for slack_group in slack %}
- {% include "admin/_release_report_top_left_logo.html" %}

Slack Activity

@@ -274,7 +272,7 @@

Slack Activity

{{ item.real_name }}
-
{{ item.total }} message{{ item.total|pluralize }}
+
{{ item.total }} message{{ item.total|pluralize }}
{% endfor %} @@ -283,24 +281,24 @@

Slack Activity

- {{ slack_item.total|intcomma }} + {{ slack_item.total|intcomma }} slack message{{ slack_item.total|pluralize }} in #{{ slack_item.channel.name }}
- {{ slack_item.user_count }} + {{ slack_item.user_count }} {{ slack_item.user_count|pluralize:"person,people" }} - conversing in this release. ({{ slack_item.new_user_count }} New) + conversing in this release. ({{ slack_item.new_user_count }} New)
{% endfor %} + {% include "admin/_release_report_page_footer.html" %} {% endfor %} {% endif %}
- {% include "admin/_release_report_top_left_logo.html" %}

Library Index

@@ -311,10 +309,10 @@

Library Index

{% endfor %}
+ {% include "admin/_release_report_page_footer.html" %}
{% for item in library_data %}
- {% include "admin/_release_report_top_left_logo.html" %}
Top Contributors
@@ -326,7 +324,7 @@

Library Index

{{ author.name }}
-
{{ author.commit_count }} commit{{ author.commit_count|pluralize }}
+
{{ author.commit_count }} commit{{ author.commit_count|pluralize }}
{% endfor %} @@ -342,36 +340,37 @@

{{ item.library.name }}

There {{ item.version_count.commit_count|pluralize:"was,were" }} - {{ item.version_count.commit_count }} + {{ item.version_count.commit_count }} commit{{ item.version_count.commit_count|pluralize }} in release {{ version.display_name }}
{% with insertions=item.library_version.insertions deletions=item.library_version.deletions %}
- {{ insertions|intcomma }} line{{ insertions|pluralize }} added, {{ deletions|intcomma }} line{{ deletions|pluralize }} removed + {{ insertions|intcomma }} line{{ insertions|pluralize }} added, {{ deletions|intcomma }} line{{ deletions|pluralize }} removed
{% endwith %} {% with count=item.new_contributors_count.count %} {% if count >= 1 %}
- There {{ count|pluralize:"was,were" }} {{ count }} new contributor{{ count|pluralize }} this release! + There {{ count|pluralize:"was,were" }} {{ count }} new contributor{{ count|pluralize }} this release!
{% endif %} {% endwith %}
- There {{ item.issues.opened|pluralize:"was,were" }} {{ item.issues.opened }} issue{{ item.issues.opened|pluralize }} opened - and {{ item.issues.closed|pluralize:"was,were" }} {{ item.issues.closed }} issue{{ item.issues.closed|pluralize }} closed + There {{ item.issues.opened|pluralize:"was,were" }} {{ item.issues.opened }} issue{{ item.issues.opened|pluralize }} opened + and {{ item.issues.closed|pluralize:"was,were" }} {{ item.issues.closed }} issue{{ item.issues.closed|pluralize }} closed
{% if item.deps.added or item.deps.removed %}
- There {{ item.deps.added|length|pluralize:"was,were" }} {{ item.deps.added|length }} dependenc{{ item.deps.added|length|pluralize:"y,ies" }} added + There {{ item.deps.added|length|pluralize:"was,were" }} {{ item.deps.added|length }} dependenc{{ item.deps.added|length|pluralize:"y,ies" }} added and - {{ item.deps.removed|length }} dependenc{{ item.deps.removed|length|pluralize:"y,ies" }} removed + {{ item.deps.removed|length }} dependenc{{ item.deps.removed|length|pluralize:"y,ies" }} removed
{% endif %}
+ {% include "admin/_release_report_page_footer.html" %} {% endfor %}