[Fmsystem-commits] [8494]

[Torstein]

Revision: 8494
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8494
Author:   vator
Date:     2012-01-05 10:00:26 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicheck_list.inc.php
    trunk/controller/inc/class.uicontrol.inc.php
    trunk/controller/inc/class.uicontrol_item.inc.php

Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php     2012-01-05 10:00:11 UTC 
(rev 8493)
+++ trunk/controller/inc/class.uicheck_list.inc.php     2012-01-05 10:00:26 UTC 
(rev 8494)
@@ -274,7 +274,7 @@
                                'control_items_array'   => $control_items_array
                        );
                        
-                       self::render_template_xsl('view_control_items', $data);
+                       
self::render_template_xsl('control_item/view_control_items', $data);
                }
 
                public function view_check_lists_for_control()

Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php        2012-01-05 10:00:11 UTC 
(rev 8493)
+++ trunk/controller/inc/class.uicontrol.inc.php        2012-01-05 10:00:26 UTC 
(rev 8494)
@@ -296,7 +296,7 @@
                        
                        
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
                        
-                       self::render_template_xsl(array('control_tabs', 
'control'), $data);
+                       self::render_template_xsl(array('control/control_tabs', 
'control/control'), $data);
                        
                        $this->use_yui_editor(array('description'));
                }
@@ -383,7 +383,7 @@
                        );
                        
                        self::add_javascript('controller', 'yahoo', 
'control_tabs.js');
-                       self::render_template_xsl(array('control_tabs', 
'control_groups'), $data);
+                       self::render_template_xsl(array('control/control_tabs', 
'control_group/control_groups'), $data);
                }
                
                public function save_control_groups(){
@@ -485,7 +485,7 @@
                        self::add_javascript('controller', 'yahoo', 
'control_tabs.js');
                        self::add_javascript('controller', 'controller', 
'jquery.js');
                        self::add_javascript('controller', 'controller', 
'custom_ui.js');
-                       self::render_template_xsl(array('control_tabs', 
'choose_control_items'), $data); 
+                       self::render_template_xsl(array('control/control_tabs', 
'control_item/choose_control_items'), $data); 
                }
                
                // Saves chosen control items through receiving a comma 
separated list of control tags (1:2, control_group_id:control_item_id) 
@@ -602,7 +602,7 @@
                        self::add_javascript('controller', 'controller', 
'yui_min_3_4_3.js');
                        self::add_javascript('controller', 'controller', 
'custom_drag_drop.js');
                        self::add_javascript('controller', 'controller', 
'ajax.js');
-                       self::render_template_xsl(array('control_tabs', 
'sort_check_list'), $data);
+                       self::render_template_xsl(array('control/control_tabs', 
'control_item/sort_check_list'), $data);
                }
                
                
@@ -687,7 +687,7 @@
                                'date_format'           => $date_format
                        );
                        
-                       self::render_template_xsl(array('control_tabs', 
'tab_view_check_lists'), $data);
+                       self::render_template_xsl(array('control/control_tabs', 
'tab_view_check_lists'), $data);
                        self::add_javascript('controller', 'yahoo', 
'control_tabs.js');
                }
                        

Modified: trunk/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_item.inc.php   2012-01-05 10:00:11 UTC 
(rev 8493)
+++ trunk/controller/inc/class.uicontrol_item.inc.php   2012-01-05 10:00:26 UTC 
(rev 8494)
@@ -338,7 +338,7 @@
                                
$GLOBALS['phpgw']->richtext->replace_element('how_to_do');
                                $GLOBALS['phpgw']->richtext->generate_script();
 
-                               self::render_template_xsl('control_item', 
$data);
+                               
self::render_template_xsl('control_item/control_item', $data);
                        }
                }
 
@@ -458,7 +458,7 @@
 
                                $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('controller') . '::' . lang('Control item');
 
-                               self::render_template_xsl('control_item', 
$data);
+                               
self::render_template_xsl('control_item/control_item', $data);
                        }
                }