',$s));
- # In case there any style sheets or scrpits for this render.
+ // In case there any style sheets for this render.
$this->response->bodyadd(Style::factory());
- # Get the response body
+ // In case there any javascript for this render.
+ $this->response->bodyadd(Script::factory());
+
+ // Get the response body
$this->response->bodyadd(sprintf('
%s
',$this->template->content));
}
diff --git a/application/classes/controller/lnapp/tree.php b/application/classes/controller/lnapp/tree.php
index bc04e004..02c8629f 100644
--- a/application/classes/controller/lnapp/tree.php
+++ b/application/classes/controller/lnapp/tree.php
@@ -17,10 +17,10 @@ class Controller_lnApp_Tree extends Controller_Default {
protected static $jsmediaroute = 'default/media';
public function after() {
- parent::after();
-
$this->response->headers('Content-Type','application/json');
$this->response->body(sprintf('[%s]',json_encode($this->output)));
+
+ parent::after();
}
public static function js() {
diff --git a/application/classes/lnapp/block/sub.php b/application/classes/lnapp/block/sub.php
index 0f0f781e..4b02a6b8 100644
--- a/application/classes/lnapp/block/sub.php
+++ b/application/classes/lnapp/block/sub.php
@@ -86,7 +86,7 @@ class lnApp_Block_Sub extends HTMLRender {
// Render our output.
$output .= '
';
return $output;
diff --git a/application/classes/lnapp/table.php b/application/classes/lnapp/table.php
index e8acb547..03aa3404 100644
--- a/application/classes/lnapp/table.php
+++ b/application/classes/lnapp/table.php
@@ -12,52 +12,242 @@
* @uses Style
*/
class lnApp_Table {
- public static function limit($data,$rows,array $cols,$other) {
+ public static function resolve($d,$key) {
+ if (is_array($d) AND isset($d[$key]))
+ $x = $d[$key];
+ // If the key is a method, we need to eval it
+ elseif (preg_match('/\(/',$key))
+ eval("\$x = \$d->$key;");
+ elseif (preg_match('/^__VALUE__$/',$key))
+ $x = $d;
+ else
+ $x = $d->display($key);
+
+ return $x;
+ }
+
+ public static function display($data,$rows,array $cols,array $option) {
if (! (array)$data)
return '';
- $output = '';
+ $pag = NULL;
+ $view = $output = '';
- $other = $i = 0;
- $output = '
';
- $output .= '
'.implode('
',array_keys($cols)).'
';
- foreach ($data as $do) {
- if ($i++ < $rows) {
- $output .= '
';
+ if (isset($option['type']) AND $option['type'])
+ switch ($option['type']) {
+ case 'select':
+ $view = 'table/select';
- foreach (array_values($cols) as $col) {
- if (is_array($do) AND isset($do[$col]))
- $x = $do[$col];
- // If the col is a method, we need to eval it
- elseif (preg_match('/\(/',$col))
- eval("\$x = \$do->$col;");
- else
- $x = $do->{$col};
-
- $output .= sprintf('
%s
',$x);
+ Script::add(array(
+ 'type'=>'stdin',
+ 'data'=>'
+(function($) {
+ // Enable Range Selection
+ $.fn.enableCheckboxRangeSelection = function() {
+ var lastCheckbox = null;
+ var followOn = 0;
+ var $spec = this;
+ $spec.bind("click", function(e) {
+ if (lastCheckbox != null && e.shiftKey) {
+ x = y = 0;
+ if (followOn != 0) {
+ if ($spec.index(lastCheckbox) < $spec.index(e.target)) {
+ x = 1 - ((followOn == 1) ? 1 : 0);
+ } else {
+ y = 1 - ((followOn == -1) ? 1 : 0);
+ }
}
- $output .= '
@@ -86,7 +86,7 @@
items_sub($item->service_id) as $subitem) {
+ foreach ($io->items_sub($item->service_id) as $subitem) {
if (! is_null($subitem->module_id)) {
$m = StaticList_Module::record('module','name','id',$subitem->module_id);
// @todo Need to remove the explicit test for 'charge' and be more dynamic
@@ -109,14 +109,14 @@
-
items_service_tax($item->service_id));?>
+
items_service_tax($item->service_id));?>
items_sub(NULL) as $subitem) {
+ foreach ($io->items_sub(NULL) as $subitem) {
if (! is_null($subitem->module_id)) {
$m = StaticList_Module::record('module','name','id',$subitem->module_id);
// @todo Need to remove the explicit test for 'charge' and be more dynamic
@@ -142,13 +142,13 @@
Sub Total:
-
subtotal(TRUE); ?>
+
subtotal(TRUE); ?>
Taxes Included:
tax_summary() as $tid => $amount) {
+ foreach ($io->tax_summary() as $tid => $amount) {
$m = ORM::factory('tax',$tid);
?>
@@ -160,12 +160,12 @@
Total:
-
total(TRUE); ?>
+
total(TRUE); ?>
-
id,'Download detailed invoice'); ?>
+
id,'Download detailed invoice'); ?>
diff --git a/modules/module/classes/controller/admin/module.php b/modules/module/classes/controller/admin/module.php
index 638fa4cd..6ddc6a0c 100644
--- a/modules/module/classes/controller/admin/module.php
+++ b/modules/module/classes/controller/admin/module.php
@@ -12,6 +12,7 @@
*/
class Controller_Admin_Module extends Controller_TemplateDefault_Admin {
protected $secure_actions = array(
+ 'add'=>TRUE,
'edit'=>TRUE,
'list'=>TRUE,
);
@@ -47,30 +48,32 @@ class Controller_Admin_Module extends Controller_TemplateDefault_Admin {
* List our installed modules
*/
public function action_list() {
- $modules = ORM::factory('module');
-
- $output = '';
-
- $output .= View::factory('module/admin/list_header');
- foreach ($modules->find_all() as $mo) {
- $output .= View::factory('module/admin/list_body')
- ->set('module',$mo);
- }
- $output .= View::factory('module/admin/list_footer');
+ $mo = ORM::factory('module');
Block::add(array(
- 'title'=>_('Currently installed modules'),
- 'body'=>$output,
- ));
+ 'title'=>sprintf('%s: %s - %s',_('Email For'),$this->ao->accnum(),$this->ao->name(TRUE)),
+ 'body'=>Table::display(
+ $mo->find_all(),
+ 25,
+ array(
+ 'id'=>array('label'=>'ID','url'=>'admin/module/edit/'),
+ 'name'=>array('label'=>'Name'),
+ 'status'=>array('label'=>'Active'),
+ ),
+ array(
+ 'page'=>TRUE,
+ 'type'=>'list',
+ )),
+ ));
}
/**
* Edit a Module Configuration
*
- * @param int $mid Module ID
* @todo Highlight those methods that have security, but the class does not have auth_required set to YES or the method isnt defined in secure_actions
*/
- public function action_edit($mid) {
+ public function action_edit() {
+ $mid = $this->request->param('id');
$mo = ORM::factory('module',$mid);
if (! $mo->loaded()) {
@@ -87,35 +90,42 @@ class Controller_Admin_Module extends Controller_TemplateDefault_Admin {
$methods = $this->_methods($mo->name);
// Show methods defined in the DB already.
- $output .= View::factory('module/admin/method_list_header');
- foreach ($mo->module_method->find_all() as $meo) {
+ Block::add(array(
+ 'title'=>sprintf('%s: %s ',_('Defined Module Methods For'),$mo->display('name')),
+ 'body'=>Table::display(
+ $mo->module_method->find_all(),
+ 25,
+ array(
+ 'id'=>array('label'=>'ID','url'=>'admin/module_method/edit/'),
+ 'name'=>array('label'=>'Name'),
+ 'notes'=>array('label'=>'Notes'),
+ 'menu_display'=>array('label'=>'Menu'),
+ ),
+ array(
+ 'page'=>TRUE,
+ 'type'=>'list',
+ )),
+ ));
+
+ // Show new methods NOT defined in the DB already.
+ foreach ($mo->module_method->find_all() as $meo)
if (($method = array_search($meo->name,$methods)) !== false)
unset($methods[$method]);
- $output .= View::factory('module/admin/method_list_body')
- ->set('method',$meo)
- ->set('module',$mo)
- ->set('defined',$method !== false);
- }
-
- $output .= View::factory('module/admin/method_list_spacer');
-
- // Show new methods NOT defined in the DB already.
- foreach ($methods as $method) {
- $meo = ORM::factory('module_method')
- ->values(array('name'=>$method,'notes'=>_('Not defined in DB')));
-
- $output .= View::factory('module/admin/method_list_body')
- ->set('method',$meo)
- ->set('module',$mo)
- ->set('defined',$method === false);
- }
- $output .= View::factory('module/admin/method_list_footer');
-
- Block::add(array(
- 'title'=>sprintf(_('%s Methods'),strtoupper($mo->name)),
- 'body'=>$output,
- ));
+ if (count($methods))
+ Block::add(array(
+ 'title'=>sprintf('%s: %s ',_('Undefined Module Methods For'),$mo->display('name')),
+ 'body'=>Table::display(
+ $methods,
+ 25,
+ array(
+ '__VALUE__'=>array('label'=>'Name','url'=>sprintf('admin/module_method/add/%s/',$mo->id)),
+ ),
+ array(
+ 'page'=>TRUE,
+ 'type'=>'list',
+ )),
+ ));
}
}
?>
diff --git a/modules/module/classes/controller/admin/module/method.php b/modules/module/classes/controller/admin/module/method.php
index 369f263e..b97f615a 100644
--- a/modules/module/classes/controller/admin/module/method.php
+++ b/modules/module/classes/controller/admin/module/method.php
@@ -10,7 +10,7 @@
* @copyright (c) 2010 Deon George
* @license http://dev.leenooks.net/license.html
*/
-class Controller_Admin_Module_Method extends Controller_Module {
+class Controller_Admin_Module_Method extends Controller_Admin_Module {
/**
* Add a method to the database
*/
@@ -63,7 +63,8 @@ class Controller_Admin_Module_Method extends Controller_Module {
*
* @param int $mid Module ID
*/
- public function action_edit($mid) {
+ public function action_edit() {
+ $mid = $this->request->param('id');
$mmo = ORM::factory('module_method',$mid);
if (! $mmo->loaded()) {
@@ -114,13 +115,13 @@ class Controller_Admin_Module_Method extends Controller_Module {
$output .= Form::open();
- $output .= View::factory('module/admin/method_detail_header');
+ $output .= View::factory('module/admin/method_detail_head');
foreach ($groups->find_all() as $go) {
$output .= View::factory('module/admin/method_detail_body')
->set('group',$go)
->set('defined',$mmo->has('group',$go));
}
- $output .= View::factory('module/admin/method_detail_footer');
+ $output .= View::factory('module/admin/method_detail_foot');
$output .= '