From e7120d91f6ab7917b57b0e966259082d513c36ee Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Tue, 2 Jul 2019 17:50:45 -0700
Subject: [PATCH] Rename _rows_and_columns.html to _table.html, refs #521

---
 .../{_rows_and_columns.html => _table.html}   |  0
 datasette/templates/row.html                  |  2 +-
 datasette/templates/table.html                |  2 +-
 datasette/views/table.py                      | 16 +++++++--------
 docs/custom_templates.rst                     | 20 +++++++++----------
 5 files changed, 20 insertions(+), 20 deletions(-)
 rename datasette/templates/{_rows_and_columns.html => _table.html} (100%)

diff --git a/datasette/templates/_rows_and_columns.html b/datasette/templates/_table.html
similarity index 100%
rename from datasette/templates/_rows_and_columns.html
rename to datasette/templates/_table.html
diff --git a/datasette/templates/row.html b/datasette/templates/row.html
index baffaf96..bda1e4e2 100644
--- a/datasette/templates/row.html
+++ b/datasette/templates/row.html
@@ -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>
 
-{% include custom_rows_and_columns_templates %}
+{% include custom_table_templates %}
 
 {% if foreign_key_tables %}
     <h2>Links from other tables</h2>
diff --git a/datasette/templates/table.html b/datasette/templates/table.html
index 5ba3ff6d..2287e901 100644
--- a/datasette/templates/table.html
+++ b/datasette/templates/table.html
@@ -145,7 +145,7 @@
     </div>
 {% endif %}
 
-{% include custom_rows_and_columns_templates %}
+{% include custom_table_templates %}
 
 {% if next_url %}
      <p><a href="{{ next_url }}">Next page</a></p>
diff --git a/datasette/views/table.py b/datasette/views/table.py
index c41bc305..8ba3abe4 100644
--- a/datasette/views/table.py
+++ b/datasette/views/table.py
@@ -744,14 +744,14 @@ class TableView(RowTableShared):
                 "sort": sort,
                 "sort_desc": sort_desc,
                 "disable_sort": is_view,
-                "custom_rows_and_columns_templates": [
-                    "_rows_and_columns-{}-{}.html".format(
+                "custom_table_templates": [
+                    "_table-{}-{}.html".format(
                         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)
                     ),
-                    "_rows_and_columns.html",
+                    "_table.html",
                 ],
                 "metadata": metadata,
                 "view_definition": await db.get_view_definition(table),
@@ -828,14 +828,14 @@ class RowView(RowTableShared):
                 ),
                 "display_columns": display_columns,
                 "display_rows": display_rows,
-                "custom_rows_and_columns_templates": [
-                    "_rows_and_columns-{}-{}.html".format(
+                "custom_table_templates": [
+                    "_table-{}-{}.html".format(
                         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)
                     ),
-                    "_rows_and_columns.html",
+                    "_table.html",
                 ],
                 "metadata": (self.ds.metadata("databases") or {})
                 .get(database, {})
diff --git a/docs/custom_templates.rst b/docs/custom_templates.rst
index b0863381..1dfaf892 100644
--- a/docs/custom_templates.rst
+++ b/docs/custom_templates.rst
@@ -145,14 +145,14 @@ The lookup rules Datasette uses are as follows::
         row.html
 
     Rows and columns include on table page:
-        _rows_and_columns-table-mydatabase-mytable.html
-        _rows_and_columns-mydatabase-mytable.html
-        _rows_and_columns.html
+        _table-table-mydatabase-mytable.html
+        _table-mydatabase-mytable.html
+        _table.html
 
     Rows and columns include on row page:
-        _rows_and_columns-row-mydatabase-mytable.html
-        _rows_and_columns-mydatabase-mytable.html
-        _rows_and_columns.html
+        _table-row-mydatabase-mytable.html
+        _table-mydatabase-mytable.html
+        _table.html
 
 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
@@ -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
 from the default template.
 
-The ``_rows_and_columns.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
-`can be seen here <https://github.com/simonw/datasette/blob/master/datasette/templates/_rows_and_columns.html>`_.
+The ``_table.html`` template is included on both the row and the table
+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/_table.html>`_.
 
 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
 template naming scheme described above.
 
 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>
         <thead>