From d5b88e9c358e0f56d3c4772d067071cc9466dafc Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Thu, 20 Aug 2015 14:20:13 -0400
Subject: [PATCH] fixed markup on /group page

---
 public/less/admin/admin.less         |   1 +
 public/less/admin/manage/groups.less |   5 ++
 src/views/admin/manage/group.tpl     | 129 ++++++++++++---------------
 3 files changed, 61 insertions(+), 74 deletions(-)
 create mode 100644 public/less/admin/manage/groups.less

diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less
index fb615b4cec..45879945db 100644
--- a/public/less/admin/admin.less
+++ b/public/less/admin/admin.less
@@ -10,6 +10,7 @@
 @import "./manage/categories";
 @import "./manage/tags";
 @import "./manage/flags";
+@import "./manage/groups";
 @import "./manage/users";
 @import "./appearance/customise";
 @import "./appearance/themes";
diff --git a/public/less/admin/manage/groups.less b/public/less/admin/manage/groups.less
new file mode 100644
index 0000000000..f6dac84921
--- /dev/null
+++ b/public/less/admin/manage/groups.less
@@ -0,0 +1,5 @@
+.group {
+	.current_members {
+		padding: 0;
+	}
+}
\ No newline at end of file
diff --git a/src/views/admin/manage/group.tpl b/src/views/admin/manage/group.tpl
index 318a913de2..e828d9da81 100644
--- a/src/views/admin/manage/group.tpl
+++ b/src/views/admin/manage/group.tpl
@@ -1,97 +1,78 @@
 <div class="row">
 	<form role="form" class="group" data-groupname="{group.displayName}">
 		<div class="col-md-9">
-			<div class="panel panel-default">
-				<div class="panel-heading"><i class="fa fa-folder"></i> Group Settings</div>
-				<div class="panel-body group-settings-form">
-
+			<div class="group-settings-form">
+				<fieldset>
+					<label for="change-group-name">Name</label>
+					<input type="text" class="form-control" id="change-group-name" placeholder="Group Name" value="{group.displayName}" <!-- IF group.system -->readonly<!-- ENDIF group.system -->/><br />
+				</fieldset>
 
 				<fieldset>
-					<div class="col-xs-12">
-						<label for="change-group-name">Name</label>
-						<input type="text" class="form-control" id="change-group-name" placeholder="Group Name" value="{group.displayName}" <!-- IF group.system -->readonly<!-- ENDIF group.system -->/>
+					<label for="change-group-desc">Description</label>
+					<input type="text" class="form-control" id="change-group-desc" placeholder="A short description about your group" value="{group.description}" /><br />
+				</fieldset>
+
+				<fieldset>
+					<label for="change-group-user-title">Title of Members</label>
+					<input type="text" class="form-control" id="change-group-user-title" placeholder="The title of users if they are a member of this group" value="{group.userTitle}"/><br />
+				</fieldset>
+
+				<fieldset>
+					<label for="change-group-icon">Group Icon</label><br/>
+					<i id="group-icon" class="fa fa-2x <!-- IF group.icon -->{group.icon}<!-- ELSE -->fa-shield<!-- ENDIF group.icon -->" value="{group.icon}"></i><br />
+				</fieldset>
+
+				<fieldset>
+					<label for="change-group-label-color">Group Label Color</label>
+					<span id="group-label-preview" class="label label-default" style="background:<!-- IF group.labelColor -->{group.labelColor}<!-- ELSE -->#000000<!-- ENDIF group.labelColor -->;">{group.userTitle}</span>
+					<input id="change-group-label-color" placeholder="#0059b2" data-name="bgColor" value="{group.labelColor}" class="form-control" /><br />
+				</fieldset>
+
+				<fieldset>
+					<div class="checkbox">
+						<label>
+							<input id="group-private" name="private" type="checkbox"<!-- IF group.private --> checked<!-- ENDIF group.private-->> <strong>[[groups:details.private]]</strong>
+							<p class="help-block">
+								[[groups:details.private_help]]
+							</p>
+						</label>
 					</div>
 				</fieldset>
 
 				<fieldset>
