diff --git a/resources/sql/queries.auto.sql b/resources/sql/queries.auto.sql
index 3e66e95..d114489 100644
--- a/resources/sql/queries.auto.sql
+++ b/resources/sql/queries.auto.sql
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------
 --	File queries.sql 
 --	
---	autogenerated by adl.to-hugsql-queries at 2018-06-29T14:15:37.324Z 
+--	autogenerated by adl.to-hugsql-queries at 2018-06-29T16:36:18.648Z 
 --	
 --	See [Application Description 
 --	Language](https://github.com/simon-brooke/adl). 
diff --git a/resources/sql/youyesyet.postgres.sql b/resources/sql/youyesyet.postgres.sql
index 2dbb0c6..42b0f83 100644
--- a/resources/sql/youyesyet.postgres.sql
+++ b/resources/sql/youyesyet.postgres.sql
@@ -5,7 +5,7 @@
 --	
 --	auto-generated by [Application Description Language framework] 
 --	
---	(https://github.com/simon-brooke/adl) at 20180629T141538.194Z 
+--	(https://github.com/simon-brooke/adl) at 20180629T163619.639Z 
 --	
 --	
 --	    A web-app intended to be used by canvassers campaigning for a 
@@ -860,8 +860,8 @@ ALTER TABLE visits ADD CONSTRAINT ri_visits_canvassers_canvasser_id
 ------------------------------------------------------------------------
 CREATE TABLE ln_canvassers_roles
 (
-	 canvassers_id INTEGER,
-	 roles_id INTEGER
+	 canvasser_id INTEGER,
+	 role_id INTEGER
 );
 GRANT SELECT ON ln_canvassers_roles TO admin,
 	analysts,
@@ -877,13 +877,13 @@ GRANT UPDATE ON ln_canvassers_roles TO admin,
 	teamorganisers ;
 GRANT DELETE ON ln_canvassers_roles TO admin ;
 
-ALTER TABLE ln_canvassers_roles ADD CONSTRAINT ri_ln_canvassers_roles_canvassers_canvassers_id 
-	FOREIGN KEY( canvassers_id ) 
+ALTER TABLE ln_canvassers_roles ADD CONSTRAINT ri_ln_canvassers_roles_canvassers_canvasser_id 
+	FOREIGN KEY( canvasser_id ) 
 	REFERENCES canvassers(id) 
 	ON DELETE NO ACTION ;
 
-ALTER TABLE ln_canvassers_roles ADD CONSTRAINT ri_ln_canvassers_roles_roles_roles_id 
-	FOREIGN KEY( roles_id ) 
+ALTER TABLE ln_canvassers_roles ADD CONSTRAINT ri_ln_canvassers_roles_roles_role_id 
+	FOREIGN KEY( role_id ) 
 	REFERENCES roles(id) 
 	ON DELETE NO ACTION ;
 
@@ -894,8 +894,8 @@ ALTER TABLE ln_canvassers_roles ADD CONSTRAINT ri_ln_canvassers_roles_roles_role
 ------------------------------------------------------------------------
 CREATE TABLE ln_canvassers_teams
 (
-	 teams_id INTEGER,
-	 canvassers_id INTEGER
+	 team_id INTEGER,
+	 canvasser_id INTEGER
 );
 GRANT SELECT ON ln_canvassers_teams TO admin,
 	analysts,
@@ -909,13 +909,13 @@ GRANT UPDATE ON ln_canvassers_teams TO admin,
 	teamorganisers ;
 GRANT DELETE ON ln_canvassers_teams TO admin ;
 
-ALTER TABLE ln_canvassers_teams ADD CONSTRAINT ri_ln_canvassers_teams_canvassers_canvassers_id 
-	FOREIGN KEY( canvassers_id ) 
+ALTER TABLE ln_canvassers_teams ADD CONSTRAINT ri_ln_canvassers_teams_canvassers_canvasser_id 
+	FOREIGN KEY( canvasser_id ) 
 	REFERENCES canvassers(id) 
 	ON DELETE NO ACTION ;
 
-ALTER TABLE ln_canvassers_teams ADD CONSTRAINT ri_ln_canvassers_teams_teams_teams_id 
-	FOREIGN KEY( teams_id ) 
+ALTER TABLE ln_canvassers_teams ADD CONSTRAINT ri_ln_canvassers_teams_teams_team_id 
+	FOREIGN KEY( team_id ) 
 	REFERENCES teams(id) 
 	ON DELETE NO ACTION ;
 
diff --git a/resources/templates/auto/application-index.html b/resources/templates/auto/application-index.html
index 517fd53..7305958 100644
--- a/resources/templates/auto/application-index.html
+++ b/resources/templates/auto/application-index.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File application-index.html generated 2018-06-29T14:15:38.716Z by adl.to-selmer-templates.
+<!-- File application-index.html generated 2018-06-29T16:36:20.140Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-addresses-Address.html b/resources/templates/auto/form-addresses-Address.html
index e3dc979..083db4f 100644
--- a/resources/templates/auto/form-addresses-Address.html
+++ b/resources/templates/auto/form-addresses-Address.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-addresses-Address.html generated 2018-06-29T14:15:38.705Z by adl.to-selmer-templates.
+<!-- File form-addresses-Address.html generated 2018-06-29T16:36:20.128Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-authorities-Authority.html b/resources/templates/auto/form-authorities-Authority.html
index 8e6a888..19283c2 100644
--- a/resources/templates/auto/form-authorities-Authority.html
+++ b/resources/templates/auto/form-authorities-Authority.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-authorities-Authority.html generated 2018-06-29T14:15:38.724Z by adl.to-selmer-templates.
+<!-- File form-authorities-Authority.html generated 2018-06-29T16:36:20.148Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-canvassers-Canvasser.html b/resources/templates/auto/form-canvassers-Canvasser.html
index e1e7e41..ef82c02 100644
--- a/resources/templates/auto/form-canvassers-Canvasser.html
+++ b/resources/templates/auto/form-canvassers-Canvasser.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-canvassers-Canvasser.html generated 2018-06-29T14:15:38.727Z by adl.to-selmer-templates.
+<!-- File form-canvassers-Canvasser.html generated 2018-06-29T16:36:20.151Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-districts-District.html b/resources/templates/auto/form-districts-District.html
index 3e73b5f..eb692a7 100644
--- a/resources/templates/auto/form-districts-District.html
+++ b/resources/templates/auto/form-districts-District.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-districts-District.html generated 2018-06-29T14:15:38.696Z by adl.to-selmer-templates.
+<!-- File form-districts-District.html generated 2018-06-29T16:36:20.120Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-dwellings-Dwelling.html b/resources/templates/auto/form-dwellings-Dwelling.html
index 48cb518..850d68c 100644
--- a/resources/templates/auto/form-dwellings-Dwelling.html
+++ b/resources/templates/auto/form-dwellings-Dwelling.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-dwellings-Dwelling.html generated 2018-06-29T14:15:38.738Z by adl.to-selmer-templates.
+<!-- File form-dwellings-Dwelling.html generated 2018-06-29T16:36:20.162Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-electors-Elector.html b/resources/templates/auto/form-electors-Elector.html
index 6cc58a4..1b6251a 100644
--- a/resources/templates/auto/form-electors-Elector.html
+++ b/resources/templates/auto/form-electors-Elector.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-electors-Elector.html generated 2018-06-29T14:15:38.721Z by adl.to-selmer-templates.
+<!-- File form-electors-Elector.html generated 2018-06-29T16:36:20.144Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-followupactions-Followupaction.html b/resources/templates/auto/form-followupactions-Followupaction.html
index 3af54ce..ef4bd47 100644
--- a/resources/templates/auto/form-followupactions-Followupaction.html
+++ b/resources/templates/auto/form-followupactions-Followupaction.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-followupactions-Followupaction.html generated 2018-06-29T14:15:38.740Z by adl.to-selmer-templates.
+<!-- File form-followupactions-Followupaction.html generated 2018-06-29T16:36:20.165Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-followupmethods-Followupmethod.html b/resources/templates/auto/form-followupmethods-Followupmethod.html
index 0d50659..5a5171c 100644
--- a/resources/templates/auto/form-followupmethods-Followupmethod.html
+++ b/resources/templates/auto/form-followupmethods-Followupmethod.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-followupmethods-Followupmethod.html generated 2018-06-29T14:15:38.742Z by adl.to-selmer-templates.
+<!-- File form-followupmethods-Followupmethod.html generated 2018-06-29T16:36:20.167Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-followuprequests-Followuprequest.html b/resources/templates/auto/form-followuprequests-Followuprequest.html
index 2d5d382..ee12d56 100644
--- a/resources/templates/auto/form-followuprequests-Followuprequest.html
+++ b/resources/templates/auto/form-followuprequests-Followuprequest.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-followuprequests-Followuprequest.html generated 2018-06-29T14:15:38.700Z by adl.to-selmer-templates.
+<!-- File form-followuprequests-Followuprequest.html generated 2018-06-29T16:36:20.123Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-genders-Gender.html b/resources/templates/auto/form-genders-Gender.html
index 87806cb..238a638 100644
--- a/resources/templates/auto/form-genders-Gender.html
+++ b/resources/templates/auto/form-genders-Gender.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-genders-Gender.html generated 2018-06-29T14:15:38.691Z by adl.to-selmer-templates.
+<!-- File form-genders-Gender.html generated 2018-06-29T16:36:20.114Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-intentions-Intention.html b/resources/templates/auto/form-intentions-Intention.html
index 8d41da9..be4870d 100644
--- a/resources/templates/auto/form-intentions-Intention.html
+++ b/resources/templates/auto/form-intentions-Intention.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-intentions-Intention.html generated 2018-06-29T14:15:38.734Z by adl.to-selmer-templates.
+<!-- File form-intentions-Intention.html generated 2018-06-29T16:36:20.158Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-issues-Issue.html b/resources/templates/auto/form-issues-Issue.html
index d5fab5b..085cccc 100644
--- a/resources/templates/auto/form-issues-Issue.html
+++ b/resources/templates/auto/form-issues-Issue.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-issues-Issue.html generated 2018-06-29T14:15:38.709Z by adl.to-selmer-templates.
+<!-- File form-issues-Issue.html generated 2018-06-29T16:36:20.133Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-options-Option.html b/resources/templates/auto/form-options-Option.html
index c53b1cf..d52fcda 100644
--- a/resources/templates/auto/form-options-Option.html
+++ b/resources/templates/auto/form-options-Option.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-options-Option.html generated 2018-06-29T14:15:38.733Z by adl.to-selmer-templates.
+<!-- File form-options-Option.html generated 2018-06-29T16:36:20.157Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-roles-Role.html b/resources/templates/auto/form-roles-Role.html
index 8fd42c4..991549a 100644
--- a/resources/templates/auto/form-roles-Role.html
+++ b/resources/templates/auto/form-roles-Role.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-roles-Role.html generated 2018-06-29T14:15:38.710Z by adl.to-selmer-templates.
+<!-- File form-roles-Role.html generated 2018-06-29T16:36:20.134Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-teams-Team.html b/resources/templates/auto/form-teams-Team.html
index 3eb05d0..ef80fdf 100644
--- a/resources/templates/auto/form-teams-Team.html
+++ b/resources/templates/auto/form-teams-Team.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-teams-Team.html generated 2018-06-29T14:15:38.717Z by adl.to-selmer-templates.
+<!-- File form-teams-Team.html generated 2018-06-29T16:36:20.141Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-visits-Visit.html b/resources/templates/auto/form-visits-Visit.html
index 65e51ea..1a504dd 100644
--- a/resources/templates/auto/form-visits-Visit.html
+++ b/resources/templates/auto/form-visits-Visit.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-visits-Visit.html generated 2018-06-29T14:15:38.714Z by adl.to-selmer-templates.
+<!-- File form-visits-Visit.html generated 2018-06-29T16:36:20.138Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-addresses-Addresses.html b/resources/templates/auto/list-addresses-Addresses.html
index 96da5ee..8fed2b1 100644
--- a/resources/templates/auto/list-addresses-Addresses.html
+++ b/resources/templates/auto/list-addresses-Addresses.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-addresses-Addresses.html generated 2018-06-29T14:15:38.726Z by adl.to-selmer-templates.
+<!-- File list-addresses-Addresses.html generated 2018-06-29T16:36:20.150Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-authorities-Authorities.html b/resources/templates/auto/list-authorities-Authorities.html
index 35d09f1..98e5db9 100644
--- a/resources/templates/auto/list-authorities-Authorities.html
+++ b/resources/templates/auto/list-authorities-Authorities.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-authorities-Authorities.html generated 2018-06-29T14:15:38.699Z by adl.to-selmer-templates.
+<!-- File list-authorities-Authorities.html generated 2018-06-29T16:36:20.122Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-canvassers-Canvassers.html b/resources/templates/auto/list-canvassers-Canvassers.html
index c37423a..06f07a2 100644
--- a/resources/templates/auto/list-canvassers-Canvassers.html
+++ b/resources/templates/auto/list-canvassers-Canvassers.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-canvassers-Canvassers.html generated 2018-06-29T14:15:38.737Z by adl.to-selmer-templates.
+<!-- File list-canvassers-Canvassers.html generated 2018-06-29T16:36:20.161Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-districts-Districts.html b/resources/templates/auto/list-districts-Districts.html
index 1ae5e72..10aa521 100644
--- a/resources/templates/auto/list-districts-Districts.html
+++ b/resources/templates/auto/list-districts-Districts.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-districts-Districts.html generated 2018-06-29T14:15:38.731Z by adl.to-selmer-templates.
+<!-- File list-districts-Districts.html generated 2018-06-29T16:36:20.155Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-dwellings-Dwellings.html b/resources/templates/auto/list-dwellings-Dwellings.html
index 22a42e9..ff846fd 100644
--- a/resources/templates/auto/list-dwellings-Dwellings.html
+++ b/resources/templates/auto/list-dwellings-Dwellings.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-dwellings-Dwellings.html generated 2018-06-29T14:15:38.723Z by adl.to-selmer-templates.
+<!-- File list-dwellings-Dwellings.html generated 2018-06-29T16:36:20.147Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-electors-Electors.html b/resources/templates/auto/list-electors-Electors.html
index 103b700..e55df8e 100644
--- a/resources/templates/auto/list-electors-Electors.html
+++ b/resources/templates/auto/list-electors-Electors.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-electors-Electors.html generated 2018-06-29T14:15:38.708Z by adl.to-selmer-templates.
+<!-- File list-electors-Electors.html generated 2018-06-29T16:36:20.132Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-followupactions-Followupactions.html b/resources/templates/auto/list-followupactions-Followupactions.html
index a4c3dca..25138cd 100644
--- a/resources/templates/auto/list-followupactions-Followupactions.html
+++ b/resources/templates/auto/list-followupactions-Followupactions.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-followupactions-Followupactions.html generated 2018-06-29T14:15:38.736Z by adl.to-selmer-templates.
+<!-- File list-followupactions-Followupactions.html generated 2018-06-29T16:36:20.160Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-followupmethods-Followupmethods.html b/resources/templates/auto/list-followupmethods-Followupmethods.html
index 457d6f5..51cab99 100644
--- a/resources/templates/auto/list-followupmethods-Followupmethods.html
+++ b/resources/templates/auto/list-followupmethods-Followupmethods.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-followupmethods-Followupmethods.html generated 2018-06-29T14:15:38.713Z by adl.to-selmer-templates.
+<!-- File list-followupmethods-Followupmethods.html generated 2018-06-29T16:36:20.137Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-followuprequests-Followuprequests.html b/resources/templates/auto/list-followuprequests-Followuprequests.html
index c81c924..4df3180 100644
--- a/resources/templates/auto/list-followuprequests-Followuprequests.html
+++ b/resources/templates/auto/list-followuprequests-Followuprequests.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-followuprequests-Followuprequests.html generated 2018-06-29T14:15:38.694Z by adl.to-selmer-templates.
+<!-- File list-followuprequests-Followuprequests.html generated 2018-06-29T16:36:20.117Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-genders-Genders.html b/resources/templates/auto/list-genders-Genders.html
index 64da2fe..e579f6a 100644
--- a/resources/templates/auto/list-genders-Genders.html
+++ b/resources/templates/auto/list-genders-Genders.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-genders-Genders.html generated 2018-06-29T14:15:38.687Z by adl.to-selmer-templates.
+<!-- File list-genders-Genders.html generated 2018-06-29T16:36:20.110Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-intentions-Intentions.html b/resources/templates/auto/list-intentions-Intentions.html
index 8fc6118..3e11a92 100644
--- a/resources/templates/auto/list-intentions-Intentions.html
+++ b/resources/templates/auto/list-intentions-Intentions.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-intentions-Intentions.html generated 2018-06-29T14:15:38.739Z by adl.to-selmer-templates.
+<!-- File list-intentions-Intentions.html generated 2018-06-29T16:36:20.164Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-issues-Issues.html b/resources/templates/auto/list-issues-Issues.html
index 1c08c80..50875c0 100644
--- a/resources/templates/auto/list-issues-Issues.html
+++ b/resources/templates/auto/list-issues-Issues.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-issues-Issues.html generated 2018-06-29T14:15:38.732Z by adl.to-selmer-templates.
+<!-- File list-issues-Issues.html generated 2018-06-29T16:36:20.156Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-options-Options.html b/resources/templates/auto/list-options-Options.html
index fd49da7..b7bce93 100644
--- a/resources/templates/auto/list-options-Options.html
+++ b/resources/templates/auto/list-options-Options.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-options-Options.html generated 2018-06-29T14:15:38.696Z by adl.to-selmer-templates.
+<!-- File list-options-Options.html generated 2018-06-29T16:36:20.119Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-roles-Roles.html b/resources/templates/auto/list-roles-Roles.html
index af780fe..09fe18d 100644
--- a/resources/templates/auto/list-roles-Roles.html
+++ b/resources/templates/auto/list-roles-Roles.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-roles-Roles.html generated 2018-06-29T14:15:38.712Z by adl.to-selmer-templates.
+<!-- File list-roles-Roles.html generated 2018-06-29T16:36:20.136Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-teams-Teams.html b/resources/templates/auto/list-teams-Teams.html
index 089ef34..582741b 100644
--- a/resources/templates/auto/list-teams-Teams.html
+++ b/resources/templates/auto/list-teams-Teams.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-teams-Teams.html generated 2018-06-29T14:15:38.690Z by adl.to-selmer-templates.
+<!-- File list-teams-Teams.html generated 2018-06-29T16:36:20.113Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-visits-Visits.html b/resources/templates/auto/list-visits-Visits.html
index 93fe01b..ed998ee 100644
--- a/resources/templates/auto/list-visits-Visits.html
+++ b/resources/templates/auto/list-visits-Visits.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-visits-Visits.html generated 2018-06-29T14:15:38.689Z by adl.to-selmer-templates.
+<!-- File list-visits-Visits.html generated 2018-06-29T16:36:20.111Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/base-authenticated.html b/resources/templates/base-authenticated.html
index 4fd1834..cc067b0 100644
--- a/resources/templates/base-authenticated.html
+++ b/resources/templates/base-authenticated.html
@@ -23,7 +23,7 @@
             {% else %}<a href="login">Login</a>{% endif %}</li>
           <li class=""><a href="about">About</a></li>
           {% if user %}
-          <li id="user"><a href="profile">Logged in as {{user.username}}</a></li>
+          <li id="user"><a href="profile">Logged in as {{user.fullname}}</a></li>
           {% endif %}
         </menu>
       </div>
@@ -34,6 +34,9 @@
     </header>
     {% endblock %}
     <div id="main-container" class="container">
+      <div id="back-link-container">
+        <a href="javascript:history.back()" id="back-link">Back</a>
+      </div>
       <div id="big-links">
         {% block big-links %}
         {% endblock %}
@@ -42,9 +45,6 @@
         {% block content %}
         {% endblock %}
       </div>
-      <div id="back-link-container">
-        <a href="javascript:history.back()" id="back-link">Back</a>
-      </div>
     </div>
     {% block foot %}
     <footer>
diff --git a/resources/templates/roles.html b/resources/templates/roles.html
index 6b49d2e..821cb31 100644
--- a/resources/templates/roles.html
+++ b/resources/templates/roles.html
@@ -3,9 +3,6 @@
   {{ user }}
 {% endblock %}
 {% block big-links %}
-      <div class="big-link-container">
-        <a href="app" class="big-link" id="big-link">Canvasser</a>
-      </div>
       {% for role in roles %}
       <div class="big-link-container">
         <a href="{{role.name|lower}}" class="big-link" id="big-link">{{role.name}}</a>
diff --git a/src/clj/youyesyet/oauth.clj b/src/clj/youyesyet/oauth.clj
index 5cb1e25..e96c29b 100644
--- a/src/clj/youyesyet/oauth.clj
+++ b/src/clj/youyesyet/oauth.clj
@@ -49,12 +49,11 @@
             :hmac-sha1)))
       (db/list-authorities db/*db* {}))))
 
-
 (def authority!
-  ;; Closure to allow authorities to be created once when the function is first
+  ;; Closure to allow authorities map to be created once when the function is first
   ;; called. The argument `id` should be a string, the id of some authority
-  ;; known to the database. As side-effect, the key `:authority` is bound in the
-  ;; session to the selected authority.
+  ;; known to the database. As side-effect, the authorities map is bound in the
+  ;; closure.
   (let [authorities (atom nil)]
     (fn [id]
       (if
@@ -69,8 +68,7 @@
         (if authority
           (do
             (log/debug (str "Selected authority " id))
-            (session/put! :authority authority)))
-        authority))))
+        authority))))))
 
 (defn oauth-callback-uri
   "Generates the oauth request callback URI."
@@ -79,23 +77,18 @@
 
 (defn fetch-request-token
   "Fetches a request token from the authority implied by this `request`."
-  [request]
-  (let [callback-uri (oauth-callback-uri request)
-        auth-id (:authority (:params request))
-        auth (authority! auth-id)]
-    (log/info "Attempting to authorise with authority " auth-id)
-    (if
-      auth
-      (do
-        (log/info "Fetching request token using callback-uri" callback-uri)
-        (oauth/request-token auth (oauth-callback-uri request)))
-      (throw (Exception. (str "No such authority: " auth-id))))))
+  ([request auth]
+  (let [callback-uri (oauth-callback-uri request)]
+    (log/info "Fetching request token using callback-uri" callback-uri)
+    (oauth/request-token auth (oauth-callback-uri request))))
+  ([request]
+   (fetch-request-token request (:authority (:session request)))))
 
 (defn fetch-access-token
-  [request_token]
-  (oauth/access-token (session/get :authority) request_token (:oauth_verifier request_token)))
+  [request_token authority]
+  (oauth/access-token authority request_token (:oauth_verifier request_token)))
 
 (defn auth-redirect-uri
   "Gets the URI the user should be redirected to when authenticating."
-  [request-token]
-  (str (oauth/user-approval-uri (session/get :authority) request-token)))
+  [request-token authority]
+  (str (oauth/user-approval-uri authority request-token)))
diff --git a/src/clj/youyesyet/routes/auto.clj b/src/clj/youyesyet/routes/auto.clj
index d74f792..0042db5 100644
--- a/src/clj/youyesyet/routes/auto.clj
+++ b/src/clj/youyesyet/routes/auto.clj
@@ -523,7 +523,7 @@
 (defroutes
  auto-selmer-routes
  (GET
-  "/index"
+  "/admin"
   request
   (route/restricted (apply (resolve-handler "index") (list request))))
  (GET
diff --git a/src/clj/youyesyet/routes/auto_json.clj b/src/clj/youyesyet/routes/auto_json.clj
index 650d41d..8fe7fd9 100644
--- a/src/clj/youyesyet/routes/auto_json.clj
+++ b/src/clj/youyesyet/routes/auto_json.clj
@@ -1,6 +1,6 @@
 (ns
  youyesyet.routes.auto-json
- "JSON routes for youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180629T141537.425Z"
+ "JSON routes for youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180629T163618.749Z"
  (:require
   [adl-support.core :as support]
   [clojure.java.io :as io]
diff --git a/src/clj/youyesyet/routes/home.clj b/src/clj/youyesyet/routes/home.clj
index e2e9bf2..e97e259 100644
--- a/src/clj/youyesyet/routes/home.clj
+++ b/src/clj/youyesyet/routes/home.clj
@@ -1,7 +1,8 @@
 (ns ^{:doc "Routes/pages available to unauthenticated users."
       :author "Simon Brooke"} youyesyet.routes.home
-  (:require [clojure.walk :refer [keywordize-keys]]
-            [clojure.java.io :refer [input-stream]]
+  (:require [clojure.java.io :as io]
+            [clojure.tools.logging :as log]
+            [clojure.walk :refer [keywordize-keys]]
             [noir.response :as nresponse]
             [noir.util.route :as route]
             [ring.util.http-response :refer [content-type ok]]
@@ -10,7 +11,7 @@
             [youyesyet.oauth :as oauth]
             [compojure.core :refer [defroutes GET POST]]
             [ring.util.http-response :as response]
-            [clojure.java.io :as io]))
+            ))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;
@@ -86,27 +87,41 @@
         redirect-to (or (:redirect-to params) "roles")]
     (cond
       (:authority params)
-      (oauth/fetch-request-token request)
+      (let [auth (oauth/authority! (:authority params))]
+        (if auth
+          (do
+            (log/info "Attempting to authorise with authority " (:authority params))
+            (oauth/fetch-request-token
+              (assoc request :session (assoc session :authority auth))
+              auth))
+          (throw (Exception. (str "No such authority: " (:authority params))))))
       ;; this is obviously, ABSURDLY, insecure. I don't want to put just-about-good-enough,
       ;; it-will-do-for-now security in place; instead, I want this to be test code only
       ;; until we have o-auth properly working.
       (and user (= username password))
       (assoc (response/found redirect-to) :session (assoc session :user username))
       user
-      (layout/render "login.html" {:title (str "User " username " is unknown") :redirect-to redirect-to})
+      (layout/render
+        "login.html"
+        {:title (str "User " username " is unknown") :redirect-to redirect-to})
       true
-      (layout/render "login.html" {:title "Please log in" :redirect-to redirect-to :authorities (db-core/list-authorities db-core/*db*)}))))
+      (layout/render
+        "login.html"
+        {:title "Please log in"
+         :redirect-to redirect-to
+         :authorities (db-core/list-authorities db-core/*db*)}))))
 
 
 (defroutes home-routes
   (GET "/" [] (home-page))
-  (GET "/js/:file" [file]
-       (-> (input-stream (str "resources/public/js/" file))
-           ok
-           (content-type "text/javascript;charset=UTF-8")))
+;;   (GET "/js/:file" [file]
+;;        (-> (io/input-stream (str "resources/public/js/" file))
+;;            ok
+;;            (content-type "text/javascript;charset=UTF-8")))
   (GET "/home" [] (home-page))
   (GET "/about" [] (about-page))
   (GET "/roles" request (route/restricted (roles-page request)))
+  (GET "/canvassers" [] (route/restricted (app-page)))
   (GET "/app" [] (route/restricted (app-page)))
   (GET "/call-me" [] (call-me-page nil))
   (POST "/call-me" request (call-me-page request))
diff --git a/src/clj/youyesyet/routes/oauth.clj b/src/clj/youyesyet/routes/oauth.clj
index 0aa7f91..86c4b62 100644
--- a/src/clj/youyesyet/routes/oauth.clj
+++ b/src/clj/youyesyet/routes/oauth.clj
@@ -1,18 +1,22 @@
 (ns ^{:doc "OAuth authentication routes - not finished, does not work yet."
       :author "Simon Brooke"} youyesyet.routes.oauth
-  (:require [compojure.core :refer [defroutes GET]]
+  (:require [clojure.tools.logging :as log]
+            [compojure.core :refer [defroutes GET]]
             [ring.util.http-response :refer [ok found]]
             [clojure.java.io :as io]
-            [youyesyet.oauth :as oauth]
-            [clojure.tools.logging :as log]))
+            [youyesyet.oauth :as oauth]))
 
 (defn oauth-init
   "Initiates the OAuth with the authority implied by this `request`"
   [request]
-  (-> (oauth/fetch-request-token request)
-      :oauth_token
-      oauth/auth-redirect-uri
-      found))
+;;   (-> (oauth/fetch-request-token request)
+;;       :oauth_token
+;;       oauth/auth-redirect-uri
+;;       found))
+  (found
+    (oauth/auth-redirect-uri
+      (:oauth_token (oauth/fetch-request-token request))
+      (:authority (:session request)))))
 
 (defn oauth-callback
   "Handles the callback from the authority."
@@ -22,7 +26,8 @@
     (-> (found "/login")
         (assoc :flash {:denied true}))
     ; fetch the request token and do anything else you wanna do if not denied.
-    (let [{:keys [user_id screen_name]} (oauth/fetch-access-token request_token)]
+    (let [{:keys [user_id screen_name]}
+          (oauth/fetch-access-token request_token (:authority session))]
       (log/info "successfully authenticated as" user_id screen_name)
       (-> (found "/")
           (assoc :session