altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Labels are badges in bs5.

Browse source 
- Legacy-Id: 19616
This commit is contained in:
Lars Eggert 2021-11-10 11:15:46 +00:00
parent eddc03c959
commit bb5810a934
43 changed files with 122 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ietf/doc/templatetags/ballot_icon.py
View file

@ -204,9 +204,9 @@ def state_age_colored(doc):
goal1 = 14
goal2 = 28
if days > goal2:
class_name = "label label-danger"
class_name = "badge bg-danger"
elif days > goal1:
class_name = "label label-warning"
class_name = "badge bg-warning"
else:
class_name = "ietf-small"
if days > goal1:
@ -231,6 +231,6 @@ def auth48_alert_badge(doc):
rfced_state = doc.get_state_slug('draft-rfceditor')
if rfced_state == 'auth48':
return mark_safe('<span class="label label-info" title="AUTH48">AUTH48</span>')
return mark_safe('<span class="badge bg-info" title="AUTH48">AUTH48</span>')
return ''

6
ietf/doc/templatetags/ietf_filters.py
View file

@ -614,17 +614,17 @@ def action_holder_badge(action_holder):
''
>>> action_holder_badge(DocumentActionHolderFactory(time_added=datetime.datetime.now() - datetime.timedelta(days=16)))
'<span class="label label-danger" title="Goal is &lt;15 days">for 16 days</span>'
'<span class="badge bg-danger" title="Goal is &lt;15 days">for 16 days</span>'
>>> action_holder_badge(DocumentActionHolderFactory(time_added=datetime.datetime.now() - datetime.timedelta(days=30)))
'<span class="label label-danger" title="Goal is &lt;15 days">for 30 days</span>'
'<span class="badge bg-danger" title="Goal is &lt;15 days">for 30 days</span>'
>>> settings.DOC_ACTION_HOLDER_AGE_LIMIT_DAYS = old_limit
"""
age_limit = settings.DOC_ACTION_HOLDER_AGE_LIMIT_DAYS
age = (datetime.datetime.now() - action_holder.time_added).days
if age > age_limit:
return mark_safe('<span class="label label-danger" title="Goal is &lt;%d days">for %d day%s</span>' % (
return mark_safe('<span class="badge bg-danger" title="Goal is &lt;%d days">for %d day%s</span>' % (
age_limit,
age,
's' if age != 1 else ''))

4
ietf/doc/views_review.py
View file

@ -577,11 +577,11 @@ class CompleteReviewForm(forms.Form):
kwargs["initial"]["reviewed_rev"] = last_version
self.fields["reviewed_rev"].help_text = mark_safe(
" ".join("<a class=\"rev label label-default {0}\" title=\"{2:%Y-%m-%d}\">{1}</a>".format(reviewed_rev_class[i], *r)
" ".join("<a class=\"rev badge bg-default {0}\" title=\"{2:%Y-%m-%d}\">{1}</a>".format(reviewed_rev_class[i], *r)
for i, r in enumerate(known_revisions)))
else:
self.fields["reviewed_rev"].help_text = mark_safe(
" ".join("<a class=\"rev label label-default {0}\" title=\"{2:%Y-%m-%d}\">{1}</a>".format('', *r)
" ".join("<a class=\"rev badge bg-default {0}\" title=\"{2:%Y-%m-%d}\">{1}</a>".format('', *r)
for i, r in enumerate(known_revisions)))
self.fields["result"].queryset = self.fields["result"].queryset.filter(reviewteamsettings_review_results_set__group=team)

7
ietf/group/tests_info.py
View file

@ -448,13 +448,13 @@ class GroupPagesTests(TestCase):
r = self.client.get(url)
self.assertEqual(r.status_code,200)
q = PyQuery(r.content)
self.assertEqual(q('.label-warning').text(),"Concluded WG")
self.assertEqual(q('.bg-warning').text(),"Concluded WG")
replaced_group = GroupFactory(state_id='replaced')
url = urlreverse("ietf.group.views.history",kwargs={'acronym':replaced_group.acronym})
r = self.client.get(url)
self.assertEqual(r.status_code,200)
q = PyQuery(r.content)
self.assertEqual(q('.label-warning').text(),"Replaced WG")
self.assertEqual(q('.bg-warning').text(),"Replaced WG")
class GroupEditTests(TestCase):
@ -1847,5 +1847,4 @@ class AcronymValidationTests(TestCase):
wg = GroupFactory(acronym='bad-idea', type_id='wg')
form = GroupForm({'acronym':wg.acronym,'name':wg.name,'state':wg.state_id},group=wg, group_type=wg.type_id)
self.assertTrue(form.is_valid())
self.assertTrue(form.is_valid())

23
ietf/nomcom/tests.py
View file

@ -1354,7 +1354,7 @@ class FeedbackLastSeenTests(TestCase):
response = self.client.get(url)
self.assertEqual(response.status_code,200)
q = PyQuery(response.content)
self.assertEqual( len(q('.label-success')), 4 )
self.assertEqual( len(q('.bg-success')), 4 )
f = self.nc.feedback_set.first()
f.time = self.hour_ago
@ -1364,20 +1364,20 @@ class FeedbackLastSeenTests(TestCase):
response = self.client.get(url)
self.assertEqual(response.status_code,200)
q = PyQuery(response.content)
self.assertEqual( len(q('.label-success')), 3 )
self.assertEqual( len(q('.bg-success')), 3 )
FeedbackLastSeen.objects.update(time=self.second_from_now)
response = self.client.get(url)
self.assertEqual(response.status_code,200)
q = PyQuery(response.content)
self.assertEqual( len(q('.label-success')), 1 )
self.assertEqual( len(q('.bg-success')), 1 )
TopicFeedbackLastSeen.objects.create(reviewer=self.member,topic=self.topic)
TopicFeedbackLastSeen.objects.update(time=self.second_from_now)
response = self.client.get(url)
self.assertEqual(response.status_code,200)
q = PyQuery(response.content)
self.assertEqual( len(q('.label-success')), 0 )
self.assertEqual( len(q('.bg-success')), 0 )
def test_feedback_nominee_badges(self):
url = reverse('ietf.nomcom.views.view_feedback_nominee', kwargs={'year':self.nc.year(), 'nominee_id':self.nominee.id})
@ -1386,7 +1386,7 @@ class FeedbackLastSeenTests(TestCase):
response = self.client.get(url)
self.assertEqual(response.status_code,200)
q = PyQuery(response.content)
self.assertEqual( len(q('.label-success')), 3 )
self.assertEqual( len(q('.bg-success')), 3 )
f = self.nc.feedback_set.first()
f.time = self.hour_ago
@ -1396,13 +1396,13 @@ class FeedbackLastSeenTests(TestCase):
response = self.client.get(url)
self.assertEqual(response.status_code,200)
q = PyQuery(response.content)
self.assertEqual( len(q('.label-success')), 2 )
self.assertEqual( len(q('.bg-success')), 2 )
FeedbackLastSeen.objects.update(time=self.second_from_now)
response = self.client.get(url)
self.assertEqual(response.status_code,200)
q = PyQuery(response.content)
self.assertEqual( len(q('.label-success')), 0 )
self.assertEqual( len(q('.bg-success')), 0 )
def test_feedback_topic_badges(self):
url = reverse('ietf.nomcom.views.view_feedback_topic', kwargs={'year':self.nc.year(), 'topic_id':self.topic.id})
@ -1411,7 +1411,7 @@ class FeedbackLastSeenTests(TestCase):
response = self.client.get(url)
self.assertEqual(response.status_code,200)
q = PyQuery(response.content)
self.assertEqual( len(q('.label-success')), 1 )
self.assertEqual( len(q('.bg-success')), 1 )
f = self.topic.feedback_set.first()
f.time = self.hour_ago
@ -1421,13 +1421,13 @@ class FeedbackLastSeenTests(TestCase):
response = self.client.get(url)
self.assertEqual(response.status_code,200)
q = PyQuery(response.content)
self.assertEqual( len(q('.label-success')), 0 )
self.assertEqual( len(q('.bg-success')), 0 )
TopicFeedbackLastSeen.objects.update(time=self.second_from_now)
response = self.client.get(url)
self.assertEqual(response.status_code,200)
q = PyQuery(response.content)
self.assertEqual( len(q('.label-success')), 0 )
self.assertEqual( len(q('.bg-success')), 0 )
class NewActiveNomComTests(TestCase):
@ -2599,5 +2599,4 @@ class VolunteerDecoratorUnitTests(TestCase):
if v.person == office_person:
self.assertEqual(v.qualifications,'path_2')
if v.person == author_person:
self.assertEqual(v.qualifications,'path_3')
self.assertEqual(v.qualifications,'path_3')

2
ietf/static/css/ietf.scss
View file

@ -32,7 +32,7 @@ $enable-negative-margins: true;
@import "~/node_modules/bootstrap/scss/accordion";
// @import "~/node_modules/bootstrap/scss/breadcrumb";
// @import "~/node_modules/bootstrap/scss/pagination";
// @import "~/node_modules/bootstrap/scss/badge";
@import "~/node_modules/bootstrap/scss/badge";
// @import "~/node_modules/bootstrap/scss/alert";
// @import "~/node_modules/bootstrap/scss/progress";
// @import "~/node_modules/bootstrap/scss/list-group";

2
ietf/templates/doc/charter/submit.html
View file

@ -42,7 +42,7 @@
<td>
{{ group.state.name }}
{% if requested_close %}
<div class="label label-info">In the process of being closed</div>
<div class="badge bg-info">In the process of being closed</div>
{% endif %}
</td>
</tr>

6
ietf/templates/doc/document_ballot_content.html
View file

@ -6,7 +6,7 @@
<div class="col-md-2 hidden-sm hidden-xs">
{% for n, positions in position_groups %}
<h4><span class="label label-{{ n|pos_to_label }}"> {{ n.name }}</span></h4>
<h4><span class="badge bg-{{ n|pos_to_label }}"> {{ n.name }}</span></h4>
{% for p in positions %}
<div class="balloter-name">
{% if p.is_old_pos %}<span class="text-muted">({% endif %}{% if p.comment or p.discuss %}<a href="#{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">{% endif %}{{ p.balloter.plain_name }}{% if p.comment or p.discuss %}</a>{% endif %}{% if p.is_old_pos %})</span>{% endif %}
@ -76,7 +76,7 @@
<h4 class="anchor-target" id="{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">{{ p.balloter.plain_name }}
<span class="float-end">
{% if p.old_positions %}<span class="text-muted small">(was {{ p.old_positions|join:", " }})</span>{% endif %}
<span class="label label-{{ p.pos|pos_to_label }}">{{p.pos}}</span>
<span class="badge bg-{{ p.pos|pos_to_label }}">{{p.pos}}</span>
{% if user|has_role:"Secretariat" %}
<a href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot.pk %}?balloter={{ p.balloter.pk }}" title="Click to edit the position of {{ p.balloter.plain_name }}" class="btn btn-primary btn-xs">Edit</a>
{% endif %}
@ -130,7 +130,7 @@
<span class="text-muted">({{ p.balloter.plain_name }}; former steering group member)</span>
<span class="float-end">
{% if p.old_positions %}<span class="text-muted small">(was {{ p.old_positions|join:", " }})</span>{% endif %}
<span class="label label-{{ p.pos|pos_to_label }}">{{p.pos}}</span>
<span class="badge bg-{{ p.pos|pos_to_label }}">{{p.pos}}</span>
{% if user|has_role:"Secretariat" %}
<a href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot.pk %}?balloter={{ p.balloter.pk }}" title="Click to edit the position of {{ p.balloter.plain_name }}" class="btn btn-primary btn-xs">Edit</a>
{% endif %}

2
ietf/templates/doc/document_bofreq.html
View file

@ -34,7 +34,7 @@
<td>
{{doc.get_state.slug|capfirst}} BOF request
{% if snapshot %}
<span class="label label-warning">Snapshot</span>
<span class="badge bg-warning">Snapshot</span>
{% endif %}
</td>
</tr>

6
ietf/templates/doc/document_charter.html
View file

@ -57,7 +57,7 @@
<a href="{{ group.about_url }}">({{ group.acronym }})</a>
{% if snapshot %}
<span class="label label-warning">Snapshot</span>
<span class="badge bg-warning">Snapshot</span>
{% endif %}
</td>
</tr>
@ -96,10 +96,10 @@
{% endif %}
{% if chartering == "initial" %}
<span class="label label-info">Initial chartering</span>
<span class="badge bg-info">Initial chartering</span>
{% endif %}
{% if chartering == "rechartering" %}
<span class="label label-info">Rechartering</span>
<span class="badge bg-info">Rechartering</span>
{% endif %}
</td>
</tr>

4
ietf/templates/doc/document_conflict_review.html
View file

@ -39,10 +39,10 @@
<a href="{% url "ietf.doc.views_doc.document_main" name=conflictdoc.canonical_name %}">
{{ conflictdoc.canonical_name }}{% if conflictdoc.get_state_slug != 'rfc' %}-{{ conflictdoc.rev }}{% endif %}
</a>
<span class="label label-info">{{conflictdoc.stream}} stream</span>
<span class="badge bg-info">{{conflictdoc.stream}} stream</span>
{% if snapshot %}
<span class="label label-warning">Snapshot</span>
<span class="badge bg-warning">Snapshot</span>
{% endif %}
</td>
</tr>

2
ietf/templates/doc/document_draft.html
View file

@ -196,7 +196,7 @@
<th>Formats</th>
<td class="edit"></td>
<td>
{% if doc.get_state_slug != "active" and doc.get_state_slug != "rfc" %}<div class="float-end label label-warning">Expired & archived</div>{% endif %}
{% if doc.get_state_slug != "active" and doc.get_state_slug != "rfc" %}<div class="float-end badge bg-warning">Expired & archived</div>{% endif %}
{% if file_urls %}
{% for label, url in file_urls %}
<a class="btn btn-primary btn-xs" href="{{ url }}">

2
ietf/templates/doc/document_material.html
View file

@ -34,7 +34,7 @@
<a href="{{ doc.group.about_url }}">({{ doc.group.acronym }})</a> {{ doc.group.type.name }}
{% endif %}
{% if snapshot %}
<span class="label label-warning">Snapshot</span>
<span class="badge bg-warning">Snapshot</span>
{% endif %}
</td>
</tr>

2
ietf/templates/doc/document_referenced_by.html
View file

@ -46,7 +46,7 @@
<td>
<a href="{% url 'ietf.doc.views_doc.document_main' name=name %}">{{ name|prettystdname }}</a>
{% if ref.target.name != alias_name %}
<br><span class="label label-info">As {{ref.target.name}}</span>
<br><span class="badge bg-info">As {{ref.target.name}}</span>
{% endif %}
</td>
<td>

2
ietf/templates/doc/document_status_change.html
View file

@ -42,7 +42,7 @@
<td>
{{ doc.title }}
{% if snapshot %}
<span class="label label-warning">Snapshot</span>
<span class="badge bg-warning">Snapshot</span>
{% endif %}
</td>
</tr>

2
ietf/templates/doc/review/request_info.html
View file

@ -161,7 +161,7 @@
<th>State</th>
<td>{{ assignment.state.name }}
{% if snapshot %}
<span class="label label-warning">Snapshot</span>
<span class="badge bg-warning">Snapshot</span>
{% endif %}
</td>
</tr>

12
ietf/templates/doc/search/search_result_row.html
View file

@ -50,9 +50,9 @@
<br>
<b>{{ doc.title }}</b>
{% if doc.has_verified_errata %}
<a class="label label-danger float-end" href="https://www.rfc-editor.org/errata_search.php?rfc={{ doc.rfc_number }}">Errata</a>
<a class="badge bg-danger float-end" href="https://www.rfc-editor.org/errata_search.php?rfc={{ doc.rfc_number }}">Errata</a>
{% elif doc.has_errata %}
<a class="label label-warning float-end" href="https://www.rfc-editor.org/errata_search.php?rfc={{ doc.rfc_number }}">Errata</a>
<a class="badge bg-warning float-end" href="https://www.rfc-editor.org/errata_search.php?rfc={{ doc.rfc_number }}">Errata</a>
{% endif %}
</div>
@ -102,11 +102,11 @@
{% endif %}
{% if doc.latest_revision_date|timesince_days|new_enough:request %}
<wbr><div class="float-end"><span class="label label-success">New</span></div>
<wbr><div class="float-end"><span class="badge bg-success">New</span></div>
{% endif %}
{% if doc.get_state_slug == "active" and doc.expirable and doc.expires|timesince_days|expires_soon:request %}
<wbr><span class="label label-warning">Expires soon</span>
<wbr><span class="badge bg-warning">Expires soon</span>
{% endif %}
</td>
@ -116,7 +116,7 @@
<td class="ipr text-center">
{% if doc.related_ipr %}
<a href="{% url "ietf.ipr.views.search" %}?submit=draft&amp;id={{ doc.name }}">
<span class="label label-default">{{ doc.related_ipr|length }}</span>
<span class="badge bg-default">{{ doc.related_ipr|length }}</span>
</a>
{% endif %}
</td>
@ -136,4 +136,4 @@
{% endwith %}
{% endif %}
</tr>
</tr>

4
ietf/templates/group/all_status.html
View file

@ -26,7 +26,7 @@
<tr>
<td>{{ rpt.group.acronym }}
{% if rpt.group.state.slug != "active" %}
<span class="label label-success">{{ rpt.group.state.slug|upper }}</span>
<span class="badge bg-success">{{ rpt.group.state.slug|upper }}</span>
{% endif %}
<br> {{rpt.time|date:"Y-m-d"}}</td>
<td><pre class="pasted">{{ rpt.desc|default:"(none)"|linkify }}</pre></td>
@ -41,7 +41,7 @@
<tr>
<td>{{ rpt.group.acronym }}
{% if rpt.group.state.slug != "active" %}
<span class="label label-success">{{ rpt.group.state.slug|upper }}</span>
<span class="badge bg-success">{{ rpt.group.state.slug|upper }}</span>
{% endif %}
<br> {{rpt.time|date:"Y-m-d"}}</td>
<td><pre class="pasted">{{ rpt.desc|default:"(none)"|linkify }}</pre></td>

2
ietf/templates/group/customize_workflow.html
View file

@ -60,7 +60,7 @@
<div class="checkbox {% if not s.used %}inactive{% endif %}">
<label>
<input type="checkbox" name="next_states" value="{{ s.pk }}"{% if checked %} checked="checked"{% endif %} />
{{ s.name }} {% if default %}<span class="label label-default">default</span>{% endif %}
{{ s.name }} {% if default %}<span class="badge bg-default">default</span>{% endif %}
</label>
</div>
{% endfor %}

8
ietf/templates/group/edit_milestones.html
View file

@ -69,16 +69,16 @@
<span class="milestone{% if form.delete.data %} delete{% endif %}">
<span class="due handle col-sm-1">
{% if form.milestone.resolved %}
<span class="label label-success">{{ form.milestone.resolved }}</span>
<span class="badge bg-success">{{ form.milestone.resolved }}</span>
{% else %}
{% if group.uses_milestone_dates %}{{ form.milestone.due|date:"M Y" }}{% endif %}
{% endif %}
</span>
<span class="col-sm-11">
<span>{{ form.milestone.desc }}
{% if form.needs_review %}<span title="This milestone is not active yet, awaiting {{ reviewer }} acceptance" class="label label-warning">Awaiting accept</span>{% endif %}
{% if form.changed %}<span class="label label-info">Changed</span>{% endif %}
{% if form.delete.data %}<span class="label label-danger">Deleted</span>{% endif %}
{% if form.needs_review %}<span title="This milestone is not active yet, awaiting {{ reviewer }} acceptance" class="badge bg-warning">Awaiting accept</span>{% endif %}
{% if form.changed %}<span class="badge bg-info">Changed</span>{% endif %}
{% if form.delete.data %}<span class="badge bg-danger">Deleted</span>{% endif %}
</span>
{% for d in form.docs_names %}

4
ietf/templates/group/group_about.html
View file

@ -56,7 +56,7 @@
<td>
{{ group.state.name }}
{% if requested_close %}
<div class="label label-info">In the process of being closed</div>
<div class="badge bg-info">In the process of being closed</div>
{% endif %}
</td>
</tr>
@ -69,7 +69,7 @@
<td>
{% if group.charter %}
<a href="{% url "ietf.doc.views_doc.document_main" name=group.charter.name %}">{{ group.charter.name }}-{{ group.charter.rev }}</a>
<span class="label label-info">{{ group.charter.get_state.name }}</span>
<span class="badge bg-info">{{ group.charter.get_state.name }}</span>
{% else %}
(None)
{% if user|has_role:"Area Director,Secretariat" %}

6
ietf/templates/group/group_base.html
View file

@ -15,13 +15,13 @@
<h1>{{ group.name}} ({{ group.acronym }})
{% if group.state_id == "dormant" or group.state_id == "conclude" %}
<span class="label label-warning">Concluded {{ group.type.name }}</span>
<span class="badge bg-warning">Concluded {{ group.type.name }}</span>
{% endif %}
{% if group.state_id == "replaced" %}
<span class="label label-warning">Replaced {{ group.type.name }}</span>
<span class="badge bg-warning">Replaced {{ group.type.name }}</span>
{% endif %}
{% if group.state_id == "proposed" %}
<span class="label label-info">Proposed {{ group.type.name }}</span>
<span class="badge bg-info">Proposed {{ group.type.name }}</span>
{% endif %}
</h1>

6
ietf/templates/group/manage_review_requests.html
View file

@ -39,7 +39,7 @@
<span class="float-end">
{% if r.in_lc_and_telechat %}Last Call and telechat{% else %}{{ r.type.name }}{% endif %}
- deadline {{ r.deadline|date:"Y-m-d" }}
{% if r.due %}<span class="label label-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
{% if r.due %}<span class="badge bg-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
</span>
<a href="{% if r.requested_rev %}{% url "ietf.doc.views_doc.document_main" name=r.doc.name rev=r.requested_rev %}{% else %}{% url "ietf.doc.views_doc.document_main" name=r.doc.name %}{% endif %}?include_text=1">{{ r.doc.name }}-{% if r.requested_rev %}{{ r.requested_rev }}{% else %}{{ r.doc.rev }}{% endif %}</a>
@ -123,8 +123,8 @@
{% if r.reviewer %}
<button type="button" class="btn btn-primary btn-success" title="Click to reassign reviewer">
{{ r.reviewer.person }}
{% if r.state_id == "accepted" %} <span class="label label-default">accepted</span>{% endif %}
{% if r.reviewer_unavailable %}<span class="label label-danger">unavailable</span>{% endif %}
{% if r.state_id == "accepted" %} <span class="badge bg-default">accepted</span>{% endif %}
{% if r.reviewer_unavailable %}<span class="badge bg-danger">unavailable</span>{% endif %}
</button>
{% else %}
<button type="button" class="btn btn-primary btn-success" title="Click to assign reviewer"><em>Not yet assigned</em></button>

2
ietf/templates/group/milestones.html
View file

@ -22,7 +22,7 @@
<tr>
<td class="text-nowrap">
{% if milestone.resolved %}
<span class="label label-success">{{ milestone.resolved }}</span>
<span class="badge bg-success">{{ milestone.resolved }}</span>
{% else %}
{% if group.uses_milestone_dates %}
{{ milestone.due|date:"M Y" }}

12
ietf/templates/group/review_requests.html
View file

@ -45,13 +45,13 @@
<td><span style="display:none">X</span>{% if r.pk %}{{ r.time|date:"Y-m-d" }} by {{r.requested_by.plain_name}}{% else %}<em>auto-suggested</em>{% endif %}</td>
<td><span style="display:none">X</span>
{{ r.deadline|date:"Y-m-d" }}
{% if r.due %}<span class="label label-warning" title="{{ r.due }} day{{ r.due|pluralize }} past deadline">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
{% if r.due %}<span class="badge bg-warning" title="{{ r.due }} day{{ r.due|pluralize }} past deadline">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
</td>
{% if r.reviewer %}
<td>
{{ r.reviewer.person }}
{% if r.state_id == "accepted" %}<span class="label label-default">Accepted</span>{% endif %}
{% if r.reviewer_unavailable %}<span class="label label-danger">Unavailable</span>{% endif %}
{% if r.state_id == "accepted" %}<span class="badge bg-default">Accepted</span>{% endif %}
{% if r.reviewer_unavailable %}<span class="badge bg-danger">Unavailable</span>{% endif %}
</td>
{% endif %}
<td>
@ -92,12 +92,12 @@
<td><span style="display:none">X</span>{{ a.assigned_on|date:"Y-m-d" }}</td>
<td><span style="display:none">X</span>
{{ a.review_request.deadline|date:"Y-m-d" }}
{% if a.due %}<span class="label label-warning" title="{{ a.due }} day{{ a.due|pluralize }} past deadline">{{ a.due }} day{{ a.due|pluralize }}</span>{% endif %}
{% if a.due %}<span class="badge bg-warning" title="{{ a.due }} day{{ a.due|pluralize }} past deadline">{{ a.due }} day{{ a.due|pluralize }}</span>{% endif %}
</td>
<td>
{{ a.reviewer.person }}
{% if a.state_id == "accepted" %}<span class="label label-default">Accepted</span>{% endif %}
{% if a.reviewer_unavailable %}<span class="label label-danger">Unavailable</span>{% endif %}
{% if a.state_id == "accepted" %}<span class="badge bg-default">Accepted</span>{% endif %}
{% if a.reviewer_unavailable %}<span class="badge bg-danger">Unavailable</span>{% endif %}
</td>
<td>
{{ a.review_request.doc.friendly_state }}

2
ietf/templates/group/reviewer_overview.html
View file

@ -59,7 +59,7 @@
<td><span style="display:none">X</span>{{ assigned_time|date }}</td>
<td><a href="{% url "ietf.doc.views_review.review_request" name=doc_name request_id=req_pk %}">{{ deadline|date }}</a></td>
<td>
<span class="label label-{% if state.slug == "completed" or state.slug == "part-completed" %}success{% elif state.slug == "no-response" %}danger{% elif state.slug == "overtaken" %}warning{% elif state.slug == "requested" or state.slug == "accepted" %}primary{% else %}default{% endif %}">{{ state.name }}</span>
<span class="badge bg-{% if state.slug == "completed" or state.slug == "part-completed" %}success{% elif state.slug == "no-response" %}danger{% elif state.slug == "overtaken" %}warning{% elif state.slug == "requested" or state.slug == "accepted" %}primary{% else %}default{% endif %}">{{ state.name }}</span>
</td>
<td>
{% if assignment_to_closure_days != None %}{{ assignment_to_closure_days }}&nbsp;day{{ assignment_to_closure_days|pluralize }}{% endif %}

4
ietf/templates/ietfauth/review_overview.html
View file

@ -38,7 +38,7 @@
<td>{{ r.review_request.type.name }}</td>
<td>
{{ r.review_request.deadline|date:"Y-m-d" }}
{% if r.due %}<span class="label label-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
{% if r.due %}<span class="badge bg-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
</td>
</tr>
{% endfor %}
@ -73,7 +73,7 @@
<td>{{ r.review_request.type.name }}</td>
<td>
{{ r.review_request.deadline|date:"Y-m-d" }}
{% if r.due %}<span class="label label-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
{% if r.due %}<span class="badge bg-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
</td>
<td><span class="{% if r.state_id == "completed" or r.state_id == "part-completed" %}bg-success{% endif %}">{{ r.state.name }}</span></td>
<td>{% if r.result %}{{ r.result.name }}{% endif %}</td>

4
ietf/templates/liaisons/liaison_table.html
View file

@ -30,10 +30,10 @@
<td class="liaison-group-col">{{ liaison.to_groups_display }}</td>
<td class="text-nowrap">{{ liaison.deadline|default:"-"|date:"Y-m-d" }}
{% if liaison.deadline and not liaison.action_taken %}
<br><span class="label {% if liaison.is_outgoing %}label-warning{% else %}label-info{% endif %}">Action Needed</span>
<br><span class="badge {% if liaison.is_outgoing %}bg-warning{% else %}bg-info{% endif %}">Action Needed</span>
{% endif %}</td>
<td><a href="{% url "ietf.liaisons.views.liaison_detail" object_id=liaison.pk %}">{{ liaison.title }}</a></td>
</tr>
{% endfor %}
</tbody>
</table>
</table>

16
ietf/templates/meeting/agenda.html
View file

@ -123,7 +123,7 @@
<h2>
Schedule
{% if schedule.meeting.agenda_warning_note %}
<span class="label label-danger">{{ schedule.meeting.agenda_warning_note|removetags:"h1"|safe }}</span>
<span class="badge bg-danger">{{ schedule.meeting.agenda_warning_note|removetags:"h1"|safe }}</span>
{% endif %}
</h2>
@ -195,7 +195,7 @@
{% if item.timeslot.location.floorplan %}
<div class="hidden-xs">
<a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}#{{floor.name|xslugify}}"
class="float-end" title="{{floor.name}}"><span class="label label-blank label-wide">{{floor.short}}</span></a>
class="float-end" title="{{floor.name}}"><span class="badge bg-blank label-wide">{{floor.short}}</span></a>
</divn>
{% endif %}
{% endwith %}
@ -211,7 +211,7 @@
{% endif %}
{% if item.session.current_status == 'canceled' %}
<span class="label label-danger float-end">CANCELLED</span>
<span class="badge bg-danger float-end">CANCELLED</span>
{% else %}
<div class="float-end padded-left">
{% if item.timeslot.type.slug == 'other' %}
@ -268,7 +268,7 @@
{% if item.timeslot.location.floorplan %}
<div class="hidden-xs">
<a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}#{{floor.name|xslugify}}"
class="float-end" title="{{floor.name}}"><span class="label label-blank">{{floor.short}}</span></a>
class="float-end" title="{{floor.name}}"><span class="badge bg-blank">{{floor.short}}</span></a>
</div>
{% endif %}
{% endwith %}
@ -312,7 +312,7 @@
{% endif %}
{% if item.session.current_status == 'canceled' %}
<span class="label label-danger float-end">CANCELLED</span>
<span class="badge bg-danger float-end">CANCELLED</span>
{% else %}
<div class="float-end padded-left">
{% include "meeting/session_buttons_include.html" with show_agenda=True session=item.session meeting=schedule.meeting %}
@ -320,11 +320,11 @@
{% endif %}
{% if item.session.historic_group.state_id == "bof" %}
<span class="label label-success float-end">BOF</span>
<span class="badge bg-success float-end">BOF</span>
{% endif %}
{% if item.session.current_status == 'resched' %}
<div class="label label-danger float-end">
<div class="badge bg-danger float-end">
RESCHEDULED
{% if item.session.rescheduled_to %}
TO
@ -533,4 +533,4 @@
}
);
</script>
{% endblock %}
{% endblock %}

12
ietf/templates/meeting/agenda_personalize.html
View file

@ -175,7 +175,7 @@
<a
href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}#{{ floor.name|xslugify }}"
class="float-end" title="{{ floor.name }}"><span
class="label label-blank label-wide">{{ floor.short }}</span></a>
class="badge bg-blank label-wide">{{ floor.short }}</span></a>
</span>
{% endif %}
{% endwith %}
@ -191,7 +191,7 @@
{% endif %}
{% if item.session.current_status == 'canceled' %}
<span class="label label-danger float-end">CANCELLED</span>
<span class="badge bg-danger float-end">CANCELLED</span>
{% endif %}
</td>
<td class="rightmarker"></td>
@ -248,7 +248,7 @@
<a
href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}#{{ floor.name|xslugify }}"
class="float-end" title="{{ floor.name }}"><span
class="label label-blank">{{ floor.short }}</span></a>
class="badge bg-blank">{{ floor.short }}</span></a>
</span>
{% endif %}
{% endwith %}
@ -294,15 +294,15 @@
{% endif %}
{% if item.session.current_status == 'canceled' %}
<span class="label label-danger float-end">CANCELLED</span>
<span class="badge bg-danger float-end">CANCELLED</span>
{% endif %}
{% if item.session.historic_group.state_id == "bof" %}
<span class="label label-success float-end">BOF</span>
<span class="badge bg-success float-end">BOF</span>
{% endif %}
{% if item.session.current_status == 'resched' %}
<span class="label label-danger float-end">
<span class="badge bg-danger float-end">
RESCHEDULED
{% if item.session.rescheduled_to %}
TO

16
ietf/templates/meeting/group_materials.html
View file

@ -13,16 +13,16 @@
{% else %}
<div class="anchor-target" id="{{session.group.acronym}}"><a href="{% url 'ietf.group.views.group_home' acronym=session.group.acronym %}">{{session.group.acronym}}</a></div>
{% if session.group.state.slug == "bof" %}
<span class="label label-success">{{ session.group.state.slug|upper }}</span>
<span class="badge bg-success">{{ session.group.state.slug|upper }}</span>
{% endif %}
{% endif %}
</td>
{% if session.all_meeting_sessions_cancelled %}
{% if user|has_role:"Secretariat" or user_groups %}
<td colspan="6"><span class="label label-danger">Session cancelled</span></td>
<td colspan="6"><span class="badge bg-danger">Session cancelled</span></td>
{% else %}
<td colspan="5"><span class="label label-danger">Session cancelled</span></td>
<td colspan="5"><span class="badge bg-danger">Session cancelled</span></td>
{% endif %}
{% else %}
<td>
@ -39,7 +39,7 @@
{% endfor %}
{% else %}
{% if show_agenda == "True" %}
<span class="label label-warning">No agenda</span>
<span class="badge bg-warning">No agenda</span>
{% endif %}
{% endif %}
</td>
@ -54,7 +54,7 @@
{% endif %}
{% else %}
{% if show_agenda == "True" %}
<span class="label label-warning">No minutes</span>
<span class="badge bg-warning">No minutes</span>
{% endif %}
{% endif %}
{% if session.type_id == 'regular' and show_agenda == "True" %}
@ -67,7 +67,7 @@
{% endfor %}
{% endif %}
{% else %}
<span class="label label-bluesheets">No bluesheets</span>
<span class="badge bg-bluesheets">No bluesheets</span>
{% endif %}
{% endif %}
</td>
@ -80,7 +80,7 @@
<a href="{{ slide|meeting_href:session.meeting}}">{{ slide.title|clean_whitespace }}</a>
<br>
{% empty %}
<span class="label label-warning">No slides</span>
<span class="badge bg-warning">No slides</span>
{% endfor %}
{% endwith %}
</td>
@ -92,7 +92,7 @@
{% endif %}
<a href="{{ draft.get_href }}">{{ draft.name }}</a><br>
{% empty %}
<span class="label label-warning">No drafts</span>
<span class="badge bg-warning">No drafts</span>
{% endfor %}
{% endwith %}
</td>

12
ietf/templates/meeting/group_proceedings.html
View file

@ -13,13 +13,13 @@
{% else %}
<div class="anchor-target" id="{{session.group.acronym}}"><a href="{% url 'ietf.group.views.group_home' acronym=session.group.acronym %}">{{session.group.acronym}}</a></div>
{% if session.group.state_id == "bof" %}
<span class="label label-success">BOF</span>
<span class="badge bg-success">BOF</span>
{% endif %}
{% endif %}
</td>
{% if session.all_meeting_sessions_cancelled %}
<td colspan="3"><span class="label label-danger">Session cancelled</span></td>
<td colspan="3"><span class="badge bg-danger">Session cancelled</span></td>
{% else %}
<td>
{% if session.all_meeting_agendas %}
@ -32,7 +32,7 @@
{% endif %}
{% else %}
{% if show_agenda == "True" and not meeting.proceedings_final %}
<span class="label label-warning">No agenda</span><br>
<span class="badge bg-warning">No agenda</span><br>
{% endif %}
{% endif %}
{% if session.all_meeting_minutes %}
@ -45,7 +45,7 @@
{% endif %}
{% else %}
{% if show_agenda == "True" and not meeting.proceedings_final %}
<span class="label label-warning">No minutes</span><br>
<span class="badge bg-warning">No minutes</span><br>
{% endif %}
{% endif %}
{% if session.all_meeting_bluesheets %}
@ -82,7 +82,7 @@
<br>
{% empty %}
{% if not meeting.proceedings_final %}
<span class="label label-warning">No slides</span>
<span class="badge bg-warning">No slides</span>
{% endif %}
{% endfor %}
{% endwith %}
@ -93,7 +93,7 @@
<a href="{% url "ietf.doc.views_doc.document_main" name=draft.canonical_name %}">{{ draft.canonical_name }}</a><br>
{% empty %}
{% if not meeting.proceedings_final %}
<span class="label label-warning">No drafts</span>
<span class="badge bg-warning">No drafts</span>
{% endif %}
{% endfor %}
{% endwith %}

4
ietf/templates/meeting/interim_pending.html
View file

@ -40,9 +40,9 @@
<td>{{ meeting.date }}</td>
<td>{{ meeting.responsible_group.acronym }}</td>
<td>
<a class="interim-meeting-link" href="{% url 'ietf.meeting.views.interim_request_details' number=meeting.number %}">{{ meeting.number }}{% if meeting.interim_meeting_cancelled %}&nbsp;&nbsp;<span class="label label-warning">CANCELLED</span>{% endif %}</a>
<a class="interim-meeting-link" href="{% url 'ietf.meeting.views.interim_request_details' number=meeting.number %}">{{ meeting.number }}{% if meeting.interim_meeting_cancelled %}&nbsp;&nbsp;<span class="badge bg-warning">CANCELLED</span>{% endif %}</a>
</td>
<td>{% if meeting.can_approve %}<span class="label label-success">can be approved</span>{% endif %}</td>
<td>{% if meeting.can_approve %}<span class="badge bg-success">can be approved</span>{% endif %}</td>
</tr>
{% endfor %}
</tbody>

2
ietf/templates/meeting/past.html
View file

@ -42,7 +42,7 @@
</td>
<td>
{% if meeting.type_id == "interim" %}
<a href="{% url 'ietf.meeting.views.session_details' num=meeting.number acronym=meeting.responsible_group.acronym %}">{{ meeting.number }}{% if meeting.interim_meeting_cancelled %}&nbsp;&nbsp;<span class="label label-warning">CANCELLED</span>{% endif %}</a>
<a href="{% url 'ietf.meeting.views.session_details' num=meeting.number acronym=meeting.responsible_group.acronym %}">{{ meeting.number }}{% if meeting.interim_meeting_cancelled %}&nbsp;&nbsp;<span class="badge bg-warning">CANCELLED</span>{% endif %}</a>
{% else %}
<a href="{% url 'ietf.meeting.views.agenda' num=meeting.number %}">IETF - {{ meeting.number }}</a>
{% endif %}

8
ietf/templates/meeting/schedule_list.html
View file

@ -52,16 +52,16 @@
<td>{{ schedule.notes|linebreaksbr }}</td>
<td>
{% if schedule.visible %}
<div class="label label-success">visible</div>
<div class="badge bg-success">visible</div>
{% else %}
<div class="label label-danger">hidden</div>
<div class="badge bg-danger">hidden</div>
{% endif %}
</td>
<td>
{% if schedule.public %}
<div class="label label-success">public</div>
<div class="badge bg-success">public</div>
{% else %}
<div class="label label-danger">private</div>
<div class="badge bg-danger">private</div>
{% endif %}
</td>
<td>

4
ietf/templates/meeting/session_details_panel.html
View file

@ -4,7 +4,7 @@
{% with item=session.official_timeslotassignment %}
<h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1 %}Session {{ forloop.counter }} : {% endif %}
{% for time in session.times %}{% if not forloop.first %}, {% endif %} {{time|dateformat:"l Y-m-d H:i T"}} {% if time.tzinfo.zone != "UTC" %}<span class="small">({{time|utc|dateformat:"H:i T"}})</span>{% endif %}{% endfor %}
{% if session.cancelled %}<small class="label label-warning">CANCELLED</small>{% else %}{{ session.status }}{% endif %}
{% if session.cancelled %}<small class="badge bg-warning">CANCELLED</small>{% else %}{{ session.status }}{% endif %}
{% if session.name %} : {{ session.name }}{% endif %}
{% if not session.cancelled %}
<span class="regular float-end">
@ -29,7 +29,7 @@
{% endif %}
</div>
{% if not session.type_counter.agenda %}
<span class="label label-warning">This session does not yet have an agenda</span>
<span class="badge bg-warning">This session does not yet have an agenda</span>
{% endif %}
{% endif %}
{% endif %}

8
ietf/templates/meeting/session_materials.html
View file

@ -9,10 +9,10 @@
<h4>Agenda</h4>
<div class="agenda-frame" data-src="{{ agenda.get_href }}"></div>
{% else %}
<span class="label label-info">Agenda submitted as {{ agenda.file_extension|upper }}</span>
<span class="badge bg-info">Agenda submitted as {{ agenda.file_extension|upper }}</span>
{% endif %}
{% else %}
<span class="label label-warning">No agenda submitted</span>
<span class="badge bg-warning">No agenda submitted</span>
{% endif %}
{% endwith %}
@ -34,9 +34,9 @@
<h4>Minutes</h4>
<div class="minutes-frame" data-src="{{ minutes.get_href }}"></div>
{% else %}
<span class="label label-info">Minutes submitted as {{ minutes.file_extension|upper }}</span>
<span class="badge bg-info">Minutes submitted as {{ minutes.file_extension|upper }}</span>
{% endif %}
{% else %}
<span class="label label-warning">No minutes submitted</span>
<span class="badge bg-warning">No minutes submitted</span>
{% endif %}
{% endwith %}

6
ietf/templates/meeting/upcoming.html
View file

@ -131,7 +131,7 @@
</td>
{% if session.current_status == 'canceled' %}
<td class='text-right'>
<span class="label label-warning">CANCELLED</span>
<span class="badge bg-warning">CANCELLED</span>
</td>
{% else %}
<td class='text-right'>
@ -140,7 +140,7 @@
{% endif %}
{% endwith %}
{% else %}
<td><span class="label-warning">Unexpected entry type: {{entry|classname}}</span></td>
<td><span class="badge bg-warning">Unexpected entry type: {{entry|classname}}</span></td>
<td></td>
<td></td>
<td></td>
@ -357,4 +357,4 @@
ietf_timezone.set_tz_change_callback(timezone_changed);
ietf_timezone.initialize('local');
</script>
{% endblock %}
{% endblock %}

4
ietf/templates/nomcom/view_feedback.html
View file

@ -56,7 +56,7 @@
</td>
{% for fbtype_name, fbtype_count, fbtype_newflag in fb_dict.feedback %}
<td class="text-right">
{% if fbtype_newflag %}<span class="label label-success">New</span>{% endif %}
{% if fbtype_newflag %}<span class="badge bg-success">New</span>{% endif %}
{{ fbtype_count }}
</td>
{% endfor %}
@ -89,7 +89,7 @@
</td>
{% for fbtype_name, fbtype_count, fbtype_newflag in fb_dict.feedback %}
<td class="text-right">
{% if fbtype_newflag %}<span class="label label-success">New</span>{% endif %}
{% if fbtype_newflag %}<span class="badge bg-success">New</span>{% endif %}
{{ fbtype_count }}
</td>
{% endfor %}

2
ietf/templates/nomcom/view_feedback_nominee.html
View file

@ -25,7 +25,7 @@
{% if feedback.type.slug == ft.slug %}
{% if forloop.first %}<p></p>{% else %}<hr>{% endif %}
<dl class="dl-horizontal">
<dt>{% if feedback.time > last_seen_time %}<span class="label label-success">New</span>{% endif %}From</dt>
<dt>{% if feedback.time > last_seen_time %}<span class="badge bg-success">New</span>{% endif %}From</dt>
<dd>{{ feedback.author|formatted_email|default:"Anonymous" }}
{% if ft.slug == "nomina" and feedback.nomination_set.first.share_nominator %}
<span class="bg-info"> OK to share name with nominee</span>

2
ietf/templates/nomcom/view_feedback_pending.html
View file

@ -43,7 +43,7 @@
<dt>Subject</dt>
<dd>{{ form.instance.subject }}</dd>
<dt>Type</dt>
<dd><span class="label label-info">{{ form.feedback_type }}</span></dd>
<dd><span class="badge bg-info">{{ form.feedback_type }}</span></dd>
<dt>Feedback</dt>
<dd>
<pre>{% decrypt form.instance.comments request year 1 %}</pre>

2
ietf/templates/nomcom/view_feedback_topic.html
View file

@ -24,7 +24,7 @@
{% if feedback.type.slug == ft.slug %}
{% if forloop.first %}<p></p>{% else %}<hr>{% endif %}
<dl class="dl-horizontal">
<dt>{% if feedback.time > last_seen_time %}<span class="label label-success">New</span>{% endif %}From</dt>
<dt>{% if feedback.time > last_seen_time %}<span class="badge bg-success">New</span>{% endif %}From</dt>
<dd>{{ feedback.author|formatted_email|default:"Anonymous" }}
</dd>
<dt>Date</dt>

4
ietf/templates/submit/submission_status.html
View file

@ -278,7 +278,7 @@
{{ res.name.name }}: {{ res.value }}
{% if res.display_name %} (as &quot;{{ res.display_name }}&quot;) {% endif %}
{% if external_resources.show_changes and added %}
<span class="label label-success">New</span>
<span class="badge bg-success">New</span>
{% endif %}
</div>
{% endwith %}
@ -296,7 +296,7 @@
{{ res.name.name }}: {{ res.value }}
{% if res.display_name %} (as &quot;{{ res.display_name }}&quot;) {% endif %}
{% if removed %}
<span class="label label-warning">Removed</span>
<span class="badge bg-warning">Removed</span>
{% endif %}
</div>
{% endwith %}