From 36a1bb6770cb76ec7baf4e215c4379b070c60639 Mon Sep 17 00:00:00 2001
From: Markus Cisler <m@kuchen.io>
Date: Thu, 5 Sep 2013 18:40:06 +0200
Subject: almost migrated to bootstrap3

---
 application/views/user/register.php | 46 ++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 18 deletions(-)

(limited to 'application/views/user/register.php')

diff --git a/application/views/user/register.php b/application/views/user/register.php
index c0050508b..217a3d18f 100644
--- a/application/views/user/register.php
+++ b/application/views/user/register.php
@@ -1,41 +1,51 @@
 <?php if (!empty($error)) {
-	echo "<p class='alert alert-error'>";
+	echo "<p class='alert alert-danger'>";
 	echo implode("<br />\n", $error);
 	echo "</p>";
 } ?>
 <?php echo form_open('user/register/'.$key, array("class" => "form-horizontal")); ?>
-	<div class="control-group">
-		<label class="control-label" for="inputUsername">Username</label>
-		<div class="controls">
-			<input type="text" id="inputUsername" name="username" placeholder="Username" value="<?php echo $values["username"]; ?>">
+	<div class="row">
+	    <div class="form-group col-lg-8">
+		<label class="control-label col-lg-2" for="inputUsername">Username</label>
+		<div class="col-lg-5">
+			<input type="text" id="inputUsername" name="username" placeholder="Username" value="<?php echo $values["username"]; ?>" class="form-control">
 		</div>
+	    </div>
 	</div>
 
-	<div class="control-group">
-		<label class="control-label" for="inputEmail">Email</label>
-		<div class="controls">
-			<input type="text" id="inputEmail" name="email" placeholder="Email" value="<?php echo $values["email"]; ?>">
+	<div class="row">
+	    <div class="form-group col-lg-8">
+		<label class="control-label col-lg-2" for="inputEmail">Email</label>
+		<div class="col-lg-5">
+			<input type="text" id="inputEmail" name="email" placeholder="Email" value="<?php echo $values["email"]; ?>" class="form-control">
 		</div>
+	    </div>
 	</div>
 
-	<div class="control-group">
-		<label class="control-label" for="inputPassword">Password</label>
-		<div class="controls">
-			<input type="password" id="inputPassword" name="password" placeholder="Password">
+	<div class="row">
+	    <div class="form-group col-lg-8">
+		<label class="control-label col-lg-2" for="inputPassword">Password</label>
+		<div class="col-lg-5">
+			<input type="password" id="inputPassword" name="password" placeholder="Password" class="form-control">
 		</div>
+	    </div>
 	</div>
 
-	<div class="control-group">
-		<label class="control-label" for="inputPassword">Confirm password</label>
-		<div class="controls">
+	<div class="row">
+	    <div class="form-group col-lg-8">
+		<label class="control-label col-lg-2" for="inputPassword">Confirm password</label>
+		<div class="col-lg-5">
 			<input type="password" id="inputPasswordConfirm" name="password_confirm" placeholder="Password confirmation">
 		</div>
+	    </div>
 	</div>
 
-	<div class="control-group">
-		<div class="controls">
+	<div class="row">
+	    <div class="form-group col-lg-8">
+		<div class="col-lg-offset-2 col-lg-5">
 			<button type="submit" class="btn btn-primary" name="process">Register</button>
 		</div>
+	    </div>
 	</div>
 </form>
 
-- 
cgit v1.2.3-24-g4f1b


From 43b23943ef3d9ce20accf250bb796b0b9454e8a4 Mon Sep 17 00:00:00 2001
From: Markus Cisler <m@kuchen.io>
Date: Sun, 22 Sep 2013 14:12:01 +0200
Subject: fix forms on so called medium device desktops

---
 application/views/user/register.php | 50 ++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'application/views/user/register.php')

diff --git a/application/views/user/register.php b/application/views/user/register.php
index 217a3d18f..fffd9d271 100644
--- a/application/views/user/register.php
+++ b/application/views/user/register.php
@@ -4,48 +4,48 @@
 	echo "</p>";
 } ?>
 <?php echo form_open('user/register/'.$key, array("class" => "form-horizontal")); ?>
