Theme work with focusbusiness and baseadmin

Improvements to NAVBAR, updates to StaticList methods, other minor items
Enable product category rendering and other minor improvements
Added ADSL-large category price plan
This commit is contained in:
Deon George
2013-04-26 11:42:09 +10:00
parent f9fb355ab6
commit 29c1913f47
114 changed files with 1732 additions and 6797 deletions

View File

@@ -1,84 +1,61 @@
<!-- @todo NEEDS TO BE TRANSLATED -->
<?php echo Form::open(); ?>
<table class="box-center">
<tr>
<td class="head">Last Updated</td>
<td><?php echo $record->display('date_last'); ?></td>
</tr>
<tr>
<td class="head">User Name</td>
<td><b><?php echo $record->username; ?></b></td>
</tr>
<!-- //@todo This needs to be done somewhere else
<tr>
<td class="head">Password</td>
<td><input type="password" name="password" value=""/></td>
</tr>
<tr>
<td class="head">Confirm Password</td>
<td><input type="password" name="confirm_password" value=""/></td>
</tr>
-->
<tr>
<td class="head">Email</td>
<td><input type="text" name="email" value="<?php echo $record->email; ?>"/></td>
</tr>
<tr>
<td class="head">Company</td>
<td><input type="text" name="company" value="<?php echo $record->company; ?>"/></td>
</tr>
<tr>
<td class="head">First Name</td>
<td><input type="text" name="first_name" value="<?php echo $record->first_name; ?>"/></td>
</tr>
<tr>
<td class="head">Last Name</td>
<td><input type="text" name="last_name" value="<?php echo $record->last_name; ?>"/></td>
</tr>
<tr>
<td class="head">Title</td>
<td><?php echo $record->display('title'); ?></td>
</tr>
<tr>
<td class="head">Address</td>
<td><input type="text" name="address1" value="<?php echo $record->address1; ?>"/></td>
</tr>
<tr>
<td class="head">&nbsp;</td>
<td><input type="text" name="address2" value="<?php echo $record->address2; ?>"/></td>
</tr>
<tr>
<td class="head">City</td>
<td><input type="text" name="city" value="<?php echo $record->city; ?>"/></td>
</tr>
<tr>
<td class="head">State</td>
<td><input type="text" name="state" value="<?php echo $record->state; ?>"/></td>
</tr>
<tr>
<td class="head">Postal Code</td>
<td><input type="text" name="zip" value="<?php echo $record->zip; ?>"/></td>
</tr>
<tr>
<td class="head">Country</td>
<td><?php echo $record->country->display('name'); ?></td>
</tr>
<tr>
<td class="head">Language</td>
<td><?php echo $record->language->display('name'); ?></td>
</tr>
<tr>
<td class="head">Currency</td>
<td><?php echo $record->currency->display('name'); ?></td>
</tr>
<tr>
<!-- @todo NEEDS TO BE CONFIGURABLE -->
<td class="head">HTML Email</td>
<td>Yes</td>
</tr>
<!-- @todo OTHER STATIC VARS -->
<tr>
<td colspan="2" style="text-align: center;"><?php echo Form::submit('update','Update',array('class'=>'form_button')); ?></td>
</tr>
</table>
<?php echo Form::close(); ?>
<div class="row">
<div class="span10 offset1">
<fieldset>
<legend>Update Account Details</legend>
<?php echo Form::input('date_last',$o->display('date_last'),array('label'=>'Last Updated','disabled')); ?>
<?php echo Form::input('username',$o->display('username'),array('label'=>'User Name','disabled')); ?>
<?php echo Form::input('email',$o->display('email'),array('label'=>'Email','class'=>'input-xxlarge','placeholder'=>'Email Address','type'=>'email','required')); ?>
<div class="row">
<div class="span1">
<?php echo Form::select('title',StaticList_Title::table(),$o->display('title'),array('class'=>'input-small','label'=>'Title','required')); ?>
</div>
<div class="span2">
<?php echo Form::input('first_name',$o->display('first_name'),array('label'=>'','class'=>'input-medium','placeholder'=>'First Name','required')); ?>
</div>
<div class="span3">
<?php echo Form::input('last_name',$o->display('last_name'),array('label'=>'','class'=>'input-large','placeholder'=>'Last Name','required')); ?>
</div>
</div>
<?php echo Form::input('company',$o->display('company'),array('label'=>'Company','class'=>'input-xxlarge','placeholder'=>'Company Name')); ?>
<?php echo Form::input('address1',$o->display('address1'),array('label'=>'Address','class'=>'input-xxlarge','placeholder'=>'Address','required')); ?>
<?php echo Form::input('address2',$o->display('address2'),array('label'=>'','class'=>'input-xxlarge')); ?>
<div class="row">
<div class="span3">
<?php echo Form::input('city',$o->display('city'),array('label'=>'City','placeholder'=>'City','required')); ?>
</div>
<div class="span1">
<?php echo Form::input('state',$o->display('state'),array('label'=>'','class'=>'input-mini','placeholder'=>'State','required')); ?>
</div>
<div class="span1">
<?php echo Form::input('zip',$o->display('zip'),array('label'=>'','class'=>'input-mini','placeholder'=>'Post Code','required')); ?>
</div>
</div> <!-- /row -->
<?php echo Form::select('country_id',ORM::factory('Country')->list_select(),$o->country_id,array('label'=>'Country','required')); ?>
<?php echo Form::select('language_id',ORM::factory('Language')->list_select(),$o->language_id,array('label'=>'Language','required')); ?>
<?php echo Form::select('currency_id',ORM::factory('Currency')->list_select(),$o->currency_id,array('label'=>'Currency','required')); ?>
<div class="row">
<div class="offset2">
<button type="submit" class="btn btn-primary">Save changes</button>
<button type="button" class="btn">Cancel</button>
</div>
</div>
</fieldset>
</div> <!-- /span8 -->
</div> <!-- /row -->

