[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15836] more on eventplanner
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15836] more on eventplanner |
Date: |
Mon, 17 Oct 2016 08:21:38 +0000 (UTC) |
Revision: 15836
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15836
Author: sigurdne
Date: 2016-10-17 08:21:38 +0000 (Mon, 17 Oct 2016)
Log Message:
-----------
more on eventplanner
Modified Paths:
--------------
trunk/eventplanner/inc/class.menu.inc.php
trunk/eventplanner/inc/class.uivendor_report.inc.php
trunk/eventplanner/setup/phpgw_no.lang
trunk/eventplanner/templates/base/vendor_report.xsl
Modified: trunk/eventplanner/inc/class.menu.inc.php
===================================================================
--- trunk/eventplanner/inc/class.menu.inc.php 2016-10-16 15:30:10 UTC (rev
15835)
+++ trunk/eventplanner/inc/class.menu.inc.php 2016-10-17 08:21:38 UTC (rev
15836)
@@ -39,6 +39,8 @@
*/
public function get_menu()
{
+ $incoming_app =
$GLOBALS['phpgw_info']['flags']['currentapp'];
+ $GLOBALS['phpgw_info']['flags']['currentapp'] =
'eventplanner';
$start_page = 'application';
if
(isset($GLOBALS['phpgw_info']['user']['preferences']['eventplanner']['default_start_page'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['eventplanner']['default_start_page'])
{
@@ -146,7 +148,7 @@
$menus['navigation'] = array(
'application' => array(
- 'text' => 'application',
+ 'text' => lang('application'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'eventplanner.uiapplication.index'))
),
'resource' => array(
@@ -180,6 +182,7 @@
'image' => array('customer_report',
'navbar'),
)
);
+ $GLOBALS['phpgw_info']['flags']['currentapp'] =
$incoming_app;
return $menus;
}
}
\ No newline at end of file
Modified: trunk/eventplanner/inc/class.uivendor_report.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uivendor_report.inc.php 2016-10-16
15:30:10 UTC (rev 15835)
+++ trunk/eventplanner/inc/class.uivendor_report.inc.php 2016-10-17
08:21:38 UTC (rev 15836)
@@ -51,7 +51,7 @@
{
parent::__construct();
self::set_active_menu('eventplanner::vendor_report');
- $GLOBALS['phpgw_info']['flags']['app_header'] .= '::' .
lang('vendor_report');
+ $GLOBALS['phpgw_info']['flags']['app_header'] .= '::' .
lang('vendor report');
$this->bo =
createObject('eventplanner.bovendor_report');
$this->cats = & $this->bo->cats;
$this->fields =
eventplanner_vendor_report::get_fields();
@@ -134,7 +134,7 @@
phpgwapi_jquery::load_widget('autocomplete');
- $function_msg = lang('vendor_report');
+ $function_msg = lang('vendor report');
$data = array(
'datatable_name' => $function_msg,
@@ -250,7 +250,7 @@
$tabs = array();
$tabs['first_tab'] = array(
- 'label' => lang('vendor_report'),
+ 'label' => lang('vendor report'),
'link' => '#first_tab',
'function' => "set_tab('first_tab')"
);
Modified: trunk/eventplanner/setup/phpgw_no.lang
===================================================================
--- trunk/eventplanner/setup/phpgw_no.lang 2016-10-16 15:30:10 UTC (rev
15835)
+++ trunk/eventplanner/setup/phpgw_no.lang 2016-10-17 08:21:38 UTC (rev
15836)
@@ -20,7 +20,7 @@
pending eventplanner no Under behandling
rejected eventplanner no Avvist
approved eventplanner no Godkjent
-vendor eventplanner no Leverandør
+vendor eventplanner no Utøver
new eventplanner no Ny
show eventplanner no vis
history eventplanner no Historikk
@@ -60,4 +60,5 @@
depth eventplanner no Dybde
wardrobe eventplanner no Garderobe
audience limit eventplanner no Maksimum antall publikum
-raider eventplanner no Raider
\ No newline at end of file
+raider eventplanner no Raider
+vendor report eventplanner no Utøverrapport
\ No newline at end of file
Modified: trunk/eventplanner/templates/base/vendor_report.xsl
===================================================================
--- trunk/eventplanner/templates/base/vendor_report.xsl 2016-10-16 15:30:10 UTC
(rev 15835)
+++ trunk/eventplanner/templates/base/vendor_report.xsl 2016-10-17 08:21:38 UTC
(rev 15836)
@@ -43,7 +43,8 @@
<xsl:value-of
select="vendor/id"/>
</div>
</xsl:if>
- <xsl:apply-templates
select="attributes_group/attributes"/>
+ <!--xsl:apply-templates
select="attributes_group/attributes"/-->
+ <xsl:call-template
name="attributes_values"/>
</fieldset>
</div>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15836] more on eventplanner,
sigurdne <=