[Fmsystem-commits] [13159] start converting booking

[Sigurd Nes]

Revision: 13159
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13159
Author:   sigurdne
Date:     2015-05-07 14:10:14 +0000 (Thu, 07 May 2015)
Log Message:
-----------
start converting booking

Modified Paths:
--------------
    branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
    branches/dev-syncromind/booking/templates/base/organization.xsl
    branches/dev-syncromind/booking/templates/base/organization_edit.xsl

Modified: branches/dev-syncromind/booking/inc/class.uiorganization.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiorganization.inc.php    
2015-05-07 14:09:18 UTC (rev 13158)
+++ branches/dev-syncromind/booking/inc/class.uiorganization.inc.php    
2015-05-07 14:10:14 UTC (rev 13159)
@@ -1,7 +1,7 @@
 <?php
-       phpgw::import_class('booking.uicommon');
+       phpgw::import_class('phpgwapi.uicommon_jquery');
 
-       class booking_uiorganization extends booking_uicommon
+       class booking_uiorganization extends phpgwapi_uicommon_jquery
        {
                protected $fields;
                
@@ -9,7 +9,7 @@
                (
                        'building_users' => true,
                        'index'                 =>      true,
-                       'index_json'            =>      true,
+                       'query'                 =>      true,
                        'add'                   =>      true,
                        'edit'                  =>      true,
                        'show'                  =>      true,
@@ -53,7 +53,7 @@
                public function index()
                {
                        if(phpgw::get_var('phpgw_return_as') == 'json') {
-                               return $this->index_json();
+                               return $this->query();
                        }
                        self::add_javascript('booking', 'booking', 
'datatable.js');
                        phpgwapi_yui::load_widget('datatable');
@@ -68,15 +68,6 @@
                                                                'href' => 
self::link(array('menuaction' => 'booking.uiorganization.add'))
                                                        ),
                                                        array(
-                                                               'type' => 
'text',
-                                                               'name' => 
'query'
-                                                       ),
-                                                       array(
-                                                               'type' => 
'submit',
-                                                               'name' => 
'search',
-                                                               'value' => 
lang('Search')
-                                                       ),
-                                                       array(
                                                                'type' => 
'link',
                                                                'value' => 
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
                                                                'href' => 
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
@@ -90,7 +81,7 @@
                                                array(
                                                        'key' => 'name',
                                                        'label' => 
lang('Organization'),
-                                                       'formatter' => 
'YAHOO.booking.formatLink'
+                                                       'formatter' => 
'JqueryPortico.formatLink'
                                                ),
                                                array(
                                                        'key' => 'shortname',
@@ -127,10 +118,10 @@
                                        )
                                )
                        );
-                       self::render_template('datatable', $data);
+            self::render_template_xsl('datatable_jquery',$data);
                }
 
-               public function index_json()
+               public function query()
                {
                        $organizations = $this->bo->read();
                        array_walk($organizations["results"], array($this, 
"_add_links"), "booking.uiorganization.show");
@@ -147,8 +138,7 @@
                                        );
                                }
                        }
-
-                       return $this->yui_results($organizations);
+            return $this->jquery_results($organizations);
                }
                
                protected function get_customer_identifier() {
@@ -214,7 +204,7 @@
                        $this->use_yui_editor();
                        
                        $this->add_template_helpers();
-                       self::render_template('organization_edit', 
array('organization' => $organization, "new_form"=> "1", 'module' => 
$this->module, 'activities' => $activities, 'currentapp' => 
$GLOBALS['phpgw_info']['flags']['currentapp']));
+                       self::render_template_xsl('organization_edit', 
array('organization' => $organization, "new_form"=> "1", 'module' => 
$this->module, 'activities' => $activities, 'currentapp' => 
$GLOBALS['phpgw_info']['flags']['currentapp']));
                }
 
                public function edit()
@@ -260,7 +250,7 @@
                        $this->use_yui_editor();
             
                        $this->add_template_helpers();
-                       self::render_template('organization_edit', 
array('organization' => $organization, "save_or_create_text" => "Save", 
"module" => $this->module, "contact_form_link" => $contact_form_link, 
'activities' => $activities, 'currentapp' => 
$GLOBALS['phpgw_info']['flags']['currentapp']));
+                       self::render_template_xsl('organization_edit', 
array('organization' => $organization, "save_or_create_text" => "Save", 
"module" => $this->module, "contact_form_link" => $contact_form_link, 
'activities' => $activities, 'currentapp' => 
$GLOBALS['phpgw_info']['flags']['currentapp']));
                }
                
                public function show()
@@ -274,6 +264,6 @@
                        $organization['organizations_link'] = 
self::link(array('menuaction' => $this->module.'.uiorganization.index'));
                        $organization['edit_link'] = 
self::link(array('menuaction' => $this->module.'.uiorganization.edit', 'id' => 
$organization['id']));
                        $this->install_customer_identifier_ui($organization);
-                       self::render_template('organization', 
array('organization' => $organization));
+                       self::render_template_xsl('organization', 
array('organization' => $organization));
                }
        }

Modified: branches/dev-syncromind/booking/templates/base/organization.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/organization.xsl     
2015-05-07 14:09:18 UTC (rev 13158)
+++ branches/dev-syncromind/booking/templates/base/organization.xsl     
2015-05-07 14:10:14 UTC (rev 13159)
@@ -1,5 +1,5 @@
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
-       <xsl:call-template name="yui_booking_i18n"/>
+       <!--xsl:call-template name="yui_booking_i18n"/-->
     <div id="content">
         <ul class="pathway">
             <li>

Modified: branches/dev-syncromind/booking/templates/base/organization_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/organization_edit.xsl        
2015-05-07 14:09:18 UTC (rev 13158)
+++ branches/dev-syncromind/booking/templates/base/organization_edit.xsl        
2015-05-07 14:10:14 UTC (rev 13159)
@@ -30,7 +30,7 @@
        </dl>
        
     <xsl:call-template name="msgbox"/>
-       <xsl:call-template name="yui_booking_i18n"/>
+       <!--xsl:call-template name="yui_booking_i18n"/-->
 
        <form action="" method="POST">
                <dl class="form-col">