[Fmsystem-commits] [16194] More on eventplanner

[sigurdne]

Revision: 16194
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16194
Author:   sigurdne
Date:     2017-01-25 17:26:11 -0500 (Wed, 25 Jan 2017)
Log Message:
-----------
More on eventplanner

Modified Paths:
--------------
    trunk/eventplanner/inc/class.uiapplication.inc.php
    trunk/eventplanner/setup/phpgw_no.lang
    trunk/eventplannerfrontend/inc/class.menu.inc.php
    trunk/phpgwapi/templates/frontend/head.inc.php

Modified: trunk/eventplanner/inc/class.uiapplication.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uiapplication.inc.php  2017-01-25 20:44:54 UTC 
(rev 16193)
+++ trunk/eventplanner/inc/class.uiapplication.inc.php  2017-01-25 22:26:11 UTC 
(rev 16194)
@@ -46,7 +46,8 @@
 
                protected
                        $fields,
-                       $permissions;
+                       $permissions,
+                       $currentapp;
 
                public function __construct()
                {
@@ -57,6 +58,7 @@
                        $this->cats = & $this->bo->cats;
                        $this->fields = eventplanner_application::get_fields();
                        $this->permissions = 
eventplanner_application::get_instance()->get_permission_array();
+                       $this->currentapp = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                }
 
                private function get_status_options( $selected = 0 )
@@ -81,7 +83,7 @@
                        $combos[] = array(
                                'type' => 'autocomplete',
                                'name' => 'vendor',
-                               'app' => 'eventplanner',
+                               'app' => $this->currentapp,
                                'ui' => 'vendor',
                                'function' => 'get_list',
                                'label_attr' => 'name',
@@ -147,11 +149,11 @@
                                ),
                                'datatable' => array(
                                        'source' => self::link(array(
-                                               'menuaction' => 
'eventplanner.uiapplication.index',
+                                               'menuaction' => 
"{$this->currentapp}.uiapplication.index",
                                                'phpgw_return_as' => 'json'
                                        )),
                                        'allrows' => true,
-                                       'new_item' => 
self::link(array('menuaction' => 'eventplanner.uiapplication.add')),
+                                       'new_item' => 
self::link(array('menuaction' => "{$this->currentapp}.uiapplication.add")),
                                        'editor_action' => '',
                                        'field' => parent::_get_fields()
                                )
@@ -179,7 +181,7 @@
                                'text' => lang('show'),
                                'action' => self::link( array
                                        (
-                                       'menuaction' => 
'eventplanner.uiapplication.view'
+                                       'menuaction' => 
"{$this->currentapp}.uiapplication.view"
                                )),
                                'parameters' => json_encode($parameters)
                        );
@@ -190,12 +192,12 @@
                                'text' => lang('edit'),
                                'action' => self::link(array
                                        (
-                                       'menuaction' => 
'eventplanner.uiapplication.edit'
+                                       'menuaction' => 
"{$this->currentapp}.uiapplication.edit"
                                )),
                                'parameters' => json_encode($parameters)
                        );
 
-                       self::add_javascript('eventplanner', 'portico', 
'application.index.js');
+                       self::add_javascript('eventplannerfrontend', 'portico', 
'application.index.js');
                        phpgwapi_jquery::load_widget('numberformat');
 
                        self::render_template_xsl('datatable_jquery', $data);
@@ -335,7 +337,7 @@
 
                        $datatable_def[] = array(
                                'container' => 'datatable-container_1',
-                               'requestUrl' => 
json_encode(self::link(array('menuaction' => 'eventplanner.uibooking.query',
+                               'requestUrl' => 
json_encode(self::link(array('menuaction' => 
"{$this->currentapp}.uibooking.query",
                                        'filter_application_id' => $id,
                                        'filter_active' => 1,
                                        'phpgw_return_as' => 'json'))),
@@ -385,10 +387,10 @@
 //                     die();
                        $data = array(
                                'datatable_def' => $datatable_def,
-                               'form_action' => self::link(array('menuaction' 
=> 'eventplanner.uiapplication.save')),
-                               'cancel_url' => self::link(array('menuaction' 
=> 'eventplanner.uiapplication.index',)),
+                               'form_action' => self::link(array('menuaction' 
=> "{$this->currentapp}.uiapplication.save")),
+                               'cancel_url' => self::link(array('menuaction' 
=> "{$this->currentapp}.uiapplication.index",)),
                                'application' => $application,
-                               'new_vendor_url' => 
self::link(array('menuaction' => 'eventplanner.uivendor.add')),
+                               'new_vendor_url' => 
self::link(array('menuaction' => "{$this->currentapp}.uivendor.add")),
                                'list_case_officer' => array('options' => 
$case_officer_options),
                                'cat_select' => 
$this->cats->formatted_xslt_list(array(
                                        'select_name' => 'category_id',

Modified: trunk/eventplanner/setup/phpgw_no.lang
===================================================================
--- trunk/eventplanner/setup/phpgw_no.lang      2017-01-25 20:44:54 UTC (rev 
16193)
+++ trunk/eventplanner/setup/phpgw_no.lang      2017-01-25 22:26:11 UTC (rev 
16194)
@@ -104,4 +104,6 @@
 event  eventplanner    no      Arrangement
 please enter a valid organization number       eventplanner    no      Angi et 
gyldig organisasjonsnummer
 please enter a valid account number    eventplanner    no      Angi et gyldig 
kontonummer
-program data   eventplanner    no      Om programmet
\ No newline at end of file
+program data   eventplanner    no      Om programmet
+booking        eventplanner    no      Booking
+customer contact email eventplanner    no      Epost
\ No newline at end of file

Modified: trunk/eventplannerfrontend/inc/class.menu.inc.php
===================================================================
--- trunk/eventplannerfrontend/inc/class.menu.inc.php   2017-01-25 20:44:54 UTC 
(rev 16193)
+++ trunk/eventplannerfrontend/inc/class.menu.inc.php   2017-01-25 22:26:11 UTC 
(rev 16194)
@@ -39,6 +39,7 @@
                 */
                public function get_menu()
                {
+                       phpgw::import_class('phpgwapi.uicommon_jquery');
                        $incoming_app = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $GLOBALS['phpgw_info']['flags']['currentapp'] = 
'eventplannerfrontend';
                        $GLOBALS['phpgw']->translation->add_app('eventplanner');
@@ -45,8 +46,8 @@
        
                        $menus['navbar'] = array(
                                'eventplannerfrontend' => array(
-                                       'text' => lang('eventplanner'),
-                                       'url' => 
$GLOBALS['phpgw']->link('eventplannerfrontend/', array('menuaction' => 
"eventplannerfrontend.uiapplication.index")),
+                                       'text' => lang('eventplannerfrontend'),
+                                       'url' => 
phpgwapi_uicommon_jquery::link( array('menuaction' => 
"eventplannerfrontend.uiapplication.index")),
                                        'image' => 
array('eventplannerfrontend', 'navbar'),
                                        'order' => 35,
                                        'group' => 'office'

Modified: trunk/phpgwapi/templates/frontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/frontend/head.inc.php      2017-01-25 20:44:54 UTC 
(rev 16193)
+++ trunk/phpgwapi/templates/frontend/head.inc.php      2017-01-25 22:26:11 UTC 
(rev 16194)
@@ -137,7 +137,7 @@
 
        if(! $footer_info = $config_frontend['footer_info'])
        {
-               $footer_info = 'footer info settes i bookingfrontend config';
+               $footer_info = "footer info settes i {$app} config";
        }
 
    phpgwapi_cache::session_set('phpgwapi', 'footer_info', $footer_info);