deon/lnapp
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor internal fixes

Browse Source
This commit is contained in:
Deon George
2014-10-04 00:35:26 +10:00
parent a7ed6672e1
commit f679bf9c06
9 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
views/account/user/edit.php
View File

@@ -1,8 +1,6 @@
<fieldset>
<legend>Account Details</legend>
<?php echo Form::input('date_last',$o->date_last ? $o->display('date_last') : Site::date(time()),array('label'=>'Last Updated','class'=>'col-md-2','disabled')); ?>
<?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')); ?>
<div class="form-group">

2
views/login/activate.php
View File

@@ -10,7 +10,7 @@
<?php else : ?>
<div class="input-group col-md-3">
<span class="input-group-addon"><i class="fa fa-envelope fa-fw"></i></span>
<input type="email" id="email" name="email" value="" placeholder="Email" class="form-control" required />
<input type="email" id="email" name="email" value="<?php echo $email; ?>" placeholder="Email" class="form-control" required />
</div>
<?php endif ?>

12
views/theme/baseadmin/page.php
View File

@@ -67,12 +67,12 @@
<ul class="mainnav">
<li><a href="<?php echo array_key_exists('auth',Kohana::modules()) ? URL::link('user','welcome',TRUE) : URL::site('welcome'); ?>"><i class="fa fa-home"></i><span>Home</span></a></li>
<?php if (array_key_exists('auth',Kohana::modules()) AND ($ao = Auth::instance()->get_user()) AND $ao->isAdmin()) : ?>
<li><a href="<?php echo URL::link('admin','welcome',TRUE); ?>"><i class="fa fa-tasks"></i><span>Admin</span></a></li>
<?php endif ?>
<?php foreach (Menu::mainnav() as $name => $attributes) : ?>
<li><a href="<?php echo Arr::get($attributes,'url'); ?>"><i class="fa <?php echo Arr::get($attributes,'icon','fa-asterisk'); ?>"></i><span><?php echo $name; ?></span></a></li>
<?php endforeach ?>
<?php if (array_key_exists('auth',Kohana::modules()) AND ($ao = Auth::instance()->get_user()) AND $ao->isAdmin()) : ?>
<li><a href="<?php echo URL::link('admin','welcome',TRUE); ?>"><i class="fa fa-tasks"></i><span>Admin</span></a></li>
<?php endif ?>
<?php foreach (Menu::mainnav() as $name => $attributes) : ?>
<li><a href="<?php echo Arr::get($attributes,'url'); ?>"><i class="fa <?php echo Arr::get($attributes,'icon','fa-asterisk'); ?>"></i><span><?php echo $name; ?></span></a></li>
<?php endforeach ?>
</ul>
</div> <!-- /.subnav-collapse -->
</div> <!-- /container -->

10
views/theme/focusbusiness/page.php
View File

@@ -44,6 +44,16 @@
</div> <!-- /nav -->
<?php endif ?>
<div class="error-container">
<div class="error_details">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<?php echo SystemMessage::factory()->render_all(); ?>
</div>
</div> <!-- /row -->
</div> <!-- /error_details -->
</div> <!-- /error_container -->
<div id="content">
<?php echo $content; ?>
</div> <!-- /content -->