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

Rename _rows_and_columns.html to _table.html, refs #521

Browse source
This commit is contained in:
Simon Willison 2019-07-02 17:50:45 -07:00
commit 55637ef994
6 changed files with 48 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

0
datasette/templates/_rows_and_columns.html → datasette/templates/_table.html
View file

2
datasette/templates/row.html
View file

@ -24,7 +24,7 @@
<p>This data as {% for name, url in renderers.items() %}<a href="{{ url }}">{{ name }}</a>{{ ", " if not loop.last }}{% endfor %}</p> <p>This data as {% for name, url in renderers.items() %}<a href="{{ url }}">{{ name }}</a>{{ ", " if not loop.last }}{% endfor %}</p>
{% include custom_rows_and_columns_templates %} {% include custom_table_templates %}
{% if foreign_key_tables %} {% if foreign_key_tables %}
<h2>Links from other tables</h2> <h2>Links from other tables</h2>

2
datasette/templates/table.html
View file

@ -145,7 +145,7 @@
</div> </div>
{% endif %} {% endif %}
{% include custom_rows_and_columns_templates %} {% include custom_table_templates %}
{% if next_url %} {% if next_url %}
<p><a href="{{ next_url }}">Next page</a></p> <p><a href="{{ next_url }}">Next page</a></p>

16
datasette/views/table.py
View file

@ -744,14 +744,14 @@ class TableView(RowTableShared):
"sort": sort, "sort": sort,
"sort_desc": sort_desc, "sort_desc": sort_desc,
"disable_sort": is_view, "disable_sort": is_view,
"custom_rows_and_columns_templates": [ "custom_table_templates": [
"_rows_and_columns-{}-{}.html".format( "_table-{}-{}.html".format(
to_css_class(database), to_css_class(table) to_css_class(database), to_css_class(table)
), ),
"_rows_and_columns-table-{}-{}.html".format( "_table-table-{}-{}.html".format(
to_css_class(database), to_css_class(table) to_css_class(database), to_css_class(table)
), ),
"_rows_and_columns.html", "_table.html",
], ],
"metadata": metadata, "metadata": metadata,
"view_definition": await db.get_view_definition(table), "view_definition": await db.get_view_definition(table),
@ -828,14 +828,14 @@ class RowView(RowTableShared):
), ),
"display_columns": display_columns, "display_columns": display_columns,
"display_rows": display_rows, "display_rows": display_rows,
"custom_rows_and_columns_templates": [ "custom_table_templates": [
"_rows_and_columns-{}-{}.html".format( "_table-{}-{}.html".format(
to_css_class(database), to_css_class(table) to_css_class(database), to_css_class(table)
), ),
"_rows_and_columns-row-{}-{}.html".format( "_table-row-{}-{}.html".format(
to_css_class(database), to_css_class(table) to_css_class(database), to_css_class(table)
), ),
"_rows_and_columns.html", "_table.html",
], ],
"metadata": (self.ds.metadata("databases") or {}) "metadata": (self.ds.metadata("databases") or {})
.get(database, {}) .get(database, {})

20
docs/custom_templates.rst
View file

@ -145,14 +145,14 @@ The lookup rules Datasette uses are as follows::
row.html row.html
Rows and columns include on table page: Rows and columns include on table page:
_rows_and_columns-table-mydatabase-mytable.html _table-table-mydatabase-mytable.html
_rows_and_columns-mydatabase-mytable.html _table-mydatabase-mytable.html
_rows_and_columns.html _table.html
Rows and columns include on row page: Rows and columns include on row page:
_rows_and_columns-row-mydatabase-mytable.html _table-row-mydatabase-mytable.html
_rows_and_columns-mydatabase-mytable.html _table-mydatabase-mytable.html
_rows_and_columns.html _table.html
If a table name has spaces or other unexpected characters in it, the template If a table name has spaces or other unexpected characters in it, the template
filename will follow the same rules as our custom ``<body>`` CSS classes - for filename will follow the same rules as our custom ``<body>`` CSS classes - for
@ -189,16 +189,16 @@ content you can do so by creating a ``row.html`` template like this::
Note the ``default:row.html`` template name, which ensures Jinja will inherit Note the ``default:row.html`` template name, which ensures Jinja will inherit
from the default template. from the default template.
The ``_rows_and_columns.html`` template is included on both the row and the table The ``_table.html`` template is included on both the row and the table
page, and displays the content of the row. The default ``_rows_and_columns.html`` template page, and displays the content of the row. The default ``_table.html`` template
`can be seen here <https://github.com/simonw/datasette/blob/master/datasette/templates/_rows_and_columns.html>`_. `can be seen here <https://github.com/simonw/datasette/blob/master/datasette/templates/_table.html>`_.
You can provide a custom template that applies to all of your databases and You can provide a custom template that applies to all of your databases and
tables, or you can provide custom templates for specific tables using the tables, or you can provide custom templates for specific tables using the
template naming scheme described above. template naming scheme described above.
Say for example you want to output a certain column as unescaped HTML. You could Say for example you want to output a certain column as unescaped HTML. You could
provide a custom ``_rows_and_columns.html`` template like this:: provide a custom ``_table.html`` template like this::
<table> <table>
<thead> <thead>