[Fmsystem-commits] [10444]

[Torstein]

Revision: 10444
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10444
Author:   vator
Date:     2012-11-04 07:58:10 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/logistic/inc/class.uiactivity.inc.php
    trunk/logistic/inc/class.uiproject.inc.php
    trunk/logistic/setup/phpgw_no.lang
    trunk/logistic/templates/base/activity/activity_tabs.xsl
    trunk/logistic/templates/base/activity/add_activity_item.xsl
    trunk/logistic/templates/base/project/project_item.xsl

Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-11-04 07:16:42 UTC (rev 
10443)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-11-04 07:58:10 UTC (rev 
10444)
@@ -81,7 +81,7 @@
                        $user_array = $this->get_user_array();
 
                        $data = array(
-                               'datatable_name'        => lang('activity'),
+                               'datatable_name'        => lang('Overview 
activities'),
                                'form' => array(
                                        'toolbar' => array(
                                                'item' => array(

Modified: trunk/logistic/inc/class.uiproject.inc.php
===================================================================
--- trunk/logistic/inc/class.uiproject.inc.php  2012-11-04 07:16:42 UTC (rev 
10443)
+++ trunk/logistic/inc/class.uiproject.inc.php  2012-11-04 07:58:10 UTC (rev 
10444)
@@ -308,7 +308,7 @@
                        {
                                //list project types
                                $data = array(
-                                       'datatable_name'        => 
lang('project types'),
+                                       'datatable_name'        => 
lang('Overview project types'),
                                        'form' => array(
                                                'toolbar' => array(
                                                        'item' => array(

Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang  2012-11-04 07:16:42 UTC (rev 10443)
+++ trunk/logistic/setup/phpgw_no.lang  2012-11-04 07:58:10 UTC (rev 10444)
@@ -79,4 +79,11 @@
 Requirement to activity        logistic        no      Krav til aktiviteten
 edit   logistic        no      Rediger
 Overview projects      logistic        no      Oversikt over prosjekter
-Overview for activity  logistic        no      Oversikt for aktiviteten
\ No newline at end of file
+Overview for activity  logistic        no      Oversikt for aktiviteten
+Add project    logistic        no      Legg til prosjekt 
+Edit project   logistic        no      Endre prosjekt
+Overview project types logistic        no      Oversikt over prosjekttyper
+Overview activities    logistic        no      Oversikt over aktiviteter
+Overview for activity  logistic        no      Oversikt for aktiviten
+Edit activity  logistic        no      Endre aktivitet
+Add activity   logistic        no      Legg til aktivitet
\ No newline at end of file

Modified: trunk/logistic/templates/base/activity/activity_tabs.xsl
===================================================================
--- trunk/logistic/templates/base/activity/activity_tabs.xsl    2012-11-04 
07:16:42 UTC (rev 10443)
+++ trunk/logistic/templates/base/activity/activity_tabs.xsl    2012-11-04 
07:58:10 UTC (rev 10444)
@@ -14,7 +14,7 @@
                                        <!-- =========== HEADING ============== 
-->
                                        <h1 style="float:left;"> 
                                                <span>
-                                                       <xsl:value-of 
select="php:function('lang', 'Add requirement to activity')" />
+                                                       <xsl:value-of 
select="php:function('lang', 'Overview for activity')" />
                                                </span>
                                                <span style="margin-left:5px;">
                                                        <xsl:value-of 
select="activity/name" />

Modified: trunk/logistic/templates/base/activity/add_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/add_activity_item.xsl        
2012-11-04 07:16:42 UTC (rev 10443)
+++ trunk/logistic/templates/base/activity/add_activity_item.xsl        
2012-11-04 07:58:10 UTC (rev 10444)
@@ -4,18 +4,14 @@
 <xsl:call-template name="yui_phpgw_i18n"/>
 <div class="yui-navset yui-navset-top">
 
-       <div id="breadcrumb">
-               <xsl:value-of disable-output-escaping="yes" select="breadcrumb" 
/>
-       </div>                  
-
        <xsl:choose>
-               <xsl:when test="parent_activity/id &gt; 0">
-                       <h1> 
-                               <xsl:value-of select="parent_activity/name" 
disable-output-escaping="yes"/>::<xsl:value-of select="php:function('lang', 
'Add sub activity')" />
+               <xsl:when test="activity/id != '' or activity/id != 0">
+                       <h1>
+                               <xsl:value-of select="php:function('lang', 
'Edit activity')" />
                        </h1>
                </xsl:when>
                <xsl:otherwise>
-                       <h1> 
+                       <h1>
                                <xsl:value-of select="php:function('lang', 'Add 
activity')" />
                        </h1>
                </xsl:otherwise>

Modified: trunk/logistic/templates/base/project/project_item.xsl
===================================================================
--- trunk/logistic/templates/base/project/project_item.xsl      2012-11-04 
07:16:42 UTC (rev 10443)
+++ trunk/logistic/templates/base/project/project_item.xsl      2012-11-04 
07:58:10 UTC (rev 10444)
@@ -6,11 +6,19 @@
 
 <xsl:call-template name="yui_phpgw_i18n"/>
 <div class="yui-navset yui-navset-top">
+       <xsl:choose>
+               <xsl:when test="project/id != '' or project/id != 0">
+                       <h1>
+                               <xsl:value-of select="php:function('lang', 
'Edit project')" />
+                       </h1>
+               </xsl:when>
+               <xsl:otherwise>
+                       <h1>
+                               <xsl:value-of select="php:function('lang', 'Add 
project')" />
+                       </h1>
+               </xsl:otherwise>
+       </xsl:choose>
        
-       <h1>
-                       <xsl:value-of select="php:function('lang', 'Project')" 
/>
-       </h1>
-               
        <div id="project_details" class="content-wrp">
                <div id="details">
                        <xsl:variable name="action_url">