Merge pull request #19 from Phr33d0m/1.9

A completely rewritten Control Panel

5 files changed, 137 insertions, 116 deletions

diff --git a/modules/extra/webcpanel/templates/default/chanserv/access.html b/modules/extra/webcpanel/templates/default/chanserv/access.html
index 13c0ba82b..e9c42c61b 100644
--- a/modules/extra/webcpanel/templates/default/chanserv/access.html
+++ b/modules/extra/webcpanel/templates/default/chanserv/access.html
@@ -1,52 +1,69 @@
 {INCLUDE header.html}
 		{FOR M IN MESSAGES}
-			{M}<br/>
+		<div class="alert alert-info">
+			{M}<br>
+		</div>
 		{END FOR}
+
+		<h2>Access List</h2>
 		{IF EXISTS ACCESSES}
-			<b>Access List</b></br>
-			<table width="100%" height="100%">
-				<tr>
-					<th>Mask</th>
-					<th>Access</th>
-					<th>Creator</th>
-				</tr>
+			<table id="tableNSAccess" class="table table-hover">
+				<thead>
+					<tr>
+						<th>Mask</th>
+						<th>Access</th>
+						<th>Creator</th>
+						<th></th>
+					</tr>
+				</thead>
+				<tbody>
 				{FOR MASK,ACCESS,CREATOR,ACCESS_CHANGE IN MASKS,ACCESSES,CREATORS,ACCESS_CHANGES}
 					<tr>
-						<td>{MASK}</td>
+						<td style="font-weight: bold;">{MASK}</td>
 						<td>{ACCESS}</td>
 						<td>{CREATOR}</td>
 						{IF EQ ACCESS_CHANGE YES}
-							<td><a href="/chanserv/access?channel={ESCAPED_CHANNEL}&mask={MASK}&del=1">Delete</a></td>
+						<td><a href="/chanserv/access?channel={ESCAPED_CHANNEL}&mask={MASK}&del=1" class="btn btn-sm btn-danger">Delete</a></td>
 						{END IF}
 					</tr>
 				{END FOR}
+				</tbody>
 			</table>
 		{ELSE}
-			<b>Access list is empty.</b>
+			<em>Access list is empty.</em>
 		{END IF}
 
-		<br/><br/>
+		<hr>
 
-		<b>Add an access entry</b><br/>
-		<form method="post" action="/chanserv/access?channel={ESCAPED_CHANNEL}">
-			<table width="100%" height="100%">
-				<tr>
-					<th>Mask</th>
-					<th>Access</th>
-					<th>Provider</th>
-				</tr>
-				<tr>
-					<td><input type="text" name="mask"></td>
-					<td><input type="text" name="access"></td>
-					<td>
-						<select name="provider">
-							{FOR PROVIDER IN PROVIDERS}
-								<option value="{PROVIDER}">{PROVIDER}</option>
-							{END FOR}
-						</select>
-					</td>
-				</tr>
-			</table>
-			<input type="submit" value="Add">
+		<h4>Add an access entry</h4>
+		<form class="form-horizontal" method="post" action="/chanserv/access?channel={ESCAPED_CHANNEL}">
+			<div class="form-group">
+				<label class="control-label col-lg-2" for="mask">Mask:</label>
+				<div class="col-lg-6">
+					<input class="form-control" type="text" name="mask" id="mask" placeholder="Valid HostMask">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="control-label col-lg-2" for="access">Access:</label>
+				<div class="col-lg-6">
+					<input class="form-control" type="text" name="access" id="access" placeholder="Access level">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="control-label col-lg-2" for="reason">Provider:</label>
+				<div class="col-lg-6">
+					<select name="provider" class="form-control">
+						{FOR PROVIDER IN PROVIDERS}
+							<option value="{PROVIDER}">{PROVIDER}</option>
+						{END FOR}
+					</select>
+				</div>
+			</div>
+			<div class="form-group">
+				<div class="col-lg-offset-2 col-lg-6">
+					<button type="submit" class="btn btn-primary">Send</button>
+				</div>
+			</div>
 		</form>
