Merge pull request #19 from Phr33d0m/1.9

A completely rewritten Control Panel

4 files changed, 142 insertions, 112 deletions

diff --git a/modules/extra/webcpanel/templates/default/nickserv/access.html b/modules/extra/webcpanel/templates/default/nickserv/access.html
index 9948c3694..89a867627 100644
--- a/modules/extra/webcpanel/templates/default/nickserv/access.html
+++ b/modules/extra/webcpanel/templates/default/nickserv/access.html
@@ -1,24 +1,40 @@
 {INCLUDE header.html}
 		{FOR M IN MESSAGES}
-			{M}</br>
+		<div class="alert alert-info">
+			{M}<br>
+		</div>
 		{END FOR}
+
 		{IF EXISTS ACCESS}
-			<b>Your access list:</b>
-			<table width="100%" height="100%">
-				{FOR A IN ACCESS}
-				<tr>
-					<td>{A}</td>
-					<td><a href="/nickserv/access?mask={A}&del=1">Delete</a></td>
-				</tr>
-				{END FOR}
+			<h2>Nick access list</h2>
+			<table id="tableNSAccess" class="table table-hover">
+				<tbody>
+					{FOR A IN ACCESS}
+					<tr>
+						<td class="col-lg-4">{A}</td>
+						<td class="col-lg-8"><a href="/nickserv/access?mask={A}&del=1" class="btn btn-sm btn-danger">Delete</a></td>
+					</tr>
+					{END FOR}
+				</tbody>
 			</table>
 		{ELSE}
 			<b>Your access list is empty.</b>
 		{END IF}
