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

Many updates as a result of updating lnapp; added SSL service order

Browse Source
This commit is contained in:
Deon George
2016-06-05 22:33:12 +10:00
parent 44769e3de7
commit 0c7fe830a3
25 changed files with 384 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/classes/Controller/Admin/Module.php
View File

@@ -137,7 +137,7 @@ class Controller_Admin_Module extends Controller_Module {
Block::factory()
->title(sprintf('%s: %s ',_('Defined Module Methods For'),$mo->display('name')))
->title_icon('icon-cog')
->title_icon('fa fa-cog')
->body(Table::factory()
->data($methods['exist'])
->columns(array(
@@ -154,7 +154,7 @@ class Controller_Admin_Module extends Controller_Module {
Block::factory()
->title(sprintf('%s: %s ',_('Missing Module Methods For'),$mo->display('name')))
->title_icon('icon-exclamation-sign')
->title_icon('fa fa-question')
->body(Table::factory()
->data($methods['missing'])
->columns(array(
@@ -173,7 +173,7 @@ class Controller_Admin_Module extends Controller_Module {
public function action_list() {
Block::factory()
->title('Defined Modules')
->title_icon('icon-cog')
->title_icon('fa fa-cog')
->body(Table::factory()
->data(ORM::factory('Module')->where('parent_id','is',NULL)->find_all())
->jssort(TRUE)

8
application/classes/Controller/Admin/Module/Method.php
View File

@@ -37,7 +37,7 @@ class Controller_Admin_Module_Method extends Controller_Admin_Module {
Block::factory()
->title(sprintf(_('Add Method (%s) to Database for (%s)'),strtoupper($method),strtoupper($mo->name)))
->title_icon('icon-plus-sign')
->title_icon('fa fa-plus')
->type('form-horizontal')
->body(View::factory('module/method/admin/add')
->set('name',$method)
@@ -99,11 +99,9 @@ class Controller_Admin_Module_Method extends Controller_Admin_Module {
Block::factory()
->title(sprintf(_('Configure access to method (%s::%s)'),$mmo->controller(),$mmo->method()))
->title_icon('icon-plus-sign')
->title_icon('fa fa-lock')
->type('form')
->body(View::factory('module/method/admin/edit')
->set('o',$mmo)
);
->body(View::factory('module/method/admin/edit')->set('o',$mmo));
}
}
?>

2
application/classes/Menu.php
View File

@@ -30,7 +30,7 @@ class Menu extends lnApp_Menu {
return $result;
}
public static function items($type) {
public static function items($type,array $list=array()) {
$result = array();
if (empty(URL::$method_directory[$type]))

8
application/classes/ORM.php
View File

@@ -55,7 +55,6 @@ abstract class ORM extends lnApp_ORM {
/**
* Determine if the account is authoised by the user
*/
// @todo This function shouldnt be here.
public function authorised(Model $o=NULL,Model_Account $ao=NULL,$aid='account_id') {
if (is_null($o))
$o = $this;
@@ -147,6 +146,13 @@ abstract class ORM extends lnApp_ORM {
return ORM::factory('Module',array('name'=>$this->_table_name));
}
/**
* Name value return for the record
*/
public function name() {
return sprintf('Unknown [%s]',$this->id);
}
/**
* Set the site ID attribute for each row update
*/

3
application/views/account/reseller/view.php Normal file
View File

@@ -0,0 +1,3 @@
<?php echo View::factory('service/user/list')->set('o',$o); ?>
<?php echo View::factory('invoice/user/list/due')->set('o',$o); ?>
<?php echo View::factory('service/user/list/expiring')->set('o',$o); ?>

80
application/views/module/method/admin/edit.php
View File

@@ -1,42 +1,44 @@
<div class="span5">
<fieldset>
<legend>Method Details</legend>
<div class="row">
<div class="col-md-3">
<fieldset>
<legend>Method Details</legend>
<?php echo Form::input('notes',$o->notes,array('label'=>'Description','placeholder'=>'Method Description','class'=>'span5')); ?>
<?php echo Form::input('menu_display',$o->menu_display,array('label'=>'Menu Title','placeholder'=>'Menu Title')); ?>
<?php echo Form::input('notes',$o->notes,array('label'=>'Description','placeholder'=>'Method Description')); ?>
<?php echo Form::input('menu_display',$o->menu_display,array('label'=>'Menu Title','placeholder'=>'Menu Title')); ?>
</fieldset>
</div> <!-- /span -->
<div class="span6">
<fieldset>
<legend>Method Security</legend>
<table class="table table-striped table-condensed table-hover" id="list-table">
<thead><tr>
<th>Method</th>
<th>Notes</th>
<th>Group Active</th>
<th>Method Enable</th>
</tr></thead>
<tbody>
<?php foreach (ORM::factory('Group')->find_all() as $go) : ?>
<tr>
<td><?php echo HTML::anchor(URL::link('admin','group/edit/'.$go->id,TRUE),$go->display('name')); ?></td>
<td><?php echo $go->display('notes'); ?></td>
<td><?php echo $go->display('status'); ?></td>
<td><?php echo Form::checkbox('groups[]',$go->id,$o->has('group',$go)); ?></td>
</tr>
<?php endforeach ?>
</tbody>
</table>
</fieldset>
<div class="row">
<div class="offset2">
<button type="submit" class="btn btn-primary">Save changes</button>
<button type="button" class="btn">Cancel</button>
</div>
</fieldset>
</div>
</div> <!-- /span -->
<div class="col-md-7">
<fieldset>
<legend>Method Security</legend>
<table class="table table-striped table-condensed table-hover" id="list-table">
<thead><tr>
<th>Method</th>
<th>Notes</th>
<th>Group Active</th>
<th>Method Enable</th>
</tr></thead>
<tbody>
<?php foreach (ORM::factory('Group')->find_all() as $go) : ?>
<tr>
<td><?php echo HTML::anchor(URL::link('admin','group/edit/'.$go->id,TRUE),$go->display('name')); ?></td>
<td><?php echo $go->display('notes'); ?></td>
<td><?php echo $go->display('status'); ?></td>
<td><?php echo Form::checkbox('groups[]',$go->id,$o->has('group',$go),array('nocg'=>TRUE)); ?></td>
</tr>
<?php endforeach ?>
</tbody>
</table>
</fieldset>
</div>
</div>
<div class="row">
<div class="col-md-4">
<button type="submit" class="btn btn-primary">Save changes</button>
<button type="button" class="btn">Cancel</button>
</div>
</div>

2
application/views/userguide/template.php
View File

@@ -17,7 +17,7 @@
<div id="kodoc-header">
<div class="container">
<a href="http://dev.leenooks.vpn/" id="kodoc-logo">
<a href="http://dev.leenooks.net/" id="kodoc-logo">
<img src="<?php echo Route::url('docs/media', array('file' => 'img/logo-small.png')) ?>" />
</a>
<div id="kodoc-menu">

3
application/views/welcome/user/view.php Normal file
View File

@@ -0,0 +1,3 @@
<?php echo View::factory('service/user/list')->set('o',$o); ?>
<?php echo View::factory('invoice/user/list/due')->set('o',$o); ?>
<?php echo View::factory('service/user/list/expiring')->set('o',$o); ?>