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/reset_password_form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/application/views/user/reset_password_form.php b/application/views/user/reset_password_form.php
index b93ad1370..4ef84b7e7 100644
--- a/application/views/user/reset_password_form.php
+++ b/application/views/user/reset_password_form.php
@@ -1,5 +1,5 @@
 <?php if (!empty($error)) {
-	echo "<p class='alert alert-error'>";
+	echo "<p class='alert alert-danger'>";
 	echo implode("<br />\n", $error);
 	echo "</p>";
 } ?>
-- 
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/reset_password_form.php | 28 +++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

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

diff --git a/application/views/user/reset_password_form.php b/application/views/user/reset_password_form.php
index 4ef84b7e7..99f5e54a0 100644
--- a/application/views/user/reset_password_form.php
+++ b/application/views/user/reset_password_form.php
@@ -4,24 +4,24 @@
 	echo "</p>";
 } ?>
 <?php echo form_open('user/reset_password/'.$key, array("class" => "form-horizontal")); ?>
-	<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>
+<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>
+</div>
 
-	<div class="control-group">
-		<label class="control-label" for="inputPassword">Confirm password</label>
-		<div class="controls">
-			<input type="password" id="inputPasswordConfirm" name="password_confirm" placeholder="Password confirmation">
-		</div>
+<div class="control-group">
+	<label class="control-label" for="inputPassword">Confirm password</label>
+	<div class="controls">
+		<input type="password" id="inputPasswordConfirm" name="password_confirm" placeholder="Password confirmation">
 	</div>
+</div>
 
-	<div class="control-group">
-		<div class="controls">
-			<button type="submit" class="btn btn-primary" name="process">Change password</button>
-		</div>
+<div class="control-group">
+	<div class="controls">
+		<button type="submit" class="btn btn-primary" name="process">Change password</button>
 	</div>
+</div>
 </form>
 
-- 
cgit v1.2.3-24-g4f1b


From 556ca9a0c2d99dbd94028ac80aabf3dc809e76b9 Mon Sep 17 00:00:00 2001
From: Markus Cisler <m@kuchen.io>
Date: Sun, 22 Sep 2013 14:20:35 +0200
Subject: fix forms on password reset page

---
 application/views/user/reset_password_form.php | 28 ++++++++++++++++----------
 1 file changed, 17 insertions(+), 11 deletions(-)

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

diff --git a/application/views/user/reset_password_form.php b/application/views/user/reset_password_form.php
index 99f5e54a0..819ca9de4 100644
--- a/application/views/user/reset_password_form.php
+++ b/application/views/user/reset_password_form.php
@@ -4,23 +4,29 @@
 	echo "</p>";
 } ?>
 <?php echo form_open('user/reset_password/'.$key, array("class" => "form-horizontal")); ?>
-<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 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 class="control-group">
-	<label class="control-label" for="inputPassword">Confirm password</label>
-	<div class="controls">
-		<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 class="control-group">
-	<div class="controls">
-		<button type="submit" class="btn btn-primary" name="process">Change password</button>
+<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">Change password</button>
+		</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/reset_password_form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/application/views/user/reset_password_form.php b/application/views/user/reset_password_form.php
index 819ca9de4..9c8253189 100644
--- a/application/views/user/reset_password_form.php
+++ b/application/views/user/reset_password_form.php
@@ -3,7 +3,7 @@
 	echo implode("<br />\n", $error);
 	echo "</p>";
 } ?>
-<?php echo form_open('user/reset_password/'.$key, array("class" => "form-horizontal")); ?>
+<?php echo form_open('user/reset_password/'.$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="inputPassword">Password</label>
-- 
cgit v1.2.3-24-g4f1b