Merge branch 'feature/reflow-app' into develop

resources/public/css/yyy-common.css

@@ -362,7 +362,6 @@ th {
 
   /* content of the current page in the Wiki - editable, provided by users. Within main-container */
   #content {
-    border: thin solid silver;
     width: 80%;
     float: right;
     padding-bottom: 5em;
@@ -396,7 +395,6 @@ th {
 
   /* content of the current in the Wiki - editable, provided by users. Within main-container */
   #content {
-    border: thin solid silver;
     width: 100%;
     padding-bottom: 2em;
   }

resources/sql/queries.sql

@@ -43,7 +43,7 @@ SELECT DISTINCT request.*,
 	addresses.address ||', '|| addresses.postcode ||', '|| visits.date AS visit_id_expanded,
   request.issue_id as issue_id_expanded,
 	request.method_id AS method_id_expanded,
-  visits.date
+  visits.date AS raised
 FROM followuprequests as request,
   ln_experts_issues_canvassers as expertise,
   canvassers as experts,
@@ -58,7 +58,7 @@ and request.visit_id = visits.id
 and visits.address_id = addresses.id
 and request.issue_id = expertise.issue_id
 and expertise.canvasser_id = :expert
-ORDER BY visits.date desc
+ORDER BY raised
 
 --:name get-last-visit-by-canvasser :? :1
 --:doc returns the most recent visit record of the canvasser with the specified `:id`

resources/templates/base.html

@@ -5,6 +5,7 @@
     <!-- head: if you want entire custom head content, override this block. -->
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
+    <meta name="referrer" content="same-origin">
     {% style "/css/yyy-common.css" %}
     {% style "/css/yyy-site.css" %}
     {% style "/css/spinner.css" %}
@@ -27,9 +28,13 @@
         <menu id="nav-menu" class="nav">
           <li class=""><a href="{{servlet-context}}/home">Home</a></li>
           <li class=""><a href="{{servlet-context}}/library">Library</a></li>
+          {% if user %}
+          <li class=""><a href="{{servlet-context}}/roles">Roles</a></li>
+          <li class=""><a href="{{servlet-context}}/logout">Logout</a></li>
+            {% else %}
           <li class=""><a href="{{servlet-context}}/register">Register</a></li>
-          <li class="">{% if user %}<a href="{{servlet-context}}/logout">Logout</a>
-            {% else %}<a href="{{servlet-context}}/login">Login</a>{% endif %}</li>
+          <li class=""><a href="{{servlet-context}}/login">Login</a></li>
+          {% endif %}
           <li class=""><a href="{{servlet-context}}/about">About</a></li>
           {% if user %}
           <li id="user"><a href="{{servlet-context}}/profile">Logged in as {{user.username}}</a></li>

resources/templates/issue-expert/list.html

@@ -36,19 +36,16 @@ Add a new Followuprequest
 <thead>
 <tr>
 <th>
-Id
+Elector
 </th>
 <th>
-Elector_id
+Raised
 </th>
 <th>
-Visit_id
+Issue
 </th>
 <th>
-Issue_id
-</th>
-<th>
-Method_id
+Method
 </th>
 <th>
 &nbsp;
@@ -56,13 +53,10 @@ Method_id
 </tr>
 <tr>
 <th>
-<input id='id' type='text' name='id' value='{{ params.id }}'/>
-</th>
-<th>
 <input id='elector_id' type='text' name='elector_id' value='{{ params.elector_id }}'/>
 </th>
 <th>
-<input id='visit_id' type='text' name='visit_id' value='{{ params.visit_id }}'/>
+<input id='raised' type='text' name='raised' value='{{ params.raised }}'/>
 </th>
 <th>
 <input id='issue_id' type='text' name='issue_id' value='{{ params.issue_id }}'/>
@@ -79,17 +73,12 @@ Method_id
 {% for record in records %}
 <tr>
 <td>
-{{ record.id }}
-</td>
-<td>
 <a href='{{servlet-context}}/form-electors-Elector?id={{ record.elector_id }}'>
 {{ record.elector_id_expanded }}
 </a>
 </td>
 <td>
-<a href='{{servlet-context}}/form-visits-Visit?id={{ record.visit_id }}'>
-{{ record.visit_id_expanded }}
-</a>
+{{ record.raised }}
 </td>
 <td>
 <a href='{{servlet-context}}/form-issues-Issue?id={{ record.issue_id }}'>