| |
@@ -51,12 +51,13 @@
|
| |
|
| |
|
| |
{% block body %}
|
| |
-
|
| |
+ {% set buglist_names = ['Proposed Blockers','Accepted Blockers', 'Accepted 0-day Blockers', 'Accepted Previous Release Blockers',
|
| |
+ 'Proposed Freeze Exceptions', 'Accepted Freeze Exceptions', 'Prioritized Bugs'] %}
|
| |
|
| |
<div class="row">
|
| |
<div class="col-md-12" id="blockertables">
|
| |
- {% for buglist in ['Proposed Blockers','Accepted Blockers', 'Accepted 0-day Blockers', 'Accepted Previous Release Blockers', 'Proposed Freeze Exceptions', 'Accepted Freeze Exceptions', 'Prioritized Bugs'] %}
|
| |
- {% if buglists[buglist] %}<h2>{{ buglists[buglist] | length }} {% if (buglists[buglist] | length) == 1 %}{{ buglist[:-1]}}{% else %}{{ buglist }}{% endif %}</h2>
|
| |
+ {% for buglist in buglist_names if buglists[buglist] %} {# for non-empty buglists #}
|
| |
+ <h2>{{ buglists[buglist] | length }} {% if (buglists[buglist] | length) == 1 %}{{ buglist[:-1]}}{% else %}{{ buglist }}{% endif %}</h2>
|
| |
<table id="{{ buglist | tagify }}" cellspacing="1" class="table table-striped">
|
| |
<thead class="thead-light">
|
| |
<tr>
|
| |
@@ -72,32 +73,38 @@
|
| |
<tbody>
|
| |
{% for bug in buglists[buglist] %}
|
| |
<tr>
|
| |
- <td>{% if bug.bugid in recent %}<span class="foundicon-idea yellow" title="modified recently"></span>{% endif %} {% if bug.needinfo %}<span class="needinfo" title="NEEDINFO{% if bug.needinfo_requestee %} from {{ bug.needinfo_requestee }}{% else %}{% endif %}">?</span>{% endif %}{% if bug.bugid in wb_change %}<span class="foundicon-refresh green" title="blocker/fe status changed recently"></span>{% endif %}</td>
|
| |
+ <td class="text-nowrap">
|
| |
+ {% if bug.bugid in recent %}<span class="foundicon-idea yellow" title="modified recently"></span>{% endif -%}
|
| |
+ {% if bug.needinfo %}<span class="needinfo" title="NEEDINFO{% if bug.needinfo_requestee %} from {{ bug.needinfo_requestee }}{% else %}{% endif %}">?</span>{% endif -%}
|
| |
+ {% if bug.bugid in wb_change %}<span class="foundicon-refresh green" title="blocker/fe status changed recently"></span>{% endif %}
|
| |
+ </td>
|
| |
<td class='bugid'><a href='{{ bug.url }}' target="_blank" rel="noopener noreferrer">{{ bug.bugid }}</a></td>
|
| |
<td>{{ bug.component }}</td>
|
| |
<td>{{ bug.status }}</td>
|
| |
<td>{{ bug.summary }}</td>
|
| |
<td class="text-center">
|
| |
- {% if vote_info[bug.bugid][buglist] %}
|
| |
- <span class="{{'text-success' if vote_info[bug.bugid][buglist][0] > 0 else ''}}">+{{ vote_info[bug.bugid][buglist][0] }}</span>,
|
| |
- <span>{{ vote_info[bug.bugid][buglist][1] }}</span>,
|
| |
- <span class="{{'text-danger' if vote_info[bug.bugid][buglist][2] > 0 else ''}}">-{{ vote_info[bug.bugid][buglist][2] }}</span>
|
| |
- <br />
|
| |
+ {% if buglist.startswith('Proposed') and vote_info[bug.bugid][buglist] %}
|
| |
+ <span class="text-nowrap">
|
| |
+ <span class="{{'text-success' if vote_info[bug.bugid][buglist][0] > 0 else ''}}">+{{ vote_info[bug.bugid][buglist][0] }}</span>,
|
| |
+ <span>{{ vote_info[bug.bugid][buglist][1] }}</span>,
|
| |
+ <span class="{{'text-danger' if vote_info[bug.bugid][buglist][2] > 0 else ''}}">-{{ vote_info[bug.bugid][buglist][2] }}</span>
|
| |
+ </span>
|
| |
+ <br />
|
| |
{% endif %}
|
| |
{% if bug.discussion_link %}
|
| |
- <a href='{{ bug.discussion_link }}' target="_blank" rel="noopener noreferrer">
|
| |
- {% if buglist.startswith('Accepted') %}
|
| |
- Discuss
|
| |
- {% elif vote_info[bug.bugid]['user_voted'] %}
|
| |
- <span class="text-success">Voted</span>
|
| |
- {% else %}
|
| |
- Vote!
|
| |
- {% endif %}
|
| |
- </a>
|
| |
+ <a href='{{ bug.discussion_link }}' target="_blank" rel="noopener noreferrer">
|
| |
+ {% if buglist.startswith('Accepted') %}
|
| |
+ Discuss
|
| |
+ {% elif vote_info[bug.bugid]['user_voted'] %}
|
| |
+ <span class="text-success">Voted</span>
|
| |
+ {% else %}
|
| |
+ Vote!
|
| |
+ {% endif %}
|
| |
+ </a>
|
| |
{% elif buglist.startswith('Prioritized') %}
|
| |
- <!-- Nothing here, go on...-->
|
| |
+ {# Nothing here, go on... #}
|
| |
{% else %}
|
| |
- TBD
|
| |
+ TBD
|
| |
{% endif %}
|
| |
</td>
|
| |
<td class="popupification">
|
| |
@@ -107,7 +114,7 @@
|
| |
{{ bug | updatelabel | safe}}</a>
|
| |
</td>
|
| |
</tr>
|
| |
- {% else %}
|
| |
+ {% else %}
|
| |
<tr>
|
| |
<td></td>
|
| |
<td></td>
|
| |
@@ -117,13 +124,13 @@
|
| |
<td></td>
|
| |
<td></td>
|
| |
</tr>
|
| |
- {% endfor %}
|
| |
+ {% endfor %}
|
| |
</tbody>
|
| |
- </table>{% endif %}
|
| |
+ </table>
|
| |
{% endfor %}
|
| |
- {% for buglist in ['Proposed Blockers','Accepted Blockers', 'Accepted 0-day Blockers', 'Accepted Previous Release Blockers', 'Proposed Freeze Exceptions', 'Accepted Freeze Exceptions', 'Prioritized Bugs'] %}
|
| |
- {% if not buglists[buglist] %}<h4>No {{ buglist }}</h4>{% endif %}
|
| |
+ {% for buglist in buglist_names if not buglists[buglist] %} {# for empty buglists #}
|
| |
+ <h4>No {{ buglist }}</h4>
|
| |
{% endfor %}
|
| |
- </div> <!-- end of 12 columns -->
|
| |
- </div> <!-- end of row -->
|
| |
+ </div> {# end of 12 columns #}
|
| |
+ </div> {# end of row #}
|
| |
{% endblock %}
|
| |
This contains multiple different changes, please see the diff per commit, thank you. Commits included: