[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10446]
From: |
Torstein |
Subject: |
[Fmsystem-commits] [10446] |
Date: |
Sun, 04 Nov 2012 09:10:19 +0000 |
Revision: 10446
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10446
Author: vator
Date: 2012-11-04 09:10:19 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/logistic/inc/class.uiactivity.inc.php
trunk/logistic/inc/class.uirequirement.inc.php
trunk/logistic/setup/phpgw_no.lang
trunk/logistic/templates/base/activity/activity_tabs.xsl
Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-11-04 08:57:02 UTC (rev
10445)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-11-04 09:10:19 UTC (rev
10446)
@@ -590,12 +590,7 @@
'key' => 'alloc_link',
'label' =>
lang('Allocate resources'),
'sortable' => false,
- ),
- array(
- 'key' => 'delete_link',
- 'label' => lang('Delete
requirement'),
- 'sortable' => false,
- ),
+ )
)
),
);
Modified: trunk/logistic/inc/class.uirequirement.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement.inc.php 2012-11-04 08:57:02 UTC
(rev 10445)
+++ trunk/logistic/inc/class.uirequirement.inc.php 2012-11-04 09:10:19 UTC
(rev 10446)
@@ -172,12 +172,9 @@
$entry['allocated'] = $num_allocated;
- $href = self::link(array('menuaction' =>
'logistic.uirequirement.delete', 'id' => $entry['id']));
- $entry['delete_link'] = "<a class=\"btn-sm
delete\" href=\"{$href}\">Slett</a>";
-
$entry['select'] = "<input
class=\"select_line\" type =\"radio\" {$_checked} name=\"values[select_line]\"
value=\"{$entry['id']}\">";
$href = self::link(array('menuaction' =>
'logistic.uirequirement_resource_allocation.edit', 'requirement_id' =>
$entry['id']));
- $entry['alloc_link'] = "<a class=\"btn-sm
alloc\" href=\"{$href}\">Bestill</a>";
+ $entry['alloc_link'] = "<a class=\"btn-sm
alloc\" href=\"{$href}\">Tildel ressurser</a>";
}
// ... add result data
@@ -278,11 +275,6 @@
'hidden' => true
),
array(
- 'key' => 'delete_link',
- 'label' => lang('Delete
requirement'),
- 'sortable' => false,
- ),
- array(
'key' => 'alloc_link',
'label' =>
lang('Allocate resources'),
'sortable' => false,
Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang 2012-11-04 08:57:02 UTC (rev 10445)
+++ trunk/logistic/setup/phpgw_no.lang 2012-11-04 09:10:19 UTC (rev 10446)
@@ -86,4 +86,5 @@
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
+Add activity logistic no Legg til aktivitet
+Overview of resources for activity logistic no Oversikt over
ressurser for aktivteten
\ 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
08:57:02 UTC (rev 10445)
+++ trunk/logistic/templates/base/activity/activity_tabs.xsl 2012-11-04
09:10:19 UTC (rev 10446)
@@ -53,7 +53,7 @@
<!-- =========== HEADING ==============
-->
<h1 style="float:left;">
<span>
- <xsl:value-of
select="php:function('lang', 'Overview for activity')" />
+ <xsl:value-of
select="php:function('lang', 'Overview of resources for activity')" />
</span>
<span style="margin-left:5px;">
<xsl:value-of
select="activity/name" />
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10446],
Torstein <=