|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [10346] Controller: Formatting |
| Date: | Thu, 25 Oct 2012 06:27:56 +0000 |
Revision: 10346
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10346
Author: vator
Date: 2012-10-25 06:27:55 +0000 (Thu, 25 Oct 2012)
Log Message:
-----------
Controller: Formatting
Modified Paths:
--------------
trunk/controller/inc/class.uicontrol.inc.php
trunk/controller/inc/class.uicontrol_item.inc.php
trunk/controller/inc/class.uicontrol_register_to_component.inc.php
trunk/controller/inc/class.uicontrol_register_to_location.inc.php
trunk/controller/inc/class.uidocument.inc.php
Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php 2012-10-24 20:11:46 UTC
(rev 10345)
+++ trunk/controller/inc/class.uicontrol.inc.php 2012-10-25 06:27:55 UTC
(rev 10346)
@@ -286,13 +286,13 @@
$data = array
(
- 'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 0),
- 'view'
=> "control_details",
- 'editable'
=> true,
- 'control'
=> ($control != null) ? $control->toArray() : null,
+ 'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 0),
+ 'view'
=> "control_details",
+ 'editable'
=> true,
+ 'control'
=> ($control != null) ? $control->toArray() : null,
'control_areas_array' =>
$control_areas_array,
'procedures_array' =>
$procedures_array,
- 'role_array' =>
$role_array,
+ 'role_array'
=> $role_array,
'repeat_type_array' =>
$repeat_type_array
);
@@ -411,7 +411,6 @@
phpgwapi_jquery::load_widget('core');
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
-// self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
self::render_template_xsl(array('control/control_tabs',
'control_group/control_groups'), $data);
}
@@ -600,9 +599,9 @@
$data = array
(
- 'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 3),
- 'view'
=> "sort_check_list",
- 'control'
=> $control->toArray(),
+ 'tabs'
=>
$GLOBALS['phpgw']->common->create_tabs($tabs, 3),
+ 'view'
=> "sort_check_list",
+ 'control'
=> $control->toArray(),
'saved_groups_with_items_array' =>
$saved_groups_with_items_array
);
@@ -622,7 +621,7 @@
$data = array
(
- 'control'
=> $control->toArray(),
+ 'control' => $control->toArray(),
);
self::render_template_xsl('control/control_details',
$data);
Modified: trunk/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_item.inc.php 2012-10-24 20:11:46 UTC
(rev 10345)
+++ trunk/controller/inc/class.uicontrol_item.inc.php 2012-10-25 06:27:55 UTC
(rev 10346)
@@ -52,14 +52,14 @@
public $public_functions = array
(
- 'index' => true,
- 'query' => true,
- 'edit' => true,
- 'view' => true,
- 'add' => true,
- 'save' => true,
+ 'index'
=> true,
+ 'query'
=> true,
+ 'edit'
=> true,
+ 'view'
=> true,
+ 'add'
=> true,
+ 'save'
=> true,
'display_control_items' => true,
- 'delete_item_list' => true
+ 'delete_item_list' => true
);
public function __construct()
@@ -242,9 +242,7 @@
$this->use_yui_editor(array('what_to_do','how_to_do'));
phpgwapi_jquery::load_widget('core');
-// self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
-// self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
self::render_template_xsl('control_item/control_item',
$data);
}
Modified: trunk/controller/inc/class.uicontrol_register_to_component.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_register_to_component.inc.php
2012-10-24 20:11:46 UTC (rev 10345)
+++ trunk/controller/inc/class.uicontrol_register_to_component.inc.php
2012-10-25 06:27:55 UTC (rev 10346)
@@ -55,12 +55,12 @@
var $public_functions = array
(
- 'index'
=> true,
- 'query'
=> true,
+ 'index'
=> true,
+ 'query'
=> true,
'edit_component'
=> true,
- 'get_location_category' => true,
- 'get_category_by_entity' => true,
- 'get_entity_table_def' => true,
+ 'get_location_category' => true,
+ 'get_category_by_entity' => true,
+ 'get_entity_table_def' => true,
);
function __construct()
@@ -73,17 +73,17 @@
$this->type_id =
$this->bo->type_id;
- $this->start =
$this->bo->start;
- $this->query =
$this->bo->query;
- $this->sort =
$this->bo->sort;
- $this->order =
$this->bo->order;
- $this->filter =
$this->bo->filter;
- $this->cat_id =
$this->bo->cat_id;
- $this->part_of_town_id =
$this->bo->part_of_town_id;
+ $this->start
= $this->bo->start;
+ $this->query
= $this->bo->query;
+ $this->sort
= $this->bo->sort;
+ $this->order
= $this->bo->order;
+ $this->filter
= $this->bo->filter;
+ $this->cat_id
= $this->bo->cat_id;
+ $this->part_of_town_id = $this->bo->part_of_town_id;
$this->district_id =
$this->bo->district_id;
- $this->status =
$this->bo->status;
- $this->allrows =
$this->bo->allrows;
- $this->lookup =
$this->bo->lookup;
+ $this->status
= $this->bo->status;
+ $this->allrows =
$this->bo->allrows;
+ $this->lookup
= $this->bo->lookup;
$this->location_code =
$this->bo->location_code;
self::set_active_menu('controller::control::location_for_check_list');
Modified: trunk/controller/inc/class.uicontrol_register_to_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_register_to_location.inc.php
2012-10-24 20:11:46 UTC (rev 10345)
+++ trunk/controller/inc/class.uicontrol_register_to_location.inc.php
2012-10-25 06:27:55 UTC (rev 10346)
@@ -55,15 +55,15 @@
var $public_functions = array
(
- 'index'
=> true,
- 'query'
=> true,
- 'edit_location'
=> true,
+ 'index'
=> true,
+ 'query'
=> true,
+ 'edit_location'
=> true,
'get_location_category' => true,
- 'get_district_part_of_town' => true,
+ 'get_district_part_of_town' => true,
'get_category_by_entity' => true,
'get_entity_table_def' => true,
- 'get_locations'
=> true,
- 'get_location_type_category' => true
+ 'get_locations'
=> true,
+ 'get_location_type_category' => true
);
function __construct()
@@ -76,17 +76,17 @@
$this->type_id =
$this->bo->type_id;
- $this->start =
$this->bo->start;
- $this->query =
$this->bo->query;
- $this->sort =
$this->bo->sort;
- $this->order =
$this->bo->order;
- $this->filter =
$this->bo->filter;
- $this->cat_id =
$this->bo->cat_id;
- $this->part_of_town_id =
$this->bo->part_of_town_id;
+ $this->start
= $this->bo->start;
+ $this->query
= $this->bo->query;
+ $this->sort
= $this->bo->sort;
+ $this->order
= $this->bo->order;
+ $this->filter
= $this->bo->filter;
+ $this->cat_id
= $this->bo->cat_id;
+ $this->part_of_town_id = $this->bo->part_of_town_id;
$this->district_id =
$this->bo->district_id;
- $this->status =
$this->bo->status;
- $this->allrows =
$this->bo->allrows;
- $this->lookup =
$this->bo->lookup;
+ $this->status
= $this->bo->status;
+ $this->allrows =
$this->bo->allrows;
+ $this->lookup
= $this->bo->lookup;
$this->location_code =
$this->bo->location_code;
self::set_active_menu('controller::control::location_for_check_list');
Modified: trunk/controller/inc/class.uidocument.inc.php
===================================================================
--- trunk/controller/inc/class.uidocument.inc.php 2012-10-24 20:11:46 UTC
(rev 10345)
+++ trunk/controller/inc/class.uidocument.inc.php 2012-10-25 06:27:55 UTC
(rev 10346)
@@ -40,11 +40,11 @@
public $public_functions = array
(
- 'query' => true,
- 'add' => true,
- 'view' => true,
- 'delete' => true,
- 'show' => true,
+ 'query'
=> true,
+ 'add'
=> true,
+ 'view'
=> true,
+ 'delete'
=> true,
+ 'show'
=> true,
'document_types' => true
);
| [Prev in Thread] | Current Thread | [Next in Thread] |