Merge branch 'master' into concurrent-editing

So, here's the deal:
 * The meat of [concurrent-editing]:Form.class got merged into [master]:DB.class
 * The string-generation stuff in [concurrent-editing]:Form.class didn't fit
   nicely anywhere anymore, so I got rid of it by makeing datatype explicit.
    * Users.class: declare datatypes explicitly in attrib()
    * index.html.php: use this new explicit data
 * style.scss: add a .small, which we can do because of the datatypes thing.

Conflicts:
	src/controllers/Users.class.php

1 files changed, 10 insertions, 2 deletions

diff --git a/src/views/pages/users/individual.html.php b/src/views/pages/users/individual.html.php
index 5722977..39360b7 100644
--- a/src/views/pages/users/individual.html.php
+++ b/src/views/pages/users/individual.html.php
@@ -1,6 +1,7 @@
 <?php global $VARS, $CONTACT_METHODS;
 $t = $VARS['template'];
-$user = $VARS['user'];
+$users = $VARS['users'];
+$username = $VARS['username'];
 
 function inputText($user, $key, $label, $hint='') {
 	global $VARS; $t = $VARS['template'];
@@ -56,8 +57,14 @@ function inputField($user, $arr) {
 
 ////////////////////////////////////////////////////////////////////////////////
 
+if (count($users)>1) {
+	$t->header("Users: $username");
+} else {
+	$t->header("User: $username");
+}
+
+foreach($users as $user) {
 $username = $user->getName();
-$t->header("Users: $username");
 
 $t->tag('h1', array(), ($user->canEdit()?'Edit':'View')." User <q>$username</q> (UID: ".$user->getUID().")");
 
@@ -136,4 +143,5 @@ if ($user->canEdit()) {
 	$t->tag('input', array('type'=>'submit', 'value'=>'Save'));
 }
 $t->closeTag('form');
+}
 $t->footer();