-		<br/><br/>
-		<b>Add an access entry:</b>
-		<form method="post" action="/nickserv/access">
-		<input name="access">
-		<input type="submit" value="Add">
+
+		<hr>
+
+		<h4>Add an access entry</h4>
+		<form class="form-horizontal" method="post" action="/nickserv/access">
+			<div class="form-group">
+				<label class="control-label col-lg-2" for="message">Hostmask:</label>
+				<div class="col-lg-5">
+					<input class="form-control" type="text" name="message" id="message" placeholder="Your message here">
+				</div>
+			</div>
+			<div class="form-group">
+				<div class="col-lg-offset-2 col-lg-5">
+					<button type="submit" class="btn btn-primary">Add</button>
+				</div>
+			</div>
 		</form>
 {INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/nickserv/alist.html b/modules/extra/webcpanel/templates/default/nickserv/alist.html
index e36143458..224f09894 100644
--- a/modules/extra/webcpanel/templates/default/nickserv/alist.html
+++ b/modules/extra/webcpanel/templates/default/nickserv/alist.html
@@ -1,16 +1,21 @@
 {INCLUDE header.html}
-	<table>
-		<tr>
-			<th>Number</th>
-			<th>Channel</th>
-			<th>Access</th>
-		</tr>
-		{FOR N,C,A IN NUMBERS,CHANNELS,ACCESSES}
-			<tr>
-				<td>{N}</td>
-				<td>{C}</td>
-				<td>{A}</td>
-			</tr>
-		{END FOR}
-	</table>
+		<h2>Channel access list</h2>
+		<table id="tableInfoNorm" class="table table-hover">
+			<thead>
+				<tr>
+					<th>Number</th>
+					<th>Channel</th>
+					<th>Access</th>
+				</tr>
+			</thead>
+			<tbody>
+				{FOR N,C,A IN NUMBERS,CHANNELS,ACCESSES}
+					<tr>
+						<td>{N}</td>
+						<td>{C}</td>
+						<td>{A}</td>
+					</tr>
+				{END FOR}
+			</tbody>
+		</table>
 {INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/nickserv/cert.html b/modules/extra/webcpanel/templates/default/nickserv/cert.html
index 31f12b883..636626e2a 100644
--- a/modules/extra/webcpanel/templates/default/nickserv/cert.html
+++ b/modules/extra/webcpanel/templates/default/nickserv/cert.html
@@ -1,19 +1,36 @@
 {INCLUDE header.html}
 		{FOR M IN MESSAGES}
-			{M}</br>
+		<div class="alert alert-info">
+			{M}<br>
+		</div>
 		{END FOR}
-		<b>Your certificate finrgerprints:</b>
-		<table width="100%" height="100%">
+
+		<b>Your certificate finrgerprints</b>
+		<table id="tableNSAccess" class="table table-hover">
+			<tbody>
 			{FOR CERT IN CERTS}
-			<tr>
-				<td>{CERT}</td>
-				<td><a href="/nickserv/cert?mask={CERT}&del=1">Delete</a></td>
-			</tr>
+				<tr>
+					<td>{CERT}</td>
+					<td><a href="/nickserv/cert?mask={CERT}&del=1" class="btn btn-sm btn-danger">Delete</a></td>
+				</tr>
 			{END FOR}
+			</tbody>
 		</table>
-		<b>Add an certificate fingerprint</b>
-		<form method="post" action="/nickserv/cert">
-		<input name="certfp">
-		<input type="submit" value="Add">
+
+		<hr>
+
+		<h4>Add an certificate fingerprint</h4>
+		<form class="form-horizontal" method="post" action="/nickserv/cert">
+			<div class="form-group">
+				<label class="control-label col-lg-2" for="certfp">Certificate:</label>
+				<div class="col-lg-5">
+					<input class="form-control" type="text" name="certfp" id="certfp" placeholder="Your certificate">
+				</div>
+			</div>
+			<div class="form-group">
+				<div class="col-lg-offset-2 col-lg-5">
+					<button type="submit" class="btn btn-primary">Add</button>
+				</div>
+			</div>
 		</form>
 {INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/nickserv/info.html b/modules/extra/webcpanel/templates/default/nickserv/info.html
index 1dd051364..22addbf4f 100644
--- a/modules/extra/webcpanel/templates/default/nickserv/info.html
+++ b/modules/extra/webcpanel/templates/default/nickserv/info.html
@@ -1,82 +1,74 @@
 {INCLUDE header.html}
+		{IF EXISTS ERRORS}
 			{FOR M IN ERRORS}
-				{M}<br/>
+			<div class="alert alert-danger">
+				{M}<br>
+			</div>
 			{END FOR}
+		{END IF}
+
+		{IF EXISTS MESSAGES}
+		<div class="alert alert-info">
 			{FOR M IN MESSAGES}
-				{M}<br/>
+				{M}<br>
 			{END FOR}
-			<b>Your account information:</b>
-			<form method="post" action="/nickserv/info">
-			<table width="100%" height="100%">
-				<tr>
-					<td>Account:</td>
-					<td>{DISPLAY}</td>
-				</tr>
-				{IF EXISTS EMAIL}
-				<tr>
-					<td>EMail</td>
-					<td>{EMAIL}</td>
-				</tr>
-				{END IF}
-				<tr>
-					<td>Time registered</td>
-					<td>{TIME_REGISTERED}</td>
-				</tr>
-				{IF EXISTS VHOST}
-				<tr>
-					<td>Vhost</td>
-					<td>{VHOST}</td>
-				</tr>
-				{END IF}
-				<tr>
-					<td>Greet</td>
-					<td><input name="greet" value="{GREET}"></td>
-				</tr>
-				<tr>
-					<td>Auto op</td>
-					{IF EXISTS AUTOOP}
-					<td><input type="checkbox" name="autoop" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="autoop" value="on"></td>
+		</div>
+		{END IF}
+
+		<h2>Your account information:</h2>
+		<form method="post" action="/nickserv/info">
+			<table id="tableInfo" class="table table-hover">
+				<tbody>
+					<tr>
+						<td>Account:</td>
+						<td>{DISPLAY}</td>
+					</tr>
+					{IF EXISTS EMAIL}
+					<tr>
+						<td>E-mail:</td>
+						<td>{EMAIL}</td>
+					</tr>
 					{END IF}
-				</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>
+					<tr>
+						<td>Time registered:</td>
+						<td>{TIME_REGISTERED}</td>
+					</tr>
+					{IF EXISTS VHOST}
+					<tr>
+						<td>Vhost:</td>
+						<td>{VHOST}</td>
+					</tr>
 					{END IF}
-				</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}
-				</tr>
-				<tr>
-					<td>Kill</td>
-					<td><select name="kill">
-						{IF EXISTS KILL_ON}
-						<option value="on" selected>On</option>
-						{ELSE}
-						<option value="on">On</option>
-						{END IF}
-						{IF EXISTS KILL_QUICK}
-						<option value="quick" selected>Quick</option>
-						{ELSE}
-						<option value="quick">Quick</option>
-						{END IF}
-						{IF EXISTS KILL_OFF}
-						<option value="off" selected>Off</option>
-						{ELSE}
-						<option value="off">Off</option>
-						{END IF}
-					</select></td>
-				</tr>
+					<tr>
+						<td>Greet:</td>
+						<td><input name="greet" value="{GREET}" class="form-control input-sm"></td>
+					</tr>
+					<tr>
+						<td>Auto op:</td>
+						<td><input type="checkbox" name="autoop" value="on" {IF EXISTS AUTOOP}checked{END IF}></td>
+					</tr>
+					<tr>
+						<td>Private:</td>
+						<td><input type="checkbox" name="private" value="on" {IF EXISTS PRIVATE}checked{END IF}></td>
+					</tr>
+					<tr>
+						<td>Secure:</td>
+						<td><input type="checkbox" name="secure" value="on" {IF EXISTS SECURE}checked{END IF}></td>
+					</tr>
+					<tr>
+						<td>Kill:</td>
+						<td>
+							<select name="kill" class="form-control input-sm">
+								<option value="on" {IF EXISTS KILL_ON}selected{END IF}>On</option>
+								<option value="quick" {IF EXISTS KILL_QUICK}selected{END IF}>Quick</option>
+								<option value="off" {IF EXISTS KILL_OFF}selected{END IF}>Off</option>
+							</select>
+						</td>
+					</tr>
+				</tbody>
 			</table>
-			<input type="submit" value="Save">
-			</form>
+			<div class="text-center">
+				<button type="submit" class="btn btn-lg btn-primary">Save</button>
+			</div>
+		</form>
 {INCLUDE footer.html}