From 8b9e349985166f5ce7bcf37ce04e9e022d45d7be Mon Sep 17 00:00:00 2001 From: Derek Eder Date: Fri, 22 Sep 2023 15:34:02 -0500 Subject: [PATCH 1/2] shwoing motion_text when available, closes #363 --- chicago/templates/legislation.html | 137 +++++++++++++++-------------- 1 file changed, 70 insertions(+), 67 deletions(-) diff --git a/chicago/templates/legislation.html b/chicago/templates/legislation.html index c7c4858..b3ee32e 100644 --- a/chicago/templates/legislation.html +++ b/chicago/templates/legislation.html @@ -31,80 +31,80 @@

{{ legislation.title }}

{% with other_identifiers=legislation.other_identifiers.all %} - {% if other_identifiers %} -

- Alternate identifiers: - {% for identifier in other_identifiers %} - {{ identifier.identifier }} - {% if not forloop.last %} , {% endif %} - {% endfor %} -

- {% endif %} + {% if other_identifiers %} +

+ Alternate identifiers: + {% for identifier in other_identifiers %} + {{ identifier.identifier }} + {% if not forloop.last %} , {% endif %} + {% endfor %} +

+ {% endif %} {% endwith %}
{% with sponsors=sponsors_qs.all %} - {% if sponsors %} -

Sponsors

+ {% if sponsors %} +

Sponsors

-
- - - - - + + + + + {% endif %} + {% endfor %} + +
- {% if sponsors|length > 1 %} - Sponsors ({{sponsors|length}}) - {% else %} - Sponsor +
+ + + + + + + + + + {% for s in sponsors %} + {% if s.primary %} + + + + + {% endif %} - - - - - - {% for s in sponsors %} - {% if s.primary %} - - - - - - {% endif %} - {% endfor %} - {% for s in sponsors %} - {% if not s.primary %} - - - - - - {% endif %} - {% endfor %} - -
+ {% if sponsors|length > 1 %} + Sponsors ({{sponsors|length}}) + {% else %} + Sponsor + {% endif %} + + {{CITY_VOCAB.MUNICIPAL_DISTRICT}} +
+
+ {{s.person.name}} +
+ 		+ {{ s.person.name }}Primary Sponsor + + {{s.person.council_posts.0.post.label}} +
- {{CITY_VOCAB.MUNICIPAL_DISTRICT}} -
-
- {{s.person.name}} -
- 		- {{ s.person.name }}Primary Sponsor - - {{s.person.council_posts.0.post.label}} -
-
- {{s.person.name}} -
- 		- {{ s.person.name }} - - {{s.person.council_posts.0.post.label}} -
-
-
- {% endif %} + {% endfor %} + {% for s in sponsors %} + {% if not s.primary %} +
+
+ {{s.person.name}} +
+ 		+ {{ s.person.name }} + + {{s.person.council_posts.0.post.label}} +
+
+
+ {% endif %} {% endwith %} {% if legislation.actions %} @@ -131,6 +131,9 @@

History

{{action.description | remove_action_subj}} {% if action.vote.counts.all|length > 0 %} + {% if action.vote.motion_text %} +

{{action.vote.motion_text}}

+ {% endif %} From a8589d89214df5d5fd3489ecf2f7d0d692af0e62 Mon Sep 17 00:00:00 2001 From: Derek Eder Date: Fri, 22 Sep 2023 15:58:54 -0500 Subject: [PATCH 2/2] condensing agenda tables for mobile --- chicago/templates/event.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/chicago/templates/event.html b/chicago/templates/event.html index 30c06d3..8d82ca1 100644 --- a/chicago/templates/event.html +++ b/chicago/templates/event.html @@ -24,7 +24,7 @@

{%if event.status == 'cancelled'%}CANCELLED: {% endif %}{{event.name}}

{% if event.video_vimeo_id %} - +

View on Vimeo

{% endif %}
@@ -32,10 +32,10 @@

{%if event.status == 'cancelled'%}CANCELLED: {% endif %}{{event.name}}

{% if event.agenda.all %}

Agenda: {{event.agenda.all|length}} items

-
+
- + @@ -55,7 +55,7 @@

Agenda: {{event.agenda.all|length}} items

{% else %}
Order# Description ID Sponsor(s) {% for s in agenda_item.bills.0.bill.sponsors %} - {{ s.person.councilmatic_person.link_html | safe }}{% if not forloop.last %},{% endif %} + {{ s.person.councilmatic_person.link_html | safe }}{% if not forloop.last %},{% endif %} {% endfor %}