Merge pull request #19 from Phr33d0m/1.9

A completely rewritten Control Panel

19 files changed, 805 insertions, 787 deletions

diff --git a/modules/extra/webcpanel/pages/chanserv/akick.cpp b/modules/extra/webcpanel/pages/chanserv/akick.cpp
index 4af2f5b48..5acb8d6da 100644
--- a/modules/extra/webcpanel/pages/chanserv/akick.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/akick.cpp
@@ -49,7 +49,7 @@ bool WebCPanel::ChanServ::Akick::OnRequest(HTTPProvider *server, const Anope::st
 		params.push_back("ADD");
 		params.push_back(message.post_data["mask"]);
 		if (message.post_data["reason"].empty() == false)
-			params.push_back(message.get_data["reason"]);
+			params.push_back(message.post_data["reason"]);
 
 		WebPanel::RunCommand(na->nc->display, na->nc, "ChanServ", "chanserv/akick", params, replacements);
 	}
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">
diff --git a/modules/extra/webcpanel/templates/default/confirm.html b/modules/extra/webcpanel/templates/default/confirm.html
index 918ccd971..c9e609158 100644
--- a/modules/extra/webcpanel/templates/default/confirm.html
+++ b/modules/extra/webcpanel/templates/default/confirm.html
@@ -1,30 +1,47 @@
-<!DOCTYPE html> 
-<html>
-<head>
-	<link href="/static/style.css" media="screen" rel="stylesheet" type="text/css" />
-	<title>{TITLE}</title>
-</head>
-<body>
-	<div class="master">
-		<div class="header">
-			<div class="loggedinas"><a href="/">Home</a></div>
-		</div>
-		<table width="100%" height="100%">
-			<tr>
-				<td>
-					<center>
-						<img src="static/logo.png"/>
-						<br/>
+<!DOCTYPE html>
+<!--[if IE 7]> <html lang="en" class="ie7"> <![endif]-->
+<!--[if IE 8]> <html lang="en" class="ie8"> <![endif]-->
+<!--[if IE 9]> <html lang="en" class="ie9"> <![endif]-->
+<!--[if !IE]><!-->
+<html lang="en">
+	<!--<![endif]-->
+	<head>
+		<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
+		<link href="/static/style.css" media="screen" rel="stylesheet" type="text/css" />
+		<!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+		<title>{TITLE}</title>
+	</head>
+	<body>
+		<div id="frontPages" class="container">
+			<div class="row">
+				<div class="col-lg-offset-4 col-lg-4">
+					<a href="/"><img src="http://www.geniusdex.net/anope/anope.svg" class="img-responsive" width="370"></a>
+					<a href="/" class="btn btn-lg btn-default btn-block">Back Home</a>
+
+					<h1 class="form-signin-heading">Register</h1>
+
+					{IF EXISTS MESSAGES}
+					<div class="alert alert-info">
 						{FOR M IN MESSAGES}
 							{M}<br/>
 						{END FOR}
-					</center>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<div class="footer">
-		Anope IRC Services - &copy; 2012 Anope Team - <a href="http://anope.org">http://anope.org</a>
-	</div>
-</body>
+					</div>
+					{END IF}
+				</div>
+			</div>
+
+			<br>
+			<div class="row">
+				<div class="col-lg-offset-3 col-lg-6">
+					<div class="footer text-center">
+						Anope IRC Services - &copy; 2013 Anope Team - <a href="http://anope.org">http://anope.org</a>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+		<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+	</body>
 </html>
diff --git a/modules/extra/webcpanel/templates/default/footer.html b/modules/extra/webcpanel/templates/default/footer.html
index 65d23402a..6d224f8df 100644
--- a/modules/extra/webcpanel/templates/default/footer.html
+++ b/modules/extra/webcpanel/templates/default/footer.html
@@ -1,7 +1,13 @@
+					<br>
+				</div>
+			</div>
+			<div class="row">
+				<div class="col-lg-offset-3 col-lg-6">
+					<div class="footer text-center">
+						Anope IRC Services - &copy; 2013 Anope Team - <a href="http://anope.org">http://anope.org</a>
+					</div>
+				</div>
+			</div>
 		</div>
