Merge branch 'develop' into feature/2

resources/templates/base.html

@@ -46,7 +46,7 @@
       <div class="error">
         {{ error }}
       </div>
-      {% endif %}
+      {% if error %}
     </header>
     {% endblock %}
     <div id="main-container" class="container">

src/clj/youyesyet/routes/roles.clj

@@ -22,7 +22,7 @@
      user (-> request :session :user)
      roles (if
              user
-             (db-core/list-roles-by-canvasser db-core/*db* {:id (:id user)}))]
+             (db-core/list-roles-by-canvasser db-core/*db* user))]
     (log/info (str "Roles routing page; user is " user "; roles are " roles))
     (cond
       roles (layout/render "roles.html"

youyesyet.adl.xml

@@ -782,6 +782,7 @@ version="0.1.1">
   </entity>
 
   <entity table="teams" name="teams" magnitude="4" volatility="4">
+    <documentation>Organised teams of canvassers who canvass together.</documentation>
     <key>
       <property type="integer" name="id" column="id"
       distinct="system" immutable="true">