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/hash_password.php | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

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

diff --git a/application/views/user/hash_password.php b/application/views/user/hash_password.php
index d85d2810c..60df6e1c5 100644
--- a/application/views/user/hash_password.php
+++ b/application/views/user/hash_password.php
@@ -1,6 +1,6 @@
 <?php
 if (!empty($error)) {
-	echo "<p class='alert alert-error'>";
+	echo "<p class='alert alert-danger'>";
 	echo implode("<br />\n", $error);
 	echo "</p>";
 }
@@ -10,22 +10,27 @@ if ($hash) {
 }
 ?>
 <?php echo form_open('user/hash_password', 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="row">
+	    <div class="form-group col-lg-10">
+		    <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">
-			<input type="password" id="inputPasswordConfirm" name="password_confirm" placeholder="Password confirmation">
+	<div class="row">
+	    <div class="form-group col-lg-10">
+		<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" class="form-control">
 		</div>
+	    </div>
 	</div>
 
-	<div class="control-group">
-		<div class="controls">
+	<div class="row">
+	    <div class="form-group col-lg-10">
+		<div class="col-lg-offset-2 col-lg-5">
 			<button type="submit" class="btn btn-primary" name="process">Hash it</button>
 		</div>
 	</div>
-- 
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/hash_password.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

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

diff --git a/application/views/user/hash_password.php b/application/views/user/hash_password.php
index 60df6e1c5..6daa594f4 100644
--- a/application/views/user/hash_password.php
+++ b/application/views/user/hash_password.php
@@ -10,27 +10,27 @@ if ($hash) {
 }
 ?>
 <?php echo form_open('user/hash_password', array("class" => "form-horizontal")); ?>
-	<div class="row">
-	    <div class="form-group col-lg-10">
-		    <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 class="row">
+	<div class="form-group col-lg-10 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="row">
-	    <div class="form-group col-lg-10">
-		<label class="control-label col-lg-2" for="inputPassword">Confirm password</label>
-		<div class="col-lg-5">
+<div class="row">
+	<div class="form-group col-lg-10 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-10">
-		<div class="col-lg-offset-2 col-lg-5">
+<div class="row">
+	<div class="form-group col-lg-10 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">Hash it</button>
 		</div>
 	</div>
-- 
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/hash_password.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/application/views/user/hash_password.php b/application/views/user/hash_password.php
index 6daa594f4..98bef9df5 100644
--- a/application/views/user/hash_password.php
+++ b/application/views/user/hash_password.php
@@ -9,7 +9,7 @@ if ($hash) {
 	echo "<p>Result (this hash uses a random salt, so it will be different each time you submit this form):<br />$hash</p>\n";
 }
 ?>
-<?php echo form_open('user/hash_password', array("class" => "form-horizontal")); ?>
+<?php echo form_open('user/hash_password'); ?>
 <div class="row">
 	<div class="form-group col-lg-10 col-md-10">
 		<label class="control-label col-lg-2 col-md-2" for="inputPassword">Password</label>
-- 
cgit v1.2.3-24-g4f1b