View File

@@ -1,17 +1,16 @@
<!-- @todo NEEDS TO BE TRANSLATED -->
<br/>
<?php echo Form::open(); ?>
<table class="box-center">
<tr>
<td class="head">Password</td>
<td><input type="password" name="password" value=""/></td>
</tr>
<tr>
<td class="head">Confirm Password</td>
<td><input type="password" name="password_confirm" value=""/></td>
</tr>
<tr>
<td colspan="2" style="text-align: center;"><?php echo Form::submit('update','Update',array('class'=>'form_button')); ?></td>
</tr>
</table>
<?php echo Form::close(); ?>
<div class="row">
<div class="span8 offset1">
<fieldset>
<legend>Reset Password</legend>
<?php echo Form::input('password','',array('label'=>'Password','type'=>'password','required','minlength'=>8)); ?>
<?php echo Form::input('password_confirm','',array('label'=>'Confirm','type'=>'password','required','minlength'=>8)); ?>
<div class="row">
<div class="offset2">
<button type="submit" class="btn btn-primary">Update</button>
</div>
</div>
</fieldset>
</div>
</div>

View File

@@ -0,0 +1,10 @@
<?php foreach (array('user'=>Auth::instance()->get_user()->name(),'reseller'=>'Reseller','affiliate'=>'Affiliate','admin'=>'Administrator') as $type => $ddname) : ?>
<?php if ($x = Menu::items($type)) : ?>
<ul class="nav pull-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-user"></i> <?php echo $ddname; ?> <b class="caret"></b></a>
<?php echo Menu::ul($x,$type == 'user' ? array('logout'=>'Logout') : NULL); ?>
</li>
</ul>
<?php endif ?>
<?php endforeach ?>

View File