-	</div>
-	<div class="footer">
-		Anope IRC Services - &copy; 2012 Anope Team - <a href="http://anope.org">http://anope.org</a>
-	</div>
-</body>
-</html>
+	</body>
+</html>
\ No newline at end of file
diff --git a/modules/extra/webcpanel/templates/default/header.html b/modules/extra/webcpanel/templates/default/header.html
index 3cb1cf372..a5fe89517 100644
--- a/modules/extra/webcpanel/templates/default/header.html
+++ b/modules/extra/webcpanel/templates/default/header.html
@@ -1,113 +1,53 @@
-<!DOCTYPE html> 
-<html>
-<head>
-	<link href="/static/style.css" media="screen" rel="stylesheet" type="text/css" />
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
-	<title>{TITLE}</title>
-	{IF EXISTS CMDR} 
-	<script type="text/javascript">
-	var tSec=5; //Time in seconds to keep the overlay open
-	var t=(tSec*1000); //Convert the time to ms so we can use it
-	
-	$(document).ready(function() \{
-	
-		/*Modal*/
-		var id = "#dialog";
-		
-		var mHeight;
-		var mWidth;
-		var oHeight = $(id).height();
-		var oWidth = $(id).height();
-		
-		var top;
-		var left;
-		
-		showModal();
+<!DOCTYPE html>
+<!--[if IE 7]> <html lang="en" class="ie7"> <![endif]-->
+<!--[if IE 8]> <html lang="en" class="ie8"> <![endif]-->
+<!--[if IE 9]> <html lang="en" class="ie9"> <![endif]-->
+<!--[if !IE]><!-->
+<html lang="en">
+	<!--<![endif]-->
+	<head>
+		<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
+		<link href="/static/style.css" media="screen" rel="stylesheet" type="text/css" />
 
-		$('.close').click(function (e) \{
-			e.preventDefault();	
-			hideModal();
-		\});
-	
-		$('#mask').click(function () \{
-			hideModal();
-		\});	
-		
-		function hideModal() \{
-			if ($('#mask').not(':hidden')) \{
-				$('.master').fadeTo('slow',1.0);	
-				$('#mask, .window').fadeOut(200);
-			\}					
-		\}
-		
-		function showModal() \{				
-			mHeight = $(document).height();	
-			mWidth = $(window).width();
-			
-			var alertMsg = '<br/>{CMDR}<br/>';
+		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+		<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
 
-			$('#mask').css(\{'width': mWidth, 'height': mHeight\});	
-			$('#mask').fadeIn(200);		
-			$('#mask').fadeTo('fast',0.75);
-		
-			$('#dialogMsg').html(alertMsg);
-			
-			top = mHeight/2-oHeight/2;
-			left = mWidth/2-oHeight/2;
-			
-			$(id).css('top', top);
-			$(id).css('left', left);
-			$('.master').fadeTo('fast',0.3);								
-			
-			$(id).fadeIn(500);
-			setTimeout(hideModal, t);		
-			
-		\}	
-		
-		$(window).resize(function() \{
-			if ($('#mask').not(':hidden')) \{
-				mHeight = $(document).height();
-				mWidth = $(window).width();
+		<!--[if lt IE 9]>
+			<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+			<script src="http://politeia.in/assets/js/html5shiv.js"></script>
+			<script src="http://politeia.in/assets/js/respond.min.js"></script>
+		<![endif]-->
 
-				/* Might as well only change the postion of box if the window is large enough */
-				if ((mHeight > oHeight) && (mWidth > oWidth)) \{ 
-					top = mHeight/2-oHeight/2;
-					left = mWidth/2-oHeight/2;
-					$('#mask').css(\{'width': mWidth, 'height': mHeight\});
-					$(id).css('top', top);
-					$(id).css('left', left);
-				\}
-				
-			\}
-		\})
-						
-	\});
-	</script>
-	{END IF}
-</head>
-<body>
-	<div id="boxes">
-		<div id="dialog" class="window">
-			<h2>Status Message:</h2>
-			<div id="dialogMsg"></div>
-			<div id="dialogClose"><a href="#" class="close">Dismiss</a></div>
-		</div>
-		<div id="mask"></div>
-	</div>	
-	<div class="master">
-		<div class="header">
-			<ul id="button">
-				{FOR CATEGORY_URL,CATEGORY_NAME IN CATEGORY_URLS,CATEGORY_NAMES}
-				<li><a href="{CATEGORY_URL}">{CATEGORY_NAME}</a></li>
-				{END FOR}
-			</ul>
-			<div class="loggedinas">Logged in as {ACCOUNT} <a href="/logout">(Logout)</a></div>
-		</div>
-		<div class="sidebar">
-			<ul class="sidenav">
-				{FOR SUBCATEGORY_URL,SUBCATEGORY_GET,SUBCATEGORY_NAME IN SUBCATEGORY_URLS,SUBCATEGORY_GETS,SUBCATEGORY_NAMES}
-				<li><a href="{SUBCATEGORY_URL}{SUBCATEGORY_GET}">{SUBCATEGORY_NAME}</a></li>
-				{END FOR}
-			</ul>
-		</div>
-		<div class="content">
+		<title>{TITLE}</title>
+	</head>
+	<body>
+		<div id="frontPages" class="container">
+			<div class="row">
+				<div class="navbar navbar-default">
+					<span class="navbar-brand" style="margin-top: -1px">Anope Web <small>Control Panel</small></span>
+					<ul class="nav navbar-nav">
+						{FOR CATEGORY_URL,CATEGORY_NAME IN CATEGORY_URLS,CATEGORY_NAMES}
+						<li><a href="{CATEGORY_URL}">{CATEGORY_NAME}</a></li>
+						{END FOR}
+					</ul>
+					<span id="loggedIn" class="pull-right">
+						Logged in as {ACCOUNT} <a href="/logout">(Logout)</a>
+					</span>
+				</div>
+			</div>
+
+			<div class="row">
+				<div class="col-lg-3">
+					<div id="navPanel" class="sidebar-nav-fixed">
+						<div class="well" style="padding: 0;">
+							<ul class="nav nav-list" style="padding: 10px;">
+								{FOR SUBCATEGORY_URL,SUBCATEGORY_GET,SUBCATEGORY_NAME IN SUBCATEGORY_URLS,SUBCATEGORY_GETS,SUBCATEGORY_NAMES}
+								<li><a href="{SUBCATEGORY_URL}{SUBCATEGORY_GET}">{SUBCATEGORY_NAME}</a></li>
+								{END FOR}
+							</ul>
+						</div>
+					</div>
+				</div>
+
+				<div class="col-lg-9">
+					<div class="well" style="padding: 20px 20px 5px 20px;">
diff --git a/modules/extra/webcpanel/templates/default/hostserv/request.html b/modules/extra/webcpanel/templates/default/hostserv/request.html
index 158bed28f..3b2b30c7d 100644
--- a/modules/extra/webcpanel/templates/default/hostserv/request.html
+++ b/modules/extra/webcpanel/templates/default/hostserv/request.html
@@ -1,29 +1,43 @@
 {INCLUDE header.html}
