From 24b5018c8dbaf2e3710d965a8f4ee6411b67ed7a Mon Sep 17 00:00:00 2001 From: Philip Sargent <philip.sargent@gmail.com> Date: Thu, 10 Aug 2023 23:28:05 +0300 Subject: [PATCH] re-order display --- templates/aliases.html | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/aliases.html b/templates/aliases.html index f8f2bf5..3ff6592 100644 --- a/templates/aliases.html +++ b/templates/aliases.html @@ -5,18 +5,6 @@ <h1>Aliases for people's names in {{year}}</h1> -<p>This is the list of people on expo this year. -<table> -<tr><th>Person</th><th>slug</th><th>aliases</th></tr> -{% for pe in personexpeditions %} -<tr> - <td>{{pe.person}}</td> - <td>{{pe.slugfield}}</td> - <td>{{pe.slugfield}}</td> - </tr> -{% endfor %} -</table> - <p>This table below lists the possible unambiguous ways of identifying a person in a survex file or a logbook entry. This ridiculously long list of alternatives is derived from what people have actually done in the last 40 years. <p>Note that this is year specific: On a year with only one 'Sophie' then the identifier 'Sophie' will be fine. @@ -60,6 +48,18 @@ is used in the table above to construct possible unambiguous identifiers. {% endfor %} </table> +<p>This is the list of people on expo this year. +<table> +<tr><th>Person</th><th>slug</th><th>aliases</th></tr> +{% for pe in personexpeditions %} +<tr> + <td>{{pe.person}}</td> + <td>{{pe.slugfield}}</td> + <td>{{pe.slugfield}}</td> + </tr> +{% endfor %} +</table> + <p>And these are people known to us, who appear as survex *team members or in logbook participant lists, but are not expo members and so are not managed or reported: {% for p in foreign_friends %}