mirror
/
datasette
kopia lustrzana https://github.com/simonw/datasette
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Add column name classes to <td>s, make PK bold

pull/222/head
Russ Garrett 2018-04-17 09:29:48 +01:00 zatwierdzone przez Simon Willison
rodzic 0f782dd8df
commit 136a70d887
3 zmienionych plików z 39 dodań i 36 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
datasette/static/app.css
Wyświetl plik

@ -17,6 +17,9 @@ td {
padding: 4px; padding: 4px;
vertical-align: top; vertical-align: top;
} }
td.col-link {
font-weight: bold;
}
td em { td em {
font-style: normal; font-style: normal;
font-size: 0.8em; font-size: 0.8em;

2
datasette/templates/_rows_and_columns.html
Wyświetl plik

@ -20,7 +20,7 @@
{% for row in display_rows %} {% for row in display_rows %}
<tr> <tr>
{% for cell in row %} {% for cell in row %}
<td>{{ cell.value }}</td> <td class="col-{{ cell.column|lower }}">{{ cell.value }}</td>
{% endfor %} {% endfor %}
</tr> </tr>
{% endfor %} {% endfor %}

70
tests/test_html.py
Wyświetl plik

@ -183,14 +183,14 @@ def test_table_html_simple_primary_key(app_client):
assert ['nofollow'] == a['rel'] assert ['nofollow'] == a['rel']
assert [ assert [
[ [
'<td><a href="/test_tables/simple_primary_key/1">1</a></td>', '<td class="col-link"><a href="/test_tables/simple_primary_key/1">1</a></td>',
'<td>hello</td>' '<td class="col-content">hello</td>'
], [ ], [
'<td><a href="/test_tables/simple_primary_key/2">2</a></td>', '<td class="col-link"><a href="/test_tables/simple_primary_key/2">2</a></td>',
'<td>world</td>' '<td class="col-content">world</td>'
], [ ], [
'<td><a href="/test_tables/simple_primary_key/3">3</a></td>', '<td class="col-link"><a href="/test_tables/simple_primary_key/3">3</a></td>',
'<td></td>' '<td class="col-content"></td>'
] ]
] == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')] ] == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')]
@ -204,8 +204,8 @@ def test_row_html_simple_primary_key(app_client):
] == [th.string.strip() for th in table.select('thead th')] ] == [th.string.strip() for th in table.select('thead th')]
assert [ assert [
[ [
'<td>1</td>', '<td class="col-id">1</td>',
'<td>hello</td>' '<td class="col-content">hello</td>'
] ]
] == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')] ] == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')]
@ -226,12 +226,12 @@ def test_table_html_no_primary_key(app_client):
] == [th.string.strip() for th in table.select('thead th')[2:]] ] == [th.string.strip() for th in table.select('thead th')[2:]]
expected = [ expected = [
[ [
'<td><a href="/test_tables/no_primary_key/{}">{}</a></td>'.format(i, i), '<td class="col-link"><a href="/test_tables/no_primary_key/{}">{}</a></td>'.format(i, i),
'<td>{}</td>'.format(i), '<td class="col-rowid">{}</td>'.format(i),
'<td>{}</td>'.format(i), '<td class="col-content">{}</td>'.format(i),
'<td>a{}</td>'.format(i), '<td class="col-a">a{}</td>'.format(i),
'<td>b{}</td>'.format(i), '<td class="col-b">b{}</td>'.format(i),
'<td>c{}</td>'.format(i), '<td class="col-c">c{}</td>'.format(i),
] for i in range(1, 51) ] for i in range(1, 51)
] ]
assert expected == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')] assert expected == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')]
@ -246,11 +246,11 @@ def test_row_html_no_primary_key(app_client):
] == [th.string.strip() for th in table.select('thead th')] ] == [th.string.strip() for th in table.select('thead th')]
expected = [ expected = [
[ [
'<td>1</td>', '<td class="col-rowid">1</td>',
'<td>1</td>', '<td class="col-content">1</td>',
'<td>a1</td>', '<td class="col-a">a1</td>',
'<td>b1</td>', '<td class="col-b">b1</td>',
'<td>c1</td>', '<td class="col-c">c1</td>',
] ]
] ]
assert expected == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')] assert expected == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')]
@ -270,10 +270,10 @@ def test_table_html_compound_primary_key(app_client):
)) ))
expected = [ expected = [
[ [
'<td><a href="/test_tables/compound_primary_key/a,b">a,b</a></td>', '<td class="col-link"><a href="/test_tables/compound_primary_key/a,b">a,b</a></td>',
'<td>a</td>', '<td class="col-pk1">a</td>',
'<td>b</td>', '<td class="col-pk2">b</td>',
'<td>c</td>', '<td class="col-content">c</td>',
] ]
] ]
assert expected == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')] assert expected == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')]
@ -285,9 +285,9 @@ def test_table_html_foreign_key_links(app_client):
table = Soup(response.body, 'html.parser').find('table') table = Soup(response.body, 'html.parser').find('table')
expected = [ expected = [
[ [
'<td><a href="/test_tables/foreign_key_references/1">1</a></td>', '<td class="col-link"><a href="/test_tables/foreign_key_references/1">1</a></td>',
'<td><a href="/test_tables/simple_primary_key/1">hello</a>\xa0<em>1</em></td>', '<td class="col-foreign_key_with_label"><a href="/test_tables/simple_primary_key/1">hello</a>\xa0<em>1</em></td>',
'<td><a href="/test_tables/primary_key_multiple_columns/1">1</a></td>' '<td class="col-foreign_key_with_no_label"><a href="/test_tables/primary_key_multiple_columns/1">1</a></td>'
] ]
] ]
assert expected == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')] assert expected == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')]
@ -302,9 +302,9 @@ def test_row_html_compound_primary_key(app_client):
] == [th.string.strip() for th in table.select('thead th')] ] == [th.string.strip() for th in table.select('thead th')]
expected = [ expected = [
[ [
'<td>a</td>', '<td class="col-pk1">a</td>',
'<td>b</td>', '<td class="col-pk2">b</td>',
'<td>c</td>', '<td class="col-content">c</td>',
] ]
] ]
assert expected == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')] assert expected == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')]
@ -319,14 +319,14 @@ def test_view_html(app_client):
] == [th.string.strip() for th in table.select('thead th')] ] == [th.string.strip() for th in table.select('thead th')]
expected = [ expected = [
[ [
'<td>hello</td>', '<td class="col-content">hello</td>',
'<td>HELLO</td>' '<td class="col-upper_content">HELLO</td>'
], [ ], [
'<td>world</td>', '<td class="col-content">world</td>',
'<td>WORLD</td>' '<td class="col-upper_content">WORLD</td>'
], [ ], [
'<td></td>', '<td class="col-content"></td>',
'<td></td>' '<td class="col-upper_content"></td>'
] ]
] ]
assert expected == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')] assert expected == [[str(td) for td in tr.select('td')] for tr in table.select('tbody tr')]