-					<div class="col-xs-12">
-						<label for="change-group-desc">Description</label>
-						<input type="text" class="form-control" id="change-group-desc" placeholder="A short description about your group" value="{group.description}" />
+					<div class="checkbox">
+						<label>
+							<input id="group-hidden" name="hidden" type="checkbox"<!-- IF group.hidden --> checked<!-- ENDIF group.hidden-->> <strong>[[groups:details.hidden]]</strong>
+							<p class="help-block">
+								[[groups:details.hidden_help]]
+							</p>
+						</label>
 					</div>
 				</fieldset>
 
 				<fieldset>
-					<div class="col-xs-12">
-						<label for="change-group-user-title">Title of Members</label>
-						<input type="text" class="form-control" id="change-group-user-title" placeholder="The title of users if they are a member of this group" value="{group.userTitle}"/>
-					</div>
+					<label for="add-member">Add User to Group</label>
+					<input type="text" class="form-control" id="group-details-search" placeholder="Search Users" />
+					<ul class="members user-list" id="group-details-search-results"></ul>
 				</fieldset>
 
 				<fieldset>
-					<div class="col-xs-12">
-						<label for="change-group-icon">Group Icon</label><br/>
-						<i id="group-icon" class="fa fa-2x <!-- IF group.icon -->{group.icon}<!-- ELSE -->fa-shield<!-- ENDIF group.icon -->" value="{group.icon}"></i>
-					</div>
-				</fieldset>
+					<label>Members</label>
+					<p>Click on a user to remove them from the group</p>
 
-				<fieldset>
-					<div class="col-xs-12">
-						<label for="change-group-label-color">Group Label Color</label>
-						<span id="group-label-preview" class="label label-default" style="background:<!-- IF group.labelColor -->{group.labelColor}<!-- ELSE -->#000000<!-- ENDIF group.labelColor -->;">{group.userTitle}</span>
-						<input id="change-group-label-color" placeholder="#0059b2" data-name="bgColor" value="{group.labelColor}" class="form-control" />
-					</div>
-				</fieldset>
-
-				<fieldset>
-					<div class="col-xs-12">
-						<div class="checkbox">
-							<label>
-								<input id="group-private" name="private" type="checkbox"<!-- IF group.private --> checked<!-- ENDIF group.private-->> <strong>[[groups:details.private]]</strong>
-								<p class="help-block">
-									[[groups:details.private_help]]
-								</p>
-							</label>
+					<div class="panel panel-default">
+						<div class="panel-body">
+							<ul class="members current_members user-list">
+								<!-- BEGIN group.members -->
+									<li data-uid="{group.members.uid}">
+										<img src="{group.members.picture}" />
+										<span>{group.members.username}</span>
+									</li>
+								<!-- END group.members -->
+							</ul>
 						</div>
 					</div>
 				</fieldset>
-
-				<fieldset>
-					<div class="col-xs-12">
-						<div class="checkbox">
-							<label>
-								<input id="group-hidden" name="hidden" type="checkbox"<!-- IF group.hidden --> checked<!-- ENDIF group.hidden-->> <strong>[[groups:details.hidden]]</strong>
-								<p class="help-block">
-									[[groups:details.hidden_help]]
-								</p>
-							</label>
-						</div>
-					</div>
-				</fieldset>
-
-				<fieldset>
-					<div class="col-xs-12">
-						<label for="add-member">Add User to Group</label>
-						<input type="text" class="form-control" id="group-details-search" placeholder="Search Users" />
-						<ul class="members user-list" id="group-details-search-results"></ul>
-					</div>
-				</fieldset>
-
-				<fieldset>
-					<div class="col-xs-12">
-						<label>Members</label>
-						<p>Click on a user to remove them from the group</p>
-						<ul class="members current_members user-list">
-							<!-- BEGIN group.members -->
-								<li data-uid="{group.members.uid}">
-									<img src="{group.members.picture}" />
-									<span>{group.members.username}</span>
-								</li>
-							<!-- END group.members -->
-						</ul>
-					</div>
-				</fieldset>
-
-
 			</div>
 		</div>