[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10144]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [10144] |
|
Date: |
Mon, 08 Oct 2012 10:59:02 +0000 |
Revision: 10144
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10144
Author: vator
Date: 2012-10-08 10:59:02 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/logistic/setup/phpgw_no.lang
trunk/logistic/templates/base/requirement/requirement.xsl
Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang 2012-10-08 10:58:54 UTC (rev 10143)
+++ trunk/logistic/setup/phpgw_no.lang 2012-10-08 10:59:02 UTC (rev 10144)
@@ -30,4 +30,5 @@
my_activities logistic no Mine aktiviteter
Project type name updated logistic no
Prosjekttypenavn oppdatert
Add activity logistic no Legg til aktivitet
-Add sub activity logistic no Legg til subaktivitet
\ No newline at end of file
+Add sub activity logistic no Legg til subaktivitet
+Add requirement to activity logistic no Legg krav til
aktiviteten
\ No newline at end of file
Modified: trunk/logistic/templates/base/requirement/requirement.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement.xsl 2012-10-08
10:58:54 UTC (rev 10143)
+++ trunk/logistic/templates/base/requirement/requirement.xsl 2012-10-08
10:59:02 UTC (rev 10144)
@@ -7,42 +7,9 @@
<xsl:call-template name="yui_phpgw_i18n"/>
<div class="yui-navset yui-navset-top">
<div style="clear: both;margin-bottom: 0;overflow: hidden;padding:
1em;" class="identifier-header">
-
- <xsl:choose>
- <xsl:when test="parent_activity/id > 0">
- <h1 style="float:left;">
- <xsl:value-of
select="parent_activity/name" disable-output-escaping="yes"/>::<xsl:value-of
select="php:function('lang', 'Add sub activity')" />
- </h1>
-
- <div style="float: left; margin-left: 130px;"
class="select-box">
- <label>Velg en annen
hovedaktivitet</label>
-
- <form action="#">
- <input type="hidden"
name="activity_id" value="{activity/id}" />
- <input type="hidden"
name="parent_id" value="{parent_activity/id}" />
-
- <select id="select_activity"
name="parent_activity_id" class="selectLocation">
- <option>Velg
aktivitet</option>
- <xsl:for-each
select="activities">
- <option value="{id}">
- <xsl:if
test="activity/parent_id = id">
- <xsl:attribute
name="selected">
- selected
-
</xsl:attribute>
- </xsl:if>
- <xsl:value-of
disable-output-escaping="yes" select="name"/>
- </option>
- </xsl:for-each>
- </select>
- </form>
- </div>
- </xsl:when>
- <xsl:otherwise>
- <h1 style="float:left;">
- <xsl:value-of
select="php:function('lang', 'Add activity')" />
- </h1>
- </xsl:otherwise>
- </xsl:choose>
+ <h1 style="float:left;">
+ <xsl:value-of select="php:function('lang', 'Add
requirement to activity')" />
+ </h1>
</div>
<div class="yui-content" style="padding: 20px;">
@@ -54,32 +21,6 @@
<dl class="proplist-col">
<dt>
- <label for="name"><xsl:value-of
select="php:function('lang','Activity name')" /></label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <input type="text"
name="name" id="name" value="{activity/name}" size="100"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="activity/name" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label
for="description"><xsl:value-of select="php:function('lang', 'Description')"
/></label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <textarea
id="description" name="description" rows="5" cols="60"><xsl:value-of
select="activity/description" disable-output-escaping="yes"/></textarea>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="activity/description" disable-output-escaping="yes"/>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
<label
for="start_date">Startdato</label>
</dt>
<dd>
@@ -113,34 +54,6 @@
</xsl:otherwise>
</xsl:choose>
</dd>
- <dt>
- <label
for="end_date">Ansvarlig</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when
test="editable">
- <select
name="responsible_user_id">
- <xsl:for-each
select="responsible_users">
- <xsl:variable
name="full_name">
- <xsl:value-of
disable-output-escaping="yes" select="account_firstname"/><xsl:text> </xsl:text>
- <xsl:value-of
disable-output-escaping="yes" select="account_lastname"/>
- </xsl:variable>
- <option
value="{account_id}">
- <xsl:if
test="activity/responsible_user_id = account_id">
-
<xsl:attribute name="selected">
-
selected
-
</xsl:attribute>
- </xsl:if>
- <xsl:value-of
disable-output-escaping="yes" select="$full_name"/>
- </option>
- </xsl:for-each>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <span><xsl:value-of
select="activity/responsible_user_id"/></span>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
</dl>
<div class="form-buttons">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10144],
Torstein <=