Skip to content

Commit

Permalink
Merge pull request #369 from datamade/sept-22-updates
Browse files Browse the repository at this point in the history 
Sept 22 updates
  • Loading branch information
@derekeder
derekeder authored Sep 22, 2023
2 parents 23ff676 + a8589d8 commit 07c8d19
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 71 deletions.
8 changes: 4 additions & 4 deletions chicago/templates/event.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ <h1>{%if event.status == 'cancelled'%}CANCELLED: {% endif %}{{event.name}}</h1>
</p>

{% if event.video_vimeo_id %}
<iframe src="https://player.vimeo.com/video/{{event.video_vimeo_id}}?h=b9331c0f77&title=0" width="640" height="360" frameborder="0" allow="autoplay; fullscreen; picture-in-picture" allowfullscreen></iframe>
<iframe src="https://player.vimeo.com/video/{{event.video_vimeo_id}}?h=b9331c0f77&title=0" width="100%" height="360" frameborder="0" allow="autoplay; fullscreen; picture-in-picture" allowfullscreen></iframe>
<p><a href="https://vimeo.com/{{event.video_vimeo_id}}">View on Vimeo</a></p>
{% endif %}
<hr />
<div class="row">
<div class="col-sm-10">
{% if event.agenda.all %}
<h4>Agenda: {{event.agenda.all|length}} items</h4>
<table class="table table table-responsive">
<table class="table table table-responsive table-condensed">
<thead>
<tr>
<th>Order</th>
<th>#</th>
<th>Description</th>
<th>ID</th>
<th>Sponsor(s)</th>
Expand All @@ -55,7 +55,7 @@ <h4>Agenda: {{event.agenda.all|length}} items</h4>
</td>
<td>
{% for s in agenda_item.bills.0.bill.sponsors %}
<span class="nowrap">{{ s.person.councilmatic_person.link_html | safe }}</span>{% if not forloop.last %},{% endif %}
{{ s.person.councilmatic_person.link_html | safe }}{% if not forloop.last %},{% endif %}
{% endfor %}
</td>
{% else %}
Expand Down
137 changes: 70 additions & 67 deletions chicago/templates/legislation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,80 +31,80 @@ <h1 class="bill-page-title">
<p>{{ legislation.title }}</p>

{% with other_identifiers=legislation.other_identifiers.all %}
{% if other_identifiers %}
<p>
Alternate identifiers:
{% for identifier in other_identifiers %}
{{ identifier.identifier }}
{% if not forloop.last %} , {% endif %}
{% endfor %}
</p>
{% endif %}
{% if other_identifiers %}
<p>
Alternate identifiers:
{% for identifier in other_identifiers %}
{{ identifier.identifier }}
{% if not forloop.last %} , {% endif %}
{% endfor %}
</p>
{% endif %}
{% endwith %}

<div class="divider"></div>

{% with sponsors=sponsors_qs.all %}
{% if sponsors %}
<h3 class="no-pad-bottom"><i class='fa fa-fw fa-users'></i> Sponsors</h3>
{% if sponsors %}
<h3 class="no-pad-bottom"><i class='fa fa-fw fa-users'></i> Sponsors</h3>

<div class="table-responsive">
<table class='table table-responsive' id='council-members'>
<thead>
<tr>
<th></th>
<th>
{% if sponsors|length > 1 %}
Sponsors ({{sponsors|length}})
{% else %}
Sponsor
<div class="table-responsive">
<table class='table table-responsive' id='council-members'>
<thead>
<tr>
<th></th>
<th>
{% if sponsors|length > 1 %}
Sponsors ({{sponsors|length}})
{% else %}
Sponsor
{% endif %}
</th>
<th>
{{CITY_VOCAB.MUNICIPAL_DISTRICT}}
</th>
</tr>
</thead>
<tbody>
{% for s in sponsors %}
{% if s.primary %}
<tr>
<td>
<div class="thumbnail-square">
<img src='{{s.person.councilmatic_person|get_person_headshot}}' alt='{{s.person.name}}' title='{{s.person.name}}' class='img-responsive' />
</div>
</td>
<td>
<a href="{% url 'person' s.person.councilmatic_person.slug %}">{{ s.person.name }}</a><span class="badge badge-default">Primary Sponsor</span>
</td>
<td>
{{s.person.council_posts.0.post.label}}
</td>
</tr>
{% endif %}
</th>
<th>
{{CITY_VOCAB.MUNICIPAL_DISTRICT}}
</th>
</tr>
</thead>
<tbody>
{% for s in sponsors %}
{% if s.primary %}
<tr>
<td>
<div class="thumbnail-square">
<img src='{{s.person.councilmatic_person|get_person_headshot}}' alt='{{s.person.name}}' title='{{s.person.name}}' class='img-responsive' />
</div>
</td>
<td>
<a href="{% url 'person' s.person.councilmatic_person.slug %}">{{ s.person.name }}</a><span class="badge badge-default">Primary Sponsor</span>
</td>
<td>
{{s.person.council_posts.0.post.label}}
</td>
</tr>
{% endif %}
{% endfor %}
{% for s in sponsors %}
{% if not s.primary %}
<tr>
<td>
<div class="thumbnail-square">
<img src='{{s.person.councilmatic_person|get_person_headshot}}' alt='{{s.person.name}}' title='{{s.person.name}}' class='img-responsive' />
</div>
</td>
<td>
<a href="{% url 'person' s.person.councilmatic_person.slug %}">{{ s.person.name }}</a>
</td>
<td>
{{s.person.council_posts.0.post.label}}
</td>
</tr>
{% endif %}
{% endfor %}
</tbody>
</table>
</div>
<div class="divider"></div>
{% endif %}
{% endfor %}
{% for s in sponsors %}
{% if not s.primary %}
<tr>
<td>
<div class="thumbnail-square">
<img src='{{s.person.councilmatic_person|get_person_headshot}}' alt='{{s.person.name}}' title='{{s.person.name}}' class='img-responsive' />
</div>
</td>
<td>
<a href="{% url 'person' s.person.councilmatic_person.slug %}">{{ s.person.name }}</a>
</td>
<td>
{{s.person.council_posts.0.post.label}}
</td>
</tr>
{% endif %}
{% endfor %}
</tbody>
</table>
</div>
<div class="divider"></div>
{% endif %}
{% endwith %}

{% if legislation.actions %}
Expand All @@ -131,6 +131,9 @@ <h3 class="no-pad-bottom"><i class='fa fa-fw fa-list-ul'></i> History</h3>
<span class='text-{{action.label}}'>{{action.description | remove_action_subj}}</span>

{% if action.vote.counts.all|length > 0 %}
{% if action.vote.motion_text %}
<p>{{action.vote.motion_text}}</p>
{% endif %}
<table class='table table-responsive'>
<thead>
<tr>
Expand Down

0 comments on commit 07c8d19

Please sign in to comment.