Some cleanup, setup improvements and other misc items
This commit is contained in:
Deon George
@@ -1,46 +1,44 @@
|
||||
<!-- @todo NEEDS TO BE TRANSLATED -->
|
||||
<table class="box-full">
|
||||
<tr>
|
||||
<td class="head" style="width: 25%;">Site Name</td>
|
||||
<td style="width: 75%;"><?php echo Form::input('site_details[name]',$o->site_details('name')); ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="head">Site Address 1</td>
|
||||
<td><?php echo Form::input('site_details[address1]',$o->site_details('address1')); ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="head">Site Address 2</td>
|
||||
<td><?php echo Form::input('site_details[address2]',$o->site_details('address2')); ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="head">City</td>
|
||||
<td><?php echo Form::input('site_details[city]',$o->site_details('city')); ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="head">State</td>
|
||||
<td><?php echo Form::input('site_details[state]',$o->site_details('state')); ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="head">Postal Code</td>
|
||||
<td><?php echo Form::input('site_details[pcode]',$o->site_details('pcode')); ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="head">Country</td>
|
||||
<td><?php echo Form::select('country_id',ORM::factory('Country')->list_select(),$o->country_id,array('label'=>'Country','required')); ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="spacer" colspan="2"> </td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="head">Phone</td>
|
||||
<td><?php echo Form::input('site_details[phone]',$o->site_details('phone')); ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="head">Fax</td>
|
||||
<td><?php echo Form::input('site_details[fax]',$o->site_details('fax')); ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="head">Email</td>
|
||||
<td><?php echo Form::input('site_details[email]',$o->site_details('email')); ?></td>
|
||||
</tr>
|
||||
</table>
|
||||
<div class="row">
|
||||
<div class="span10 offset1">
|
||||
<fieldset>
|
||||
<legend>Application Setup</legend>
|
||||
|
||||
<?php echo Form::input('site_details[name]',$o->site_details('name'),array('label'=>'Site Name','class'=>'input-xxlarge','placeholder'=>'Site Name','required')); ?>
|
||||
|
||||
<?php echo Form::input('site_details[address1]',$o->site_details('address1'),array('label'=>'Address','class'=>'input-xxlarge','placeholder'=>'Address','required')); ?>
|
||||
|
||||
<?php echo Form::input('site_details[address2]',$o->site_details('address2')); ?>
|
||||
|
||||
<div class="row">
|
||||
<div class="span3">
|
||||
<?php echo Form::input('site_details[city]',$o->site_details('city'),array('label'=>'City','placeholder'=>'City','required')); ?>
|
||||
</div>
|
||||
|
||||
<div class="span1">
|
||||
<?php echo Form::input('site_details[state]',$o->site_details('state'),array('label'=>'','class'=>'input-mini','placeholder'=>'State','required')); ?>
|
||||
</div>
|
||||
|
||||
<div class="span1">
|
||||
<?php echo Form::input('site_details[pcode]',$o->site_details('pcode'),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::input('site_details[phone]',$o->site_details('phone'),array('label'=>'Phone','type'=>'tel','class'=>'input-medium','placeholder'=>'Phone','required')); ?>
|
||||
|
||||
<?php echo Form::input('site_details[fax]',$o->site_details('fax'),array('label'=>'Fax','type'=>'tel','class'=>'input-medium','placeholder'=>'Fax','required')); ?>
|
||||
|
||||
<?php echo Form::input('site_details[email]',$o->site_details('email'),array('label'=>'Email','type'=>'email','class'=>'input-large','placeholder'=>'Email','required')); ?>
|
||||
|
||||
<?php echo Form::input('site_details[faqurl]',$o->site_details('faqurl'),array('label'=>'FAQ Url','type'=>'url','class'=>'input-xxlarge','placeholder'=>'FAQ Url')); ?>
|
||||
|
||||
<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> <!-- /span -->
|
||||
</div> <!-- /row -->
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
<tr>
|
||||
<td colspan="2"><div id="<?php echo $mo->name; ?>"></div></td>
|
||||
</tr>
|
||||
@@ -1 +0,0 @@
|
||||
</table>
|
||||
@@ -1 +0,0 @@
|
||||
<table class="box-full">
|
||||
30
application/views/setup/admin/module.php
Normal file
30
application/views/setup/admin/module.php
Normal file
@@ -0,0 +1,30 @@
|
||||
<div class="row">
|
||||
<div class="span10 offset1">
|
||||
<div class="row">
|
||||
<div class="tabbable span9">
|
||||
<ul class="nav nav-tabs">
|
||||
<?php $c=0;foreach ($o->module_config_id($mid) as $id => $data) : ?>
|
||||
<li class="<?php echo $c++ ? '' : 'active'; ?>"><a href="#tab<?php echo $c; ?>" data-toggle="tab"><?php echo $data['object']->display('name'); ?></a></li>
|
||||
<?php endforeach ?>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content">
|
||||
<?php $c=0;foreach ($o->module_config_id($mid) as $id => $data) : ?>
|
||||
<div class="tab-pane <?php echo $c++ ? '' : 'active'; ?>" id="tab<?php echo $c; ?>">
|
||||
<?php foreach ($data['data'] as $k => $v) : ?>
|
||||
<?php echo Form::input('module_config['.$id.']['.$k.']',$v,array('label'=>$k,'placeholder'=>$k)); ?>
|
||||
<?php endforeach ?>
|
||||
</div> <!-- /tab-pane -->
|
||||
<?php endforeach ?> <!-- /StaticList_RecurSchedule -->
|
||||
</div> <!-- /tab-content -->
|
||||
</div> <!-- /tabbable -->
|
||||
</div> <!-- /row -->
|
||||
|
||||
<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>
|
||||
</div> <!-- /span -->
|
||||
</div> <!-- /row -->
|
||||
@@ -1,5 +0,0 @@
|
||||
<tr>
|
||||
<td class="head" style="font-size: 75%;"><?php echo $key; ?></td>
|
||||
<td><?php echo Form::input('module_config['.$module.']['.$key.']',$val); ?></td>
|
||||
<td><?php echo $info; ?></td>
|
||||
</tr>
|
||||
@@ -1 +0,0 @@
|
||||
</table>
|
||||
@@ -1 +0,0 @@
|
||||
<table class="box-full">
|
||||
131
application/views/theme/baseadmin/page.php
Normal file
131
application/views/theme/baseadmin/page.php
Normal file
@@ -0,0 +1,131 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<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(); ?>" />
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
|
||||
<?php
|
||||
if (Kohana::$environment >= Kohana::TESTING OR Request::current()->secure()) {
|
||||
echo HTML::style('media/theme/bootstrap/css/bootstrap.min.css');
|
||||
echo HTML::style('media/theme/bootstrap/css/bootstrap-responsive.min.css');
|
||||
echo HTML::style('media/vendor/font-awesome/css/font-awesome.min.css');
|
||||
// @todo Work out how to delay this loading until required
|
||||
echo HTML::style('media/theme/bootstrap/vendor/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5-0.0.2.css');
|
||||
} else {
|
||||
echo HTML::style($meta->secure().'netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap.min.css');
|
||||
echo HTML::style($meta->secure().'netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css');
|
||||
echo HTML::style($meta->secure().'netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css');
|
||||
// @todo Work out how to delay this loading until required
|
||||
echo HTML::style($meta->secure().'cdn.jsdelivr.net/bootstrap.wysihtml5/0.0.2/bootstrap-wysihtml5-0.0.2.css');
|
||||
}
|
||||
|
||||
echo HTML::style($meta->secure().'fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,800italic,400,600,800');
|
||||
echo HTML::style('media/css/ui-lightness/jquery-ui-1.10.0.custom.min.css');
|
||||
echo HTML::style('media/theme/baseadmin/css/base-admin-2.css');
|
||||
echo HTML::style('media/theme/baseadmin/css/base-admin-2-responsive.css');
|
||||
echo HTML::style('media/theme/baseadmin/css/custom.css');
|
||||
echo Style::factory()->render_all();
|
||||
?>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<?php if (! empty($shownavbar)) : ?>
|
||||
<div class="navbar navbar-inverse navbar-fixed-top">
|
||||
<div class="navbar-inner">
|
||||
<div class="container">
|
||||
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-cog"></i> </a>
|
||||
<a class="brand" href="<?php echo URL::site(); ?>"><?php echo Config::sitename(); ?><sup></sup></a>
|
||||
|
||||
<div class="nav-collapse collapse">
|
||||
<ul class="nav pull-right">
|
||||
<?php echo $navbar; ?>
|
||||
</ul>
|
||||
|
||||
<form class="navbar-search pull-right">
|
||||
<input type="text" name="search-query" class="search-query" placeholder="Search" data-provide="typeahead">
|
||||
</form>
|
||||
</div><!--/.nav-collapse -->
|
||||
|
||||
</div> <!-- /container -->
|
||||
</div> <!-- /navbar-inner -->
|
||||
</div> <!-- /nvarbar -->
|
||||
|
||||
<div class="subnavbar">
|
||||
<div class="subnavbar-inner">
|
||||
<div class="container">
|
||||
<a class="btn-subnavbar collapsed" data-toggle="collapse" data-target=".subnav-collapse">
|
||||
<i class="icon-reorder"></i>
|
||||
</a>
|
||||
|
||||
<div class="subnav-collapse collapse">
|
||||
<ul class="mainnav">
|
||||
<li class="">
|
||||
<a href="<?php echo URL::link('user','welcome',TRUE); ?>"><i class="icon-home"></i> <span>Home</span></a>
|
||||
</li>
|
||||
<?php if (($ao = Auth::instance()->get_user()) AND $ao->isAdmin()) : ?>
|
||||
<li class="">
|
||||
<a href="<?php echo URL::link('reseller','welcome',TRUE); ?>"><i class="icon-tasks"></i> <span>Admin</span></a>
|
||||
</li>
|
||||
<?php elseif ($ao->isReseller()) : ?>
|
||||
<li class="">
|
||||
<a href="<?php echo URL::link('reseller','welcome',TRUE); ?>"><i class="icon-tasks"></i> <span>Reseller</span></a>
|
||||
</li>
|
||||
<?php endif ?>
|
||||
</ul>
|
||||
</div> <!-- /.subnav-collapse -->
|
||||
</div> <!-- /container -->
|
||||
</div> <!-- /subnavbar-inner -->
|
||||
</div> <!-- /subnavbar -->
|
||||
<?php endif ?>
|
||||
|
||||
<div class="error_container">
|
||||
<div class="error_details">
|
||||
<div class="row">
|
||||
<div class="span10 offset2">
|
||||
<?php echo SystemMessage::factory()->render_all(); ?>
|
||||
</div>
|
||||
</div> <!-- /row -->
|
||||
</div> <!-- /error_details -->
|
||||
</div> <!-- /error_container -->
|
||||
|
||||
<div class="main">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<?php echo $content; ?>
|
||||
</div> <!-- /row -->
|
||||
</div> <!-- /container -->
|
||||
</div> <!-- /main -->
|
||||
|
||||
<?php
|
||||
if (Kohana::$environment >= Kohana::TESTING OR Request::current()->secure()) {
|
||||
echo HTML::script('media/js/jquery/jquery-1.9.1.min.js');
|
||||
echo HTML::script('media/theme/bootstrap/js/bootstrap.min.js');
|
||||
// @todo Work out how to delay this loading until required
|
||||
echo HTML::script('media/theme/bootstrap/vendor/bootstrap-wysihtml5-0.0.2/libs/js/wysihtml5-0.3.0_rc2.min.js');
|
||||
echo HTML::script('media/theme/bootstrap/vendor/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5-0.0.2.min.js');
|
||||
echo HTML::script('media/js/lodash/lodash-1.2.1.min.js');
|
||||
} else {
|
||||
echo HTML::script($meta->secure().'code.jquery.com/jquery-1.9.1.min.js');
|
||||
echo HTML::script($meta->secure().'netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/js/bootstrap.min.js');
|
||||
// @todo Work out how to delay this loading until required
|
||||
echo HTML::script($meta->secure().'cdn.jsdelivr.net/wysihtml5/0.3.0/wysihtml5-0.3.0.min.js');
|
||||
echo HTML::script($meta->secure().'cdn.jsdelivr.net/bootstrap.wysihtml5/0.0.2/bootstrap-wysihtml5-0.0.2.min.js');
|
||||
echo HTML::script($meta->secure().'cdnjs.cloudflare.com/ajax/libs/lodash.js/1.2.1/lodash.min.js');
|
||||
}
|
||||
|
||||
echo HTML::script('media/theme/baseadmin/js/backtotop.js');
|
||||
echo HTML::script('media/js/search.js');
|
||||
echo HTML::script('media/js/custom.js');
|
||||
echo Script::factory()->render_all();
|
||||
?>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1 +0,0 @@
|
||||
Welcome, please select from the menu on the left.
|
||||
@@ -1 +0,0 @@
|
||||
Welcome, please select from the menu on the left.
|
||||
Reference in New Issue
Block a user