-	<div class="row">
-	    <div class="form-group col-lg-8">
-		<label class="control-label col-lg-2" for="inputUsername">Username</label>
-		<div class="col-lg-5">
+<div class="row">
+	<div class="form-group col-lg-8 col-md-10">
+		<label class="control-label col-lg-2 col-md-2" for="inputUsername">Username</label>
+		<div class="col-lg-5 col-md-5">
 			<input type="text" id="inputUsername" name="username" placeholder="Username" value="<?php echo $values["username"]; ?>" class="form-control">
 		</div>
-	    </div>
 	</div>
+</div>
 
-	<div class="row">
-	    <div class="form-group col-lg-8">
-		<label class="control-label col-lg-2" for="inputEmail">Email</label>
-		<div class="col-lg-5">
+<div class="row">
+	<div class="form-group col-lg-8 col-md-10">
+		<label class="control-label col-lg-2 col-md-2" for="inputEmail">Email</label>
+		<div class="col-lg-5 col-md-5">
 			<input type="text" id="inputEmail" name="email" placeholder="Email" value="<?php echo $values["email"]; ?>" class="form-control">
 		</div>
-	    </div>
 	</div>
+</div>
 
-	<div class="row">
-	    <div class="form-group col-lg-8">
-		<label class="control-label col-lg-2" for="inputPassword">Password</label>
-		<div class="col-lg-5">
+<div class="row">
+	<div class="form-group col-lg-8 col-md-10">
+		<label class="control-label col-lg-2 col-md-2" for="inputPassword">Password</label>
+		<div class="col-lg-5 col-md-5">
 			<input type="password" id="inputPassword" name="password" placeholder="Password" class="form-control">
 		</div>
-	    </div>
 	</div>
+</div>
 
-	<div class="row">
-	    <div class="form-group col-lg-8">
-		<label class="control-label col-lg-2" for="inputPassword">Confirm password</label>
-		<div class="col-lg-5">
-			<input type="password" id="inputPasswordConfirm" name="password_confirm" placeholder="Password confirmation">
+<div class="row">
+	<div class="form-group col-lg-8 col-md-10">
+		<label class="control-label col-lg-2 col-md-2" for="inputPassword">Confirm password</label>
+		<div class="col-lg-5 col-md-5">
+			<input type="password" id="inputPasswordConfirm" name="password_confirm" placeholder="Password confirmation" class="form-control">
 		</div>
-	    </div>
 	</div>
+</div>
 
-	<div class="row">
-	    <div class="form-group col-lg-8">
-		<div class="col-lg-offset-2 col-lg-5">
+<div class="row">
+	<div class="form-group col-lg-8 col-md-10">
+		<div class="col-lg-offset-2 col-lg-5 col-md-offset-2 col-md-5">
 			<button type="submit" class="btn btn-primary" name="process">Register</button>
 		</div>
-	    </div>
 	</div>
+</div>
 </form>
 
-- 
cgit v1.2.3-24-g4f1b


From 7e4912fc03111ab5071e8e7478db48422597777a Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Sun, 22 Sep 2013 16:07:44 +0200
Subject: Fix form display errors on small devices

form-horizontal causes the viewport to become too wide.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/views/user/register.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/views/user/register.php')

diff --git a/application/views/user/register.php b/application/views/user/register.php
index fffd9d271..af4558ff9 100644
--- a/application/views/user/register.php
+++ b/application/views/user/register.php
@@ -3,7 +3,7 @@
 	echo implode("<br />\n", $error);
 	echo "</p>";
 } ?>
-<?php echo form_open('user/register/'.$key, array("class" => "form-horizontal")); ?>
+<?php echo form_open('user/register/'.$key); ?>
 <div class="row">
 	<div class="form-group col-lg-8 col-md-10">
 		<label class="control-label col-lg-2 col-md-2" for="inputUsername">Username</label>
-- 
cgit v1.2.3-24-g4f1b