From f7567dc2507403430f3e34d3d663aee5d756fb51 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Fri, 10 Oct 2014 16:35:02 +1100
Subject: [PATCH] More minor updates

---
 classes/lnApp/Controller/User/Account.php |  6 ++++--
 classes/lnApp/Controller/User/Welcome.php |  4 ++++
 views/account/user/edit.php               | 16 ++++++++--------
 views/account/user/resetpassword.php      |  4 ++--
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/classes/lnApp/Controller/User/Account.php b/classes/lnApp/Controller/User/Account.php
index 2858147..902b066 100644
--- a/classes/lnApp/Controller/User/Account.php
+++ b/classes/lnApp/Controller/User/Account.php
@@ -10,9 +10,11 @@
  * @license    http://dev.leenooks.net/license.html
  */
 abstract class lnApp_Controller_User_Account extends Controller_Account {
+	protected $auth_required = TRUE;
+
 	protected $secure_actions = array(
-		'edit'=>TRUE,
-		'resetpassword'=>TRUE,
+		'edit'=>0,
+		'resetpassword'=>0,
 	);
 
 	/**
diff --git a/classes/lnApp/Controller/User/Welcome.php b/classes/lnApp/Controller/User/Welcome.php
index 75ed0fa..3f705fe 100644
--- a/classes/lnApp/Controller/User/Welcome.php
+++ b/classes/lnApp/Controller/User/Welcome.php
@@ -12,6 +12,10 @@
 abstract class lnApp_Controller_User_Welcome extends Controller_Welcome {
 	protected $auth_required = TRUE;
 
+	protected $secure_actions = array(
+		'index'=>0,
+	);
+
 	public function action_index() {
 		throw HTTP_Exception::factory(500,'Site not setup!');
 	}
diff --git a/views/account/user/edit.php b/views/account/user/edit.php
index aa67c36..d5a38c3 100644
--- a/views/account/user/edit.php
+++ b/views/account/user/edit.php
@@ -1,7 +1,7 @@
 <fieldset>
 	<legend>Account Details</legend>
 
-	<?php echo Form::input('email',$o->display('email'),array('label'=>'Email','class'=>'col-md-3','placeholder'=>'Email Address','type'=>'email','required','data-error'=>'Invalid EMAIL address')); ?>
+	<?php echo Form::input('email',$o->display('email'),array('label'=>'Email','divclass'=>'col-md-3','placeholder'=>'Email Address','type'=>'email','required','data-error'=>'Invalid EMAIL address')); ?>
 
 	<div class="form-group">
 		<label class="col-md-2 control-label" for="Title">Name</label>
@@ -10,33 +10,33 @@
 				<?php echo Form::select('title',StaticList_Title::table(),$o->display('title'),array('class'=>'form-control','required','nocg'=>TRUE)); ?>
 			</div>
 			<div class="col-md-2">
-				<?php echo Form::input('first_name',$o->display('first_name'),array('class'=>'form-control col-md-2','placeholder'=>'First Name','required','nocg'=>TRUE)); ?>
+				<?php echo Form::input('first_name',$o->display('first_name'),array('class'=>'form-control','placeholder'=>'First Name','required','nocg'=>TRUE)); ?>
 			</div>
 			<div class="col-md-3">
-				<?php echo Form::input('last_name',$o->display('last_name'),array('class'=>'form-control col-md-2','placeholder'=>'Last Name','required','nocg'=>TRUE)); ?>
+				<?php echo Form::input('last_name',$o->display('last_name'),array('class'=>'form-control','placeholder'=>'Last Name','required','nocg'=>TRUE)); ?>
 			</div>
 		</div>
 	</div>
 
 	<div class="form-group">
 		<label class="col-md-2 control-label" for="address1">Address</label>
-		<?php echo Form::input('address1',$o->display('address1'),array('class'=>'col-md-6','placeholder'=>'Address Line 1','required')); ?>
+		<?php echo Form::input('address1',$o->display('address1'),array('divclass'=>'col-md-6','placeholder'=>'Address Line 1','required')); ?>
 
 		<label class="col-md-2 control-label" for="address2"></label>
-		<?php echo Form::input('address2',$o->display('address2'),array('class'=>'col-md-6','placeholder'=>'Address Line 2')); ?>
+		<?php echo Form::input('address2',$o->display('address2'),array('divclass'=>'col-md-6','placeholder'=>'Address Line 2')); ?>
 
 		<label class="col-md-2 control-label" for="city"></label>
 		<div class="row">
 			<div class="col-md-3">
-				<?php echo Form::input('city',$o->display('city'),array('label'=>'City','placeholder'=>'City','required','nocg'=>TRUE)); ?>
+				<?php echo Form::input('city',$o->display('city'),array('class'=>'form-control','label'=>'City','placeholder'=>'City','required','nocg'=>TRUE)); ?>
 			</div>
 
 			<div class="col-md-1">
-				<?php echo Form::input('state',$o->display('state'),array('label'=>'','class'=>'input-mini','placeholder'=>'State','required','nocg'=>TRUE)); ?>
+				<?php echo Form::input('state',$o->display('state'),array('class'=>'form-control','placeholder'=>'State','required','nocg'=>TRUE)); ?>
 			</div>
 
 			<div class="col-md-1">
-				<?php echo Form::input('zip',$o->display('zip'),array('label'=>'','class'=>'input-mini','placeholder'=>'Post Code','required','nocg'=>TRUE)); ?>
+				<?php echo Form::input('zip',$o->display('zip'),array('class'=>'form-control','placeholder'=>'Post Code','required','nocg'=>TRUE)); ?>
 			</div>
 		</div>
 	</div>
diff --git a/views/account/user/resetpassword.php b/views/account/user/resetpassword.php
index 0dfb411..cb2393d 100644
--- a/views/account/user/resetpassword.php
+++ b/views/account/user/resetpassword.php
@@ -1,8 +1,8 @@
 <fieldset>
 	<legend>Reset Password</legend>
 
-	<?php echo Form::input('password','',array('label'=>'Password','class'=>'col-md-3','placeholder'=>'Login Password','type'=>'password','required','id'=>'password','data-minlength'=>8)); ?>
-	<?php echo Form::input('password_confirm','',array('label'=>'Confirm','class'=>'col-md-3','placeholder'=>'Confirm Password','type'=>'password','required','data-match'=>'#password','data-match-error'=>'Whoops, these don\'t match!')); ?>
+	<?php echo Form::input('password','',array('label'=>'Password','divclass'=>'col-md-3','placeholder'=>'Login Password','type'=>'password','required','id'=>'password','data-minlength'=>8)); ?>
+	<?php echo Form::input('password_confirm','',array('label'=>'Confirm','divclass'=>'col-md-3','placeholder'=>'Confirm Password','type'=>'password','required','data-match'=>'#password','data-match-error'=>'Whoops, these don\'t match!')); ?>
 </fieldset>
 
 <div class="row">