[Fmsystem-commits] [17071] more on eventplanner

[sigurdne]

Revision: 17071
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17071
Author:   sigurdne
Date:     2017-09-13 14:50:52 -0400 (Wed, 13 Sep 2017)
Log Message:
-----------
more on eventplanner

Modified Paths:
--------------
    trunk/eventplanner/inc/class.uiapplication.inc.php
    trunk/eventplanner/inc/class.uivendor.inc.php
    trunk/eventplanner/setup/phpgw_no.lang
    trunk/eventplannerfrontend/inc/class.menu.inc.php

Modified: trunk/eventplanner/inc/class.uiapplication.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uiapplication.inc.php  2017-09-13 18:29:49 UTC 
(rev 17070)
+++ trunk/eventplanner/inc/class.uiapplication.inc.php  2017-09-13 18:50:52 UTC 
(rev 17071)
@@ -129,6 +129,7 @@
                }
                public function index()
                {
+                       
self::set_active_menu("{$this->currentapp}::vendor::application");
                        if (empty($this->permissions[PHPGW_ACL_READ]))
                        {
 
@@ -217,6 +218,7 @@
 
                public function add()
                {
+                       
self::set_active_menu("{$this->currentapp}::vendor::new_application");
                        if (empty($this->permissions[PHPGW_ACL_ADD]))
                        {
                                if($this->currentapp == 'eventplannerfrontend')

Modified: trunk/eventplanner/inc/class.uivendor.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uivendor.inc.php       2017-09-13 18:29:49 UTC 
(rev 17070)
+++ trunk/eventplanner/inc/class.uivendor.inc.php       2017-09-13 18:50:52 UTC 
(rev 17071)
@@ -173,6 +173,12 @@
                        self::render_template_xsl('datatable_jquery', $data);
                }
 
+               public function add()
+               {
+                       
self::set_active_menu("{$this->currentapp}::vendor::new_vendor");
+                       parent::add();  
+               }
+
                /*
                 * Edit the price item with the id given in the http variable 
'id'
                 */

Modified: trunk/eventplanner/setup/phpgw_no.lang
===================================================================
--- trunk/eventplanner/setup/phpgw_no.lang      2017-09-13 18:29:49 UTC (rev 
17070)
+++ trunk/eventplanner/setup/phpgw_no.lang      2017-09-13 18:50:52 UTC (rev 
17071)
@@ -160,4 +160,5 @@
 application public type non public     eventplanner    no      Nærtilbud (et 
arrangement der kun noen få brukere/beboere på en institusjon kan delta, f.eks. 
et skrivekurs, malekurs)
 application public type public eventplanner    no       Breddetilbud (et 
arrangement der alle brukere/beboere på en institusjon kan delta)
 my applications        eventplanner    no      Mine søknader
-new application        eventplanner    no      Ny søknad
\ No newline at end of file
+new application        eventplanner    no      Ny søknad
+new vendor     eventplanner    no      Ny utøver
\ No newline at end of file

Modified: trunk/eventplannerfrontend/inc/class.menu.inc.php
===================================================================
--- trunk/eventplannerfrontend/inc/class.menu.inc.php   2017-09-13 18:29:49 UTC 
(rev 17070)
+++ trunk/eventplannerfrontend/inc/class.menu.inc.php   2017-09-13 18:50:52 UTC 
(rev 17071)
@@ -108,16 +108,21 @@
                                        'text' => lang('vendor'),
                                        'url' =>  
phpgwapi_uicommon_jquery::link(  array('menuaction' => 
"eventplannerfrontend.uivendor.index")),
                                        'image' => array('vendor', 'navbar'),
-                               ),
-                               'application' => array(
-                                       'text' => lang('my applications'),
-                                       'url' => 
phpgwapi_uicommon_jquery::link( array('menuaction' => 
'eventplannerfrontend.uiapplication.index')),
                                        'children'      => array(
+                                               'new_vendor' => array(
+                                               'text' => lang('new vendor'),
+                                               'url' => 
phpgwapi_uicommon_jquery::link( array('menuaction' => 
'eventplannerfrontend.uivendor.add'))
+                                               ),
                                                'new_application' => array(
                                                'text' => lang('new 
application'),
                                                'url' => 
phpgwapi_uicommon_jquery::link( array('menuaction' => 
'eventplannerfrontend.uiapplication.add'))
-                                               )
-                                       )
+                                               ),
+                                               'application' => array(
+                                                       'text' => lang('my 
applications'),
+                                                       'url' => 
phpgwapi_uicommon_jquery::link( array('menuaction' => 
'eventplannerfrontend.uiapplication.index')),
+                                                       )
+                                               ),
+
                                ),
                                'customer' => array(
                                        'text' => lang('customer'),
@@ -129,22 +134,7 @@
                                        'url' => 
$GLOBALS['phpgw']->link('/registration/main.php', array()),
                                        'image' => array('user', 'navbar'),
                                )
-                               /*                              'booking' => 
array(
-                                       'text' => lang('booking'),
-                                       'url' =>  
phpgwapi_uicommon_jquery::link(  array('menuaction' => 
"eventplannerfrontend.uibooking.index")),
-                                       'image' => array('customer', 'navbar'),
-                               ),
-                               'vendor_report' => array(
-                                       'text' => lang('vendor report'),
-                                       'url' =>  
phpgwapi_uicommon_jquery::link(  array('menuaction' => 
"eventplannerfrontend.uivendor_report.index")),
-                                       'image' => array('vendor_report', 
'navbar'),
-                               ),
-                               'customer_report' => array(
-                                       'text' => lang('customer report'),
-                                       'url' =>  
phpgwapi_uicommon_jquery::link(  array('menuaction' => 
"eventplannerfrontend.uicustomer_report.index")),
-                                       'image' => array('customer_report', 
'navbar'),
-                               )*/
-                       );
+               );
                        $GLOBALS['phpgw_info']['flags']['currentapp'] = 
$incoming_app;
                        return $menus;
                }