Skip to content

Commit 919a63a

Browse files
committed
Merged in [9637] from rjsparks@nostrum.com:
Color agenda/documents rows with position taken when viewing as an AD. Fixes bug ietf-tools#1679. - Legacy-Id: 9657 Note: SVN reference [9637] has been migrated to Git commit edcaf46
2 parents f2f4bd8 + edcaf46 commit 919a63a

3 files changed

Lines changed: 16 additions & 2 deletions

File tree

ietf/templates/doc/search/search_result_row.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %}
22
{% load widget_tweaks %}
33
{% load ietf_filters %}
4+
{% load ballot_icon %}
45

5-
<tr>
6+
<tr {% spaceless %}
7+
{% if color_row_positions %}
8+
{% with doc|ballotposition:user as pos %}
9+
{% if pos %}class="position-{{pos.slug}}-row"{% endif %}
10+
{% endwith %}
11+
{% endif %}
12+
{% endspaceless %}>
613

714
<td>
815
{% if user.is_authenticated %}

ietf/templates/iesg/agenda_documents.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ <h2>IESG telechat {{t.date}}</h2>
6060
</thead>
6161
<tbody>
6262
{% for doc in section.docs %}
63-
{% include "doc/search/search_result_row.html" %}
63+
{% include "doc/search/search_result_row.html" with color_row_positions=True %}
6464
{% endfor %}
6565
</tbody>
6666
</table>

static/css/ietf.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,13 @@ label.required:after { content: "\2217"; color: #a94442; font-weight: bold; }
131131
.position-abstain { background-color: #f69f74; } /* @brand-warning */
132132
.position-recuse { background-color: #808080; }
133133
.position-norecord { background-color: inherit; }
134+
.position-discuss-row,
135+
.position-block-row { background-color: #F1CBC8 !important ; } /* lighter variants of above */
136+
.position-yes-row { background-color: #E1FDD6 !important ; }
137+
.position-noobj-row { background-color: #F2FCEE !important ; }
138+
.position-abstain-row { background-color: #FAD0BB !important ; }
139+
.position-recuse-row { background-color: #D9D9D9 !important ; }
140+
.position-norecord-row { background-color: inherit; }
134141
.ballot-icon table td { border: 1px solid #ddd; height: 10px; width: 8px; }
135142
.ballot-icon table .my { border: 2px solid #000;}
136143
.ballot-icon table { margin: 0 0 10px 10px; }

0 commit comments

Comments
 (0)