Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sept 22 updates #369

Merged
merged 2 commits into from
Sep 22, 2023
Merged

Sept 22 updates #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b9e349
shwoing motion_text when available, closes #363
derekeder Sep 22, 2023
a8589d8
condensing agenda tables for mobile
derekeder Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions chicago/templates/event.html
View file
Open in desktop
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
Open in desktop
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