More minor updates

This commit is contained in:
Deon George 2014-10-10 16:35:02 +11:00
parent 9302b51ebb
commit f7567dc250
4 changed files with 18 additions and 12 deletions

View File

@ -10,9 +10,11 @@
* @license http://dev.leenooks.net/license.html * @license http://dev.leenooks.net/license.html
*/ */
abstract class lnApp_Controller_User_Account extends Controller_Account { abstract class lnApp_Controller_User_Account extends Controller_Account {
protected $auth_required = TRUE;
protected $secure_actions = array( protected $secure_actions = array(
'edit'=>TRUE, 'edit'=>0,
'resetpassword'=>TRUE, 'resetpassword'=>0,
); );
/** /**

View File

@ -12,6 +12,10 @@
abstract class lnApp_Controller_User_Welcome extends Controller_Welcome { abstract class lnApp_Controller_User_Welcome extends Controller_Welcome {
protected $auth_required = TRUE; protected $auth_required = TRUE;
protected $secure_actions = array(
'index'=>0,
);
public function action_index() { public function action_index() {
throw HTTP_Exception::factory(500,'Site not setup!'); throw HTTP_Exception::factory(500,'Site not setup!');
} }

View File

@ -1,7 +1,7 @@
<fieldset> <fieldset>
<legend>Account Details</legend> <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"> <div class="form-group">
<label class="col-md-2 control-label" for="Title">Name</label> <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)); ?> <?php echo Form::select('title',StaticList_Title::table(),$o->display('title'),array('class'=>'form-control','required','nocg'=>TRUE)); ?>
</div> </div>
<div class="col-md-2"> <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>
<div class="col-md-3"> <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>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-2 control-label" for="address1">Address</label> <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> <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> <label class="col-md-2 control-label" for="city"></label>
<div class="row"> <div class="row">
<div class="col-md-3"> <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>
<div class="col-md-1"> <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>
<div class="col-md-1"> <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> </div>
</div> </div>

View File

@ -1,8 +1,8 @@
<fieldset> <fieldset>
<legend>Reset Password</legend> <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','',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','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_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> </fieldset>
<div class="row"> <div class="row">