-	{FOR M IN MESSAGES}
-		{M}<br/>
-	{END FOR}
-	<table width="100%" height="100%">
-		<tr>
-			<td>Your <b>current</b> vHost:
-		{IF EXISTS VHOST}
-			{VHOST}
-		{ELSE}
-			<b>None</b>
-		{END IF}
-			</td>
-		</tr>
-	</table>
-	{IF EXISTS CAN_REQUEST}
-		{IF EXISTS VHOST}		
-			<b>Request a new vHost</b>
-		{ELSE}
-			<b>Request a vHost</b>
-		{END IF}
-		<form method="post" action="/hostserv/request">
-			<input name="req">
-			<input type="submit" value="Request">
-		</form>
-	{ELSE}
-		vHost requests are disabled on this network.
-	{END IF}
+		{FOR M IN MESSAGES}
+		<div class="alert alert-info">
+			{M}<br>
+		</div>
+		{END FOR}
+
+		<h2>vHost Information</h2>
+		<table id="tableInfo" class="table table-hover">
+			<tbody>
+				<tr>
+					<td>Your current vHost:</td>
+					<td>
+				{IF EXISTS VHOST}
+					{VHOST}
+				{ELSE}
+					<em>None</em>
+				{END IF}
+					</td>
+					<td></td>
+				</tr>
+				{IF EXISTS CAN_REQUEST}
+				<tr>
+					<td>
+					{IF EXISTS VHOST}
+						Request a new vHost
+					{ELSE}
+						Request a vHost
+					{END IF}
+					</td>
+					<form method="post" action="/hostserv/request">
+					<td><input class="form-control" name="req"></td>
+					<td><button type="submit" class="btn btn-primary">Request</button></td>
+					</form>
+				</tr>
+				{ELSE}
+				<tr>
+					<td colspan="2" class="text-center"><strong>vHost requests are disabled on this network.</strong></td>
+				</tr>
+				{END IF}
+			</tbody>
+		</table>
 {INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/login.html b/modules/extra/webcpanel/templates/default/login.html
index 7aa54aa9c..250dde1f0 100644
--- a/modules/extra/webcpanel/templates/default/login.html
+++ b/modules/extra/webcpanel/templates/default/login.html
@@ -1,47 +1,54 @@
-<!DOCTYPE html> 
-<html>
-<head>
-	<link href="/static/style.css" media="screen" rel="stylesheet" type="text/css" />
-	<title>{TITLE}</title>
-</head>
-<body>
-	<div class="master">
-		<div class="header">
-			<div class="loggedinas"><a href="/register">Register</a></div>
+<!DOCTYPE html>
+<!--[if IE 7]> <html lang="en" class="ie7"> <![endif]-->
+<!--[if IE 8]> <html lang="en" class="ie8"> <![endif]-->
+<!--[if IE 9]> <html lang="en" class="ie9"> <![endif]-->
+<!--[if !IE]><!-->
+<html lang="en">
+	<!--<![endif]-->
+	<head>
+		<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
+		<link href="/static/style.css" media="screen" rel="stylesheet" type="text/css" />
+		<!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+		<title>{TITLE}</title>
+	</head>
+	<body>
+		<div id="frontPages" class="container">
+			<div class="row">
+				<div class="col-lg-offset-4 col-lg-4">
+					<a href="/">
+						<img src="http://www.geniusdex.net/anope/anope.svg" class="img-responsive" width="370">
+					</a>
+					<h1 class="form-signin-heading">Login <small>to continue</small></h1>
+
+					{IF EXISTS INVALID_LOGIN}
+					<div class="alert alert-danger">
+						{INVALID_LOGIN}
+					</div>
+					{END IF}
+
+					<form class="form-horizontal form-signin" action="/" method="post">
+						<input type="text" name="username" class="form-control" placeholder="Username" required="required" autofocus
+							style="margin-bottom: -1px; border-bottom-left-radius: 0; border-bottom-right-radius: 0;">
+						<input type="password" name="password" class="form-control" placeholder="Password" required="required"
+							style="margin-bottom: 10px; border-top-left-radius: 0; border-top-right-radius: 0;">
+						<button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
+						<a class="btn btn-lg btn-warning btn-block" href="/register">Register</a>
+					</form>
+				</div>
+			</div>
+
+			<br>
+			<div class="row">
+				<div class="col-lg-offset-3 col-lg-6">
+					<div class="footer text-center">
+						Anope IRC Services - &copy; 2013 Anope Team - <a h