[Fmsystem-commits] [10443]

[Torstein]

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


Modified Paths:
--------------
    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/requirement/requirement_overview.xsl

Modified: trunk/logistic/inc/class.uiproject.inc.php
===================================================================
--- trunk/logistic/inc/class.uiproject.inc.php  2012-11-03 21:36:57 UTC (rev 
10442)
+++ trunk/logistic/inc/class.uiproject.inc.php  2012-11-04 07:16:42 UTC (rev 
10443)
@@ -133,7 +133,12 @@
                        {
                                if (isset($result))
                                {
-                                       $rows[] = $result->serialize();
+                                       $project = $result->serialize();
+
+                                       $href = self::link(array('menuaction' 
=> 'logistic.uiactivity.edit', 'project_id' => $project['id']));
+                                       $project['add_activity_link'] = "<a 
class=\"btn-sm delete\" href=\"{$href}\">Legg til aktivitet</a>";
+                                       
+                                       $rows[] = $project; 
                                }
                        }
 
@@ -241,6 +246,11 @@
                                                        'sortable' => false
                                                ),
                                                array(
+                                                       'key' => 
'add_activity_link',
+                                                       'label' => 
lang('Delete'),
+                                                       'sortable' => false
+                                               ),
+                                               array(
                                                        'key' => 'link',
                                                        'hidden' => true
                                                )

Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang  2012-11-03 21:36:57 UTC (rev 10442)
+++ trunk/logistic/setup/phpgw_no.lang  2012-11-04 07:16:42 UTC (rev 10443)
@@ -76,6 +76,7 @@
 select logistic        no      Velg
 Add project    logistic        no      Nytt prosjekt
 Booking of resources   logistic        no      Bestilling av ressurser
-Requirement to activity        logistic        no      Krav for aktiviteten
+Requirement to activity        logistic        no      Krav til aktiviteten
 edit   logistic        no      Rediger
-Overview projects      logistic        no      Oversikt over prosjekter
\ No newline at end of file
+Overview projects      logistic        no      Oversikt over prosjekter
+Overview for activity  logistic        no      Oversikt for aktiviteten
\ 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-03 
21:36:57 UTC (rev 10442)
+++ trunk/logistic/templates/base/activity/activity_tabs.xsl    2012-11-04 
07:16:42 UTC (rev 10443)
@@ -53,7 +53,7 @@
                                        <!-- =========== HEADING ============== 
-->
                                        <h1 style="float:left;"> 
                                                <span>
-                                                       <xsl:value-of 
select="php:function('lang', 'Add criterias')" />
+                                                       <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-03 21:36:57 UTC (rev 10442)
+++ trunk/logistic/templates/base/activity/add_activity_item.xsl        
2012-11-04 07:16:42 UTC (rev 10443)
@@ -36,7 +36,7 @@
                                                <xsl:when 
test="parent_activity/id &gt; 0">
                                                        <dt>            
                                                                <xsl:if 
test="editable">
-                                                                       <div 
style="margin-bottom: 1em;">
+                                                                       <div 
style="display:none;margin-bottom: 1em;">
                                                                                
<label style="display:block;">Velg en annen hovedaktivitet</label>
                                                                                
<select id="select_activity" name="parent_activity_id" class="selectLocation">
                                                                                
        <option>Velg aktivitet</option>

Modified: trunk/logistic/templates/base/requirement/requirement_overview.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_overview.xsl  
2012-11-03 21:36:57 UTC (rev 10442)
+++ trunk/logistic/templates/base/requirement/requirement_overview.xsl  
2012-11-04 07:16:42 UTC (rev 10443)
@@ -31,7 +31,7 @@
                        <div style="clear:both;" id="paging"></div>
                        <div style="margin-bottom: 40px;" 
id="requirement-container"></div>
                                
-                       <h2 style="clear:both;">Allokerte ressurser</h2>
+                       <h2 style="clear:both;">Tildelte ressurser</h2>
                        <div id="allocation-container"></div>
        </div>
        <xsl:call-template name="datasource-def" />