From d7d17de5d89af7e57a7147d78376dcb65df569c3 Mon Sep 17 00:00:00 2001
From: Bram van der Veen <96aa48@gmail.com>
Date: Wed, 22 Jul 2015 16:28:41 +0200
Subject: [PATCH] Changed the name of "multiple_found.jade" to "list.jade" and
 Added linkbar to most other pages Made sure that auth.is is called when
 lookup.get calls that multiple matches are found.

---
 lookup.js                          |  4 +++-
 resources/jade/list.jade           |  9 +++++++--
 resources/jade/login.jade          |  2 ++
 resources/jade/multiple_found.jade | 10 ----------
 resources/jade/search.jade         |  2 +-
 web.js                             |  2 +-
 6 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 resources/jade/multiple_found.jade

diff --git a/lookup.js b/lookup.js
index 5ccd1cf..acb27e7 100644
--- a/lookup.js
+++ b/lookup.js
@@ -25,7 +25,9 @@ function get(req, res, next, search) {
     }
     else {
       req.match = database_entry;
-      res.render('multiple_found', req);
+      require('./auth').is(req, res, function () {
+        res.render('list', req);
+      });
     }
   });
 }
diff --git a/resources/jade/list.jade b/resources/jade/list.jade
index dd90d38..f75edff 100644
--- a/resources/jade/list.jade
+++ b/resources/jade/list.jade
@@ -1,6 +1,11 @@
 //- list.jade
 include header
+include search
 
-div=JSON.stringify(match, null, 2)
-
+.container
+  ul.found
+    for entry in match
+      li
+        a(href='/rooster/' + entry.name)=entry.name
+  
 include linkbar
diff --git a/resources/jade/login.jade b/resources/jade/login.jade
index a926cf6..9a351ea 100644
--- a/resources/jade/login.jade
+++ b/resources/jade/login.jade
@@ -11,3 +11,5 @@ include header
       input(type="password", name="password")
     div
       input(type="submit", value="Log In").button-primary
+
+include linkbar
diff --git a/resources/jade/multiple_found.jade b/resources/jade/multiple_found.jade
deleted file mode 100644
index e15f8fe..0000000
--- a/resources/jade/multiple_found.jade
+++ /dev/null
@@ -1,10 +0,0 @@
-//- multiple_found.jade
-include header
-include search
-
-.container
-  ul.found
-    for entry in match
-      li
-        a(href='/rooster/' + entry.name)=entry.name
-  
diff --git a/resources/jade/search.jade b/resources/jade/search.jade
index 2d31f32..b9a79f0 100644
--- a/resources/jade/search.jade
+++ b/resources/jade/search.jade
@@ -1,3 +1,3 @@
 //- search.jade
-input.search(type="text", name="searchterm", placeholder="Je naam, id, klassennaam, docentencode, lokaalcode", value=path.split('/')[1] == 'klassenlijst' ? 'Leerlingen van ' + match[0].group : match ? ((match.first_name || match.name) + '\'s rooster') : '')
+input.search(type="text", name="searchterm", placeholder="Je naam, id, klassennaam, docentencode, lokaalcode", value=path.split('/')[1] == 'klassenlijst' ? 'Leerlingen van ' + match[0].group : match ? ((match.first_name || match.name || 'Meerdere mensen hun rooster') + '\'s rooster') : '')
 button.search Zoeken
diff --git a/web.js b/web.js
index fffdbdb..b28e018 100644
--- a/web.js
+++ b/web.js
@@ -49,7 +49,7 @@ app.get('/rooster/:search', [auth.is, schedule.get, function (req, res) {
 app.param('list', lookup.list);
 
 app.get('/klassenlijst/:list',[auth.is, function (req, res) {
-  res.render('multiple_found', req);
+  res.render('list', req);
 }]);
 
 app.listen(config().web_port);