Merge branch 'master' of https://github.com/designcreateplay/NodeBB

public/templates/admin/groups.tpl

@@ -90,8 +90,7 @@
 					</form>
 				</div>
 				<div class="modal-footer">
-					<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+					<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-					<button type="button" class="btn btn-primary" id="group-details-save">Save</button>
 				</div>
 			</div>
 		</div>

public/templates/admin/users.tpl

@@ -14,7 +14,7 @@
 	<span id="user-notfound-notify" class="label label-danger hide">User not found!</span><br/>
 </div>
 
-<ul id="users-container" class="users">
+<ul id="users-container" class="users admin">
 	<!-- BEGIN users -->
 	<div class="users-box" data-uid="{users.uid}" data-admin="{users.administrator}" data-username="{users.username}" data-banned="{users.banned}">
 		<a href="/user/{users.userslug}">

public/themes/vanilla/users.less

@@ -22,4 +22,32 @@
 			margin:5px;
 		}
 	}
+
+	&.admin {		
+		#users-container {
+			padding: 0;
+		}
+
+		.users-box{
+			display: inline-block;
+			margin-top: 20px;
+			text-align: center;
+			vertical-align: top;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			height: auto;
+			max-width: 125px;
+
+			img {
+				width:80px;
+				height:80px;
+			}
+
+			a {
+				margin:5px;
+				padding: 6px 12px;
+			}
+		}
+	}
 }

src/redis.js

@@ -2,14 +2,13 @@
 	var redis = require('redis'),
 		utils = require('./../public/src/utils.js'),
 		winston = require('winston'),
-		nconf = require('nconf');
+		nconf = require('nconf'),
+		redis_socket_or_host = nconf.get('redis:host');
 
-	var redis_socket_or_host = nconf.get('redis:host')
+	if (redis_socket_or_host && redis_socket_or_host.indexOf('/')>=0) {
-	if(redis_socket_or_host.indexOf('/')>=0) {
 		/* If redis.host contains a path name character, use the unix dom sock connection. ie, /tmp/redis.sock */
 		RedisDB.exports = redis.createClient(nconf.get('redis:host'))
-	}
+	} else {
-	else {
 		/* Else, connect over tcp/ip */
 		RedisDB.exports = redis.createClient(nconf.get('redis:port'), nconf.get('redis:host'));
 	}