+
 {INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/chanserv/akick.html b/modules/extra/webcpanel/templates/default/chanserv/akick.html
index 23c1c1efd..819a69096 100644
--- a/modules/extra/webcpanel/templates/default/chanserv/akick.html
+++ b/modules/extra/webcpanel/templates/default/chanserv/akick.html
@@ -1,42 +1,58 @@
 {INCLUDE header.html}
 		{FOR M IN MESSAGES}
-			{M}<br/>
+		<div class="alert alert-info">
+			{M}<br>
+		</div>
 		{END FOR}
+
+		<h2>Akick List</h2>
 		{IF EXISTS MASKS}
-			<b>Akick List</b></br>
-			<table width="100%" height="100%">
-				<tr>
-					<th>Mask</th>
-					<th>Creator</th>
-					<th>Reason</th>
-				</tr>
-				{FOR MASK,CREATOR,REASON IN MASKS,CREATORS,REASONS}
+			<table id="tableNSAccess" class="table table-hover">
+				<thead>
 					<tr>
-						<td>{MASK}</td>
-						<td>{CREATOR}</td>
+						<th>Mask</th>
+						<th>Reason</th>
+						<th>Creator</th>
+						<th></th>
+					</tr>
+				</thead>
+				<tbody>
+				{FOR MASK,REASON,CREATOR IN MASKS,REASONS,CREATORS}
+					<tr>
+						<td style="font-weight: bold;">{MASK}</td>
 						<td>{REASON}</td>
-						<td><a href="/chanserv/akick?channel={ESCAPED_CHANNEL}&mask={MASK}&del=1">Delete</a></td>
+						<td>{CREATOR}</td>
+						<td><a href="/chanserv/akick?channel={ESCAPED_CHANNEL}&mask={MASK}&del=1" class="btn btn-sm btn-danger">Delete</a></td>
 					</tr>
 				{END FOR}
+				</tbody>
 			</table>
 		{ELSE}
-			<b>Akick list is empty.</b>
+			<em>Akick list is empty.</em>
 		{END IF}
 
-		<br/><br/>
+		<hr>
 
-		<b>Add an akick entry</b><br/>
-		<form method="post" action="/chanserv/akick?channel={ESCAPED_CHANNEL}">
-			<table width="100%" height="100%">
-				<tr>
-					<th>Mask</th>
-					<th>Reason</th>
-				</tr>
-				<tr>
-					<td><input type="text" name="mask"></td>
-					<td><input type="text" name="access"></td>
-				</tr>
-			</table>
-			<input type="submit" value="Add">
+		<h4>Add an akick entry</h4>
+		<form class="form-horizontal" method="post" action="/chanserv/akick?channel={ESCAPED_CHANNEL}">
+			<div class="form-group">
+				<label class="control-label col-lg-2" for="mask">Mask:</label>
+				<div class="col-lg-6">
+					<input class="form-control" type="text" name="mask" id="mask" placeholder="Valid HostMask">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="control-label col-lg-2" for="reason">Reason:</label>
+				<div class="col-lg-6">
+					<input class="form-control" type="text" name="reason" id="reason" placeholder="Reason for AKICK">
+				</div>
+			</div>
+			<div class="form-group">
+				<div class="col-lg-offset-2 col-lg-6">
+					<button type="submit" class="btn btn-primary">Send</button>
+				</div>
+			</div>
 		</form>
+
+
 {INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/chanserv/drop.html b/modules/extra/webcpanel/templates/default/chanserv/drop.html
index 35f0283f2..7852bfde6 100644
--- a/modules/extra/webcpanel/templates/default/chanserv/drop.html
+++ b/modules/extra/webcpanel/templates/default/chanserv/drop.html
@@ -1,22 +1,34 @@
 {INCLUDE header.html}
-	{IF EXISTS MESSAGES}
 		{FOR M IN MESSAGES}
-			{M}<br/>
+		<div class="alert alert-info">
+			{M}<br>
+		</div>
 		{END FOR}
-	{END IF}
-	<h3>Channels you can drop:</h3>
-	<div class="scroll">
-	{FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES}
-		<a href="/chanserv/drop?channel={ECH}">{CH}</a></br>
-	{END FOR}
-	</div>
-	{IF EXISTS CHANNEL_DROP} 
-		<h3>Drop Channel {CHANNEL_DROP}?</h3>
-		<form method="post" name="dropForm" action="/chanserv/drop">
-			<input type="hidden" value="{CHANNEL_DROP}" name="channel">
-			Enter Channel For Confirmation: <input type="text" name="confChan">
-			<input type="hidden" value="yes" name="drop">
-			<input type="submit" value="Drop">
-		</form>
-	{END IF}
+
+		<h2>Channels you can drop</h2>
+		<div class="scroll">
+		{FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES}
+			<a href="/chanserv/drop?channel={ECH}">{CH}</a></br>
+		{END FOR}
+		</div>
+		{IF EXISTS CHANNEL_DROP}
+			<div class="alert alert-danger" style="margin-top: 15px; margin-bottom: 0; padding-bottom: 0;">
+				<h4>Drop Channel <strong>{CHANNEL_DROP}</strong>?</h4>
+				<form class="form-horizontal" method="post" action="/operserv/akill">
+					<input type="hidden" value="{CHANNEL_DROP}" name="channel">
+					<input type="hidden" value="yes" name="drop">
+					<div class="form-group">
+						<label class="control-label col-lg-3" for="confChan">Confirm channel name:</label>
+						<div class="col-lg-4">
+							<input class="form-control" type="text" name="confChan" id="confChan" placeholder="This cannot be undone!">
+						</div>
+					</div>
+					<div class="form-group">
+						<div class="col-lg-offset-3 col-lg-4">
+							<button type="submit" class="btn btn-danger">Drop</button>
+						</div>
+					</div>
+				</form>
+			</div>
+		{END IF}
 {INCLUDE footer.html}
\ No newline at end of file
diff --git a/modules/extra/webcpanel/templates/default/chanserv/main.html b/modules/extra/webcpanel/templates/default/chanserv/main.html
index dd9288f00..43eb902fb 100644
--- a/modules/extra/webcpanel/templates/default/chanserv/main.html
+++ b/modules/extra/webcpanel/templates/default/chanserv/main.html
@@ -1,5 +1,5 @@
 {INCLUDE header.html}
-			<b>Channels you have access in:</b><br/>
+			<h2>Channels you have access in</h2>
 			<div class="cinfo">
 			{FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES}
 				<a href="/chanserv/set?channel={ECH}">{CH}</a></br>
diff --git a/modules/extra/webcpanel/templates/default/chanserv/set.html b/modules/extra/webcpanel/templates/default/chanserv/set.html
index a97455717..dff390e09 100644
--- a/modules/extra/webcpanel/templates/default/chanserv/set.html
+++ b/modules/extra/webcpanel/templates/default/chanserv/set.html
@@ -1,9 +1,13 @@
 {INCLUDE header.html}
 		{FOR M IN MESSAGES}
-			{M}<br/>
+		<div class="alert alert-info">
+			{M}<br>
+		</div>
 		{END FOR}
+
+		<h2>Channel Information</h2>
 		<form method="post" action="/chanserv/set?channel={CHANNEL_ESCAPED}">
-			<table width="100%" height="100%">
+			<table id="tableInfo" class="table table-hover">
 				<tr>
 					<td>Channel Name</td>
 					<td>{CHANNEL}</td>
@@ -40,59 +44,31 @@
 				{END IF}
 				<tr>
 					<td>Keep topic</td>
-					{IF EXISTS KEEPTOPIC}
-					<td><input type="checkbox" name="keeptopic" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="keeptopic" value="on"></td>
-					{END IF}
+					<td><input type="checkbox" name="keeptopic" value="on" {IF EXISTS KEEPTOPIC}checked{END IF}></td>
 				</tr>
 				<tr>
 					<td>Peace</td>
-					{IF EXISTS PEACE}
-					<td><input type="checkbox" name="peace" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="peace" value="on"></td>
-					{END IF}
+					<td><input type="checkbox" name="peace" value="on" {IF EXISTS PEACE}checked{END IF}></td>
 				</tr>
 				<tr>
 					<td>Private</td>
-					{IF EXISTS PRIVATE}
-					<td><input type="checkbox" name="private" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="private" value="on"></td>
-					{END IF}
+					<td><input type="checkbox" name="private" value="on" {IF EXISTS PRIVATE}checked{END IF}></td>
 				</tr>
 				<tr>
 					<td>Restricted</td>
-					{IF EXISTS RESTRICTED}
-					<td><input type="checkbox" name="restricted" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="restricted" value="on"></td>
-					{END IF}
+					<td><input type="checkbox" name="restricted" value="on" {IF EXISTS RESTRICTED}checked{END IF}></td>
 				</tr>
 				<tr>
 					<td>Secure</td>
-					{IF EXISTS SECURE}
-					<td><input type="checkbox" name="secure" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="secure" value="on"></td>
-					{END IF}
+					<td><input type="checkbox" name="secure" value="on" {IF EXISTS SECURE}checked{END IF}></td>
 				</tr>
 				<tr>
 					<td>Secure Ops</td>
-					{IF EXISTS SECUREOPS}
-					<td><input type="checkbox" name="secureops" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="secureops" value="on"></td>
-					{END IF}
+					<td><input type="checkbox" name="secureops" value="on" {IF EXISTS SECUREOPS}checked{END IF}></td>
 				</tr>
 				<tr>
 					<td>Topic Lock</td>
-					{IF EXISTS TOPICLOCK}
-					<td><input type="checkbox" name="topiclock" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="topiclock" value="on"></td>
-					{END IF}
+					<td><input type="checkbox" name="topiclock" value="on" {IF EXISTS TOPICLOCK}checked{END IF}></td>
 				</tr>
 		</table>
 	<input type="submit" value="Save">