From 5bf8010bbbb849fab1cd1346fbdfd26d68382961 Mon Sep 17 00:00:00 2001
From: FrozenCow <frozencow@gmail.com>
Date: Fri, 29 Jul 2011 17:14:58 +0200
Subject: [PATCH] Fixed styling and owner/member texts of regions.

---
 web/css/regions.css |  4 ----
 web/js/regions.js   | 16 ++++++++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/web/css/regions.css b/web/css/regions.css
index 8a3cb79b..efc6fcb1 100644
--- a/web/css/regions.css
+++ b/web/css/regions.css
@@ -11,10 +11,6 @@
 	font-weight: bold;
 }
 
-.regioninfo .owners {
-	margin-left: 20px;
-}
-
 .regioninfo .regionflags .regionflag {
 	display: block;
 	font-size: 90%;
diff --git a/web/js/regions.js b/web/js/regions.js
index f0f51486..c9351087 100644
--- a/web/js/regions.js
+++ b/web/js/regions.js
@@ -69,16 +69,24 @@ componentconstructors['regions'] = function(dynmap, configuration) {
 	}
 	
 	function createPopupContent(name, region) {
+		function join(a) {
+			if (a instanceof Array) {
+				return a.join(', ');
+			} else if (typeof a === 'string') {
+				return a;
+			}
+			return null;
+		}
 		var members = region.members || {};
 		return $('<div/>').addClass('regioninfo')
 			.append($('<span/>').addClass('regionname').text(name))
 			.append($('<span/>').addClass('owners')
-				.append(region.owners.players && $('<span/>').addClass('playerowners').text(region.owners.players.concat()))
-				.append(region.owners.groups && $('<span/>').addClass('groupowners').text(region.owners.groups.concat()))
+				.append(region.owners.players && $('<span/>').addClass('playerowners').text(join(region.owners.players)))
+				.append(region.owners.groups && $('<span/>').addClass('groupowners').text(join(region.owners.groups)))
 				)
 			.append($('<span/>').addClass('members')
-				.append(members.players && $('<span/>').addClass('playermembers').text(members.players.concat()))
-				.append(members.groups && $('<span/>').addClass('groupmembers').text(members.groups.concat()))
+				.append(members.players && $('<span/>').addClass('playermembers').text(join(members.players)))
+				.append(members.groups && $('<span/>').addClass('groupmembers').text(join(members.groups)))
 				)
 			.append(region.parent && $('<span/>').addClass('regionparent').text(region.parent))
 			.append(region.flags && function() {