From de02b8cb514a95c100d0ec11ab469acfc687ca00 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Mon, 22 Oct 2012 15:42:07 +0200
Subject: switch design to bootstrap; minor fixes along the way

Initial-work-by: Oliver Mader <b52@reaktor42.de>
Additional-work-by: Markus Cisler <mrkscslr@gmail.com>
Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/views/user/footer.php   |  1 -
 application/views/user/header.php   |  1 -
 application/views/user/invite.php   | 44 +++++++++++++++++++++++++++----------
 application/views/user/login.php    |  8 +++----
 application/views/user/register.php |  4 ++--
 5 files changed, 39 insertions(+), 19 deletions(-)
 delete mode 120000 application/views/user/footer.php
 delete mode 120000 application/views/user/header.php

(limited to 'application/views/user')

diff --git a/application/views/user/footer.php b/application/views/user/footer.php
deleted file mode 120000
index e3a4d3fca..000000000
--- a/application/views/user/footer.php
+++ /dev/null
@@ -1 +0,0 @@
-../file/footer.php
\ No newline at end of file
diff --git a/application/views/user/header.php b/application/views/user/header.php
deleted file mode 120000
index 7b5e4d759..000000000
--- a/application/views/user/header.php
+++ /dev/null
@@ -1 +0,0 @@
-../file/header.php
\ No newline at end of file
diff --git a/application/views/user/invite.php b/application/views/user/invite.php
index 5be8b48a3..eba77ead0 100644
--- a/application/views/user/invite.php
+++ b/application/views/user/invite.php
@@ -1,15 +1,37 @@
-<?php echo form_open('user/create_invitation_key'); ?>
-  <input type="submit" value="Create new key" name="process" />
-</form>
+<div class="alert alert-block">
+	<p>
+		<b>Watch out!</b>
+	</p>
+	<p>
+		You are free to invite anyone you want to, but please keep in
+		mind that if this person violates the rules and is banned, your
+		account will also be disabled.
+	</p>
+</div>
 
-<p>
-You are free to invite anyone you want to, but please keep in
-mind that if this person violates the rules and is banned, your account will also be disabled.
-</p>
+<h2>Unused invitation keys</h2>
+<table class="table table-striped">
+	<thead>
+		<tr>
+			<th>#</th>
+			<th style="width: 70%;">Key</th>
+			<th>Created on</th>
+		</tr>
+	</thead>
+	<tbody>
+		<?php $i = 1; ?>
+		<?php foreach($query as $key => $item): ?>
+			<tr>
+				<td><?php echo $i++; ?></td>
+				<td><?php echo anchor("user/register/".$item["key"], $item["key"]) ?></td>
+				<td><?php echo date("Y/m/d H:i", $item["date"]) ?></td>
+			</tr>
+		<?php endforeach; ?>
+	</tbody>
+</table>
 
-<p>Unused invitation keys:</p>
 <p>
-<?php foreach($query as $key => $item): ?>
-	<?php echo anchor("user/register/".$item["key"], $item["key"]); ?><br />
-<?php endforeach; ?>
+	<?php echo form_open('user/create_invitation_key'); ?>
+	  <input class="btn btn-primary btn-large" type="submit" value="Create a new key" name="process" />
+	</form>
 </p>
diff --git a/application/views/user/login.php b/application/views/user/login.php
index ca6f01b88..21264a404 100644
--- a/application/views/user/login.php
+++ b/application/views/user/login.php
@@ -1,7 +1,7 @@
 <?php 
-if (isset($login_error)) {
-	echo '<font style="color: rgb(238, 51, 51);">The entered credentials are invalid.</font>';
-} ?>
+if (isset($login_error)) { ?>
+	<div class="alert alert-error">The entered credentials are invalid.</div>
+<?php } ?>
 
 <?php echo form_open('user/login'); ?>
 	<table>
@@ -14,5 +14,5 @@ if (isset($login_error)) {
       <td><input type="password" name="password" /></td>
     </tr>
   </table>
-  <input type="submit" value="Login" name="process" />
+  <input type="submit" class="btn btn-primary" value="Login" name="process" />
 </form>
diff --git a/application/views/user/register.php b/application/views/user/register.php
index 78af46e96..2b15175a3 100644
--- a/application/views/user/register.php
+++ b/application/views/user/register.php
@@ -7,10 +7,10 @@
 	<table>
 		<tr>
 			<td>Username</td>
-			<td> <input type="text" name="username" value="<?=$values["username"]; ?>" /></td>
+			<td> <input type="text" name="username" value="<?php echo $values["username"]; ?>" /></td>
 		</tr><tr>
 			<td>Email</td>
-			<td> <input type="text" name="email" value="<?=$values["email"]; ?>" /></td>
+			<td> <input type="text" name="email" value="<?php echo $values["email"]; ?>" /></td>
 		</tr><tr>
 			<td>Password</td>
 			<td> <input type="password" name="password" /></td>
-- 
cgit v1.2.3-24-g4f1b