github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactored table column/row display logic

Browse source 
Simplified the template and made the way for upcoming foreign key work.

Refs #85

Also fixed   bug on database page - closes #113
This commit is contained in:
Simon Willison 2017-11-17 07:39:36 -08:00
commit e16ca1169c
3 changed files with 49 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
datasette/templates/database.html
View file

@ -59,7 +59,7 @@
{% for row in rows %}
<tr>
{% for td in row %}
<td>{{ td or "&nbsp;" }}</td>
<td>{{ td or "&nbsp;"|safe }}</td>
{% endfor %}
</tr>
{% endfor %}

15
datasette/templates/table.html
View file

@ -5,11 +5,8 @@
{% block extra_head %}
<style>
@media only screen and (max-width: 576px) {
{% if not is_view %}
td:nth-of-type(1):before { content: "{% if use_rowid %}rowid{% else %}Link{% endif %}"; }
{% endif %}
{% for column in display_columns %}
td:nth-of-type({% if is_view %}{{ loop.index }}{% else %}{{ loop.index + 1 }}{% endif %}):before { content: "{{ column|escape_css_string }}"; }
td:nth-of-type({{ loop.index }}):before { content: "{{ column|escape_css_string }}"; }
{% endfor %}
}
</style>
@ -34,18 +31,14 @@
<table>
<thead>
<tr>
{% if not is_view %}<th scope="col">{% if use_rowid %}rowid{% else %}Link{% endif %}</th>{% endif %}
{% for column in display_columns %}<th scope="col">{{ column }}</th>{% endfor %}
</tr>
</thead>
<tbody>
{% for row in rows %}
{% for row in display_rows %}
<tr>
{% if not is_view %}<td><a href="/{{ database }}-{{ database_hash }}/{{ table|quote_plus }}/{{ row_link(row) }}">{{ row_link(row) }}</a></td>{% endif %}
{% for td in row %}
{% if not use_rowid or (use_rowid and not loop.first) %}
<td>{{ td or "&nbsp;"|safe }}</td>
{% endif %}
{% for cell in row %}
<td>{{ cell.value }}</td>
{% endfor %}
</tr>
{% endfor %}