@@ -1,115 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!-- YAML Template Layout for lnApp -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="auto" lang="auto">
<head>
<title><?php echo $meta->title; ?></title>
<link rel="shortcut icon" href="<?php echo $meta->shortcut_icon ? $meta->shortcut_icon : '/favicon.ico' ?>" type="image/vnd.microsoft.icon" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Language" content="<?php echo $meta->language; ?>" />
<meta name="keywords" content="<?php echo $meta->keywords; ?>" />
<meta name="description" content="<?php echo $meta->description; ?>" />
<meta name="copyright" content="<?php echo Config::copywrite(); ?>" />
<!-- JavaScript Detection -->
<script type="text/javascript">document.documentElement.className += " js";</script>
<?php echo HTML::style('media/theme/yaml/css/page.css'); ?>
<?php echo Style::factory(); ?>
<?php echo Script::factory(); ?>
</head>
<body>
<!-- begin: skip link navigation -->
<ul id="skiplinks">
<li><a class="skip" href="#nav">Skip to navigation (Press Enter).</a></li>
<li><a class="skip" href="#left">Skip to main content (Press Enter).</a></li>
</ul>
<!-- end: skip link navigation -->
<div id="page_margins">
<div id="page">
<div id="topnav">
<div class="langMenu">
<?php echo Country::icon(Config::country()); ?>
<span class="text"><?php echo Config::country()->display('name'); ?></span>
<!-- //@todo Enable contact form -->
<div style="display:none">
<span class="text2"> &#124; </span>
<?php echo HTML::anchor('contact','Contact Us'); ?>
</div>
<span class="text2"> &#124; </span>
<?php echo Config::login_uri(); ?>
</div>
<span><?php echo Company::instance()->name(); ?></span>
</div>
<div id="header">
<h1><span>&nbsp;</span>&nbsp;</h1>
</div>
<!-- begin: main navigation #nav -->
<div id="nav">
<div id="nav_main">
<ul>
<li id="current"><?php echo HTML::anchor('','Home'); ?></li>
<li><?php echo HTML::anchor('product/categorys','Products'); ?></li>
<li><?php echo HTML::anchor('http://helpdesk.graytech.net.au/otrs/faq.pl','FAQ'); ?></li>
</ul>
</div>
<div id="nav_main2">
<?php echo BreadCrumb::factory(); ?>
</div>
</div>
<!-- end: main navigation -->
<!-- begin: main content area #main -->
<table id="main">
<tr>
<!-- Left Pane -->
<td id="left" <?php echo $left ? '' : 'style="display: none;"'?>>
<!-- begin: #left - first float column -->
<div id="left_content" class="clearfix">
<?php echo $left; ?>
</div>
<!-- end: #left -->
</td>
<!-- Main Body Pane -->
<td id="center">
<!-- begin: #center static column -->
<div id="center_content" class="clearfix">
<!-- begin: info box -->
<?php if ((string)$sysmsg) { ?>
<div id="info_box" class="info" style="display:block;">
<?php echo $sysmsg; ?>
</div>
<?php } ?>
<!-- end: info box -->
<?php echo $content; ?>
<!-- Begin: IE Column Clearing -->
<div id="ie_clearing">&nbsp;</div>
<!-- End: IE Column Clearing -->
</div>
<!-- end: #center -->
</td>
<!-- Right Pane -->
<td id="right" <?php echo $right ? '' : 'style="display: none;"'?>>
<!-- begin: #right second float column -->
<div id="right_content" class="clearfix">
<?php echo $right; ?>
</div>
<!-- end: #right -->
</td>
</tr>
</table>
<!-- end: #main -->
<!-- begin: #footer -->
<div id="shadow"></div>
<div id="footer"><?php echo $footer; ?></div>
<!-- end: #footer -->
<div id="debug">
<?php if (Kohana::$environment == Kohana::DEVELOPMENT) { ?>
<div id="kohana-profiler" style="display: none;"><?php echo View::factory('profiler/stats'); ?></div>
<script type="text/javascript">$("#footer").click(function() {$('#kohana-profiler').toggle();});</script>
<?php }?>
<?php if (Kohana::$environment >= Kohana::STAGING) { ?>
<div id="kohana-session" style="display: none; text-align: left;"><?php echo Debug::vars(Session::instance()); ?></div>
<script type="text/javascript">$("#footer").click(function() {$('#kohana-session').toggle();});</script>
<?php }?>
</div>
</div>
</div>
</body>
</html>