[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10469]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [10469] |
|
Date: |
Mon, 05 Nov 2012 09:02:15 +0000 |
Revision: 10469
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10469
Author: vator
Date: 2012-11-05 09:02:14 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/logistic/setup/phpgw_no.lang
trunk/logistic/templates/base/activity/add_activity_item.xsl
trunk/logistic/templates/base/activity/view_activity_item.xsl
trunk/logistic/templates/base/project/project_item.xsl
Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang 2012-11-05 08:38:35 UTC (rev 10468)
+++ trunk/logistic/setup/phpgw_no.lang 2012-11-05 09:02:14 UTC (rev 10469)
@@ -93,4 +93,23 @@
Click on table above to get allocations logistic no Klikk
på en rad i tabellen over for å få frem visning
Add activity to project logistic no Legg aktivitet til
prosjektet
View resources overview logistic no Vis ressursoversikt
-Edit requirement logistic no Endre behov
\ No newline at end of file
+Edit requirement logistic no Endre behov
+Choose another project for the activity logistic no Velg et
annet prosjekt for aktiviteten
+Choose another project logistic no Velg et annet prosjekt
+Choose the project in which the activity is part of logistic no
Velg prosjektet som aktiviteten er en del av
+Choose project logistic no Velg prosjekt
+Choose another main activity for this sub activity logistic no
Velg en annen hovedaktivitet for denne underaktiviteten
+Give name to this activity logistic no Gi name til denne
aktiviteten
+Give start date to activity logistic no Angi startdato for
aktiviteten
+Give end date to activity logistic no Angi sluttdato for
aktiviteten
+Give description to activity logistic no Gi beskrivelse for
aktiviteten
+Give start date to project logistic no Angi startdato for
prosjektet
+Give end date to project logistic no Angi sluttdato for
prosjektet
+Give description to the project logistic no Gi en
beskrivelse av prosjektet
+Give project type logistic no Angi prosjekttype
+Give project name logistic no Angi prosjektnavn
+Show project overview logistic no Vis prosjektoversikt
+Start date logistic no Startdato
+End date logistic no Sluttdato
+Responsible person logistic no Ansvarlig bruker
+Responsible person for activity logistic no Angi hvilken
person som skal være ansvarlig for aktiviteten
\ No newline at end of file
Modified: trunk/logistic/templates/base/activity/add_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/add_activity_item.xsl
2012-11-05 08:38:35 UTC (rev 10468)
+++ trunk/logistic/templates/base/activity/add_activity_item.xsl
2012-11-05 09:02:14 UTC (rev 10469)
@@ -38,7 +38,7 @@
<xsl:when test="(editable) and
(parent_activity/id > 0)">
<dt>
<div
style="margin-bottom: 1em;">
-
<label style="display:block;">Velg en annen hovedaktivitet for denne
underaktiviteten</label>
+
<label style="display:block;"><xsl:value-of select="php:function('lang',
'Choose another main activity for this sub activity')" /></label>
<select id="select_parent_activity" name="parent_activity_id">
<option>Velg annen hovedaktivitet</option>
<xsl:for-each select="activities">
@@ -58,9 +58,9 @@
<xsl:when test="(editable)
and not(parent_activity) and not(project)">
<dt>
<div
style="margin-bottom: 1em;">
-
<label style="display:block;">Velg prosjektet som aktiviteten er en del
av</label>
+
<label style="display:block;"><xsl:value-of select="php:function('lang',
'Choose the project in which the activity is part of')" /></label>
<select id="select_project" name="select_project">
-
<option>Velg prosjekt</option>
+
<option><xsl:value-of select="php:function('lang', 'Choose project')"
/></option>
<xsl:for-each select="projects">
<option
value="{id}">
<xsl:if test="project/id = project_id">
@@ -78,9 +78,9 @@
<xsl:otherwise>
<dt>
<div
style="margin-bottom: 1em;">
-
<label style="display:block;">Velg et annet prosjekt for aktiviteten </label>
+
<label style="display:block;"><xsl:value-of select="php:function('lang',
'Choose another project for the activity')" /></label>
<select id="select_project" name="select_project">
-
<option>Velg annet prosjekt</option>
+
<option><xsl:value-of select="php:function('lang', 'Choose another
project')" /></option>
<xsl:for-each select="projects">
<option
value="{id}">
<xsl:if test="project/id = project_id">
@@ -106,7 +106,7 @@
<xsl:variable
name="error_msg"><xsl:value-of select="activity/error_msg_array/name"
/></xsl:variable>
<div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
</xsl:if>
- <div
class="help_text">Angi navn for aktiviteten</div>
+ <div
class="help_text"><xsl:value-of select="php:function('lang','Give name to this
activity')" /></div>
<input type="text"
name="name" id="name" value="{activity/name}" size="100"/>
</xsl:when>
<xsl:otherwise>
@@ -124,7 +124,7 @@
<xsl:variable
name="error_msg"><xsl:value-of select="activity/error_msg_array/description"
/></xsl:variable>
<div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
</xsl:if>
- <div
class="help_text">Gi en beskrivelse av aktiviteten</div>
+ <div
class="help_text"><xsl:value-of select="php:function('lang','Give description
to activity')" /></div>
<textarea
id="description" name="description" rows="5" cols="60"><xsl:value-of
select="activity/description" disable-output-escaping="yes"/></textarea>
</xsl:when>
<xsl:otherwise>
@@ -133,7 +133,7 @@
</xsl:choose>
</dd>
<dt>
- <label
for="start_date">Startdato</label>
+ <label
for="start_date"><xsl:value-of select="php:function('lang','Start date')"
/></label>
</dt>
<dd>
<xsl:choose>
@@ -142,7 +142,7 @@
<xsl:variable name="error_msg"><xsl:value-of
select="activity/error_msg_array/start_date" /></xsl:variable>
<div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
</xsl:if>
- <div
class="help_text">Angi startdato for aktiviteten</div>
+ <div
class="help_text"><xsl:value-of select="php:function('lang','Give start date to
activity')" /></div>
<input
class="date" id="start_date" name="start_date" type="text">
<xsl:if
test="activity/start_date != ''">
<xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(activity/start_date))"/></xsl:attribute>
@@ -155,7 +155,7 @@
</xsl:choose>
</dd>
<dt>
- <label
for="end_date">Sluttdato</label>
+ <label
for="end_date"><xsl:value-of select="php:function('lang','End date')" /></label>
</dt>
<dd>
<xsl:choose>
@@ -164,7 +164,7 @@
<xsl:variable name="error_msg"><xsl:value-of
select="activity/error_msg_array/end_date" /></xsl:variable>
<div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
</xsl:if>
- <div
class="help_text">Angi sluttdato for aktiviteten</div>
+ <div
class="help_text"><xsl:value-of select="php:function('lang','Give end date to
activity')" /></div>
<input
class="date" id="end_date" name="end_date" type="text">
<xsl:if
test="activity/end_date != ''">
<xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(activity/end_date))"/></xsl:attribute>
@@ -177,7 +177,7 @@
</xsl:choose>
</dd>
<dt>
- <label
for="end_date">Ansvarlig</label>
+ <label
for="end_date"><xsl:value-of select="php:function('lang', 'Responsible
person')" /></label>
</dt>
<dd>
<xsl:choose>
@@ -186,7 +186,7 @@
<xsl:variable name="error_msg"><xsl:value-of
select="activity/error_msg_array/responsible_user_id" /></xsl:variable>
<div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
</xsl:if>
- <div
class="help_text">Angi hvilken person som skal være ansvarlig for
aktiviteten</div>
+ <div
class="help_text"><xsl:value-of select="php:function('lang', 'Responsible
person for activity')" /></div>
<select
name="responsible_user_id">
<option
value="">Velg ansvarlig bruker</option>
<xsl:for-each
select="responsible_users">
Modified: trunk/logistic/templates/base/activity/view_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/view_activity_item.xsl
2012-11-05 08:38:35 UTC (rev 10468)
+++ trunk/logistic/templates/base/activity/view_activity_item.xsl
2012-11-05 09:02:14 UTC (rev 10469)
@@ -14,166 +14,46 @@
<input type="hidden" name="parent_id"
value="{parent_activity/id}" />
<dl class="proplist-col">
- <xsl:if test="parent_activity/id >
0">
- <dt>
- <xsl:if test="editable">
- <div
style="margin-bottom: 1em;width: 88%;" class="select-box">
- <label>Velg en
annen hovedaktivitet</label>
- <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>
- </div>
- </xsl:if>
- </dt>
- </xsl:if>
<dt>
<label for="name"><xsl:value-of
select="php:function('lang','Activity name')" /></label>
</dt>
<dd>
- <xsl:choose>
- <xsl:when test="editable">
- <xsl:if
test="activity/error_msg_array/name != ''">
- <xsl:variable
name="error_msg"><xsl:value-of select="activity/error_msg_array/name"
/></xsl:variable>
- <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
- </xsl:if>
- <input type="text"
name="name" id="name" value="{activity/name}" size="100"/>
- <span class="help_text
line">Angi startdato for aktiviteten</span>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="activity/name" />
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:value-of
select="activity/name" />
</dd>
<dt>
<label
for="description"><xsl:value-of select="php:function('lang', 'Description')"
/></label>
</dt>
<dd>
- <xsl:choose>
- <xsl:when test="editable">
- <xsl:if
test="activity/error_msg_array/description != ''">
- <xsl:variable
name="error_msg"><xsl:value-of select="activity/error_msg_array/description"
/></xsl:variable>
- <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
- </xsl:if>
- <textarea
id="description" name="description" rows="5" cols="60"><xsl:value-of
select="activity/description" disable-output-escaping="yes"/></textarea>
- <span class="help_text
line">Angi startdato for aktiviteten</span>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="activity/description" disable-output-escaping="yes"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:value-of
select="activity/description" disable-output-escaping="yes"/>
</dd>
<dt>
- <label
for="start_date">Startdato</label>
+ <label
for="start_date"><xsl:value-of select="php:function('lang','Start date')"
/></label>
</dt>
<dd>
- <xsl:choose>
- <xsl:when
test="editable">
- <xsl:if
test="activity/error_msg_array/start_date != ''">
-
<xsl:variable name="error_msg"><xsl:value-of
select="activity/error_msg_array/start_date" /></xsl:variable>
- <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
- </xsl:if>
- <input
class="date" id="start_date" name="start_date" type="text">
- <xsl:if
test="activity/start_date != ''">
- <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(activity/start_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- <span class="help_text
line">Angi startdato for aktiviteten</span>
- </xsl:when>
- <xsl:otherwise>
- <span><xsl:value-of
select="php:function('date', $date_format,
number(activity/start_date))"/></span>
- </xsl:otherwise>
- </xsl:choose>
+ <span><xsl:value-of
select="php:function('date', $date_format,
number(activity/start_date))"/></span>
</dd>
<dt>
- <label
for="end_date">Sluttdato</label>
+ <label
for="end_date"><xsl:value-of select="php:function('lang','End date')" /></label>
</dt>
<dd>
- <xsl:choose>
- <xsl:when
test="editable">
- <xsl:if
test="activity/error_msg_array/end_date != ''">
-
<xsl:variable name="error_msg"><xsl:value-of
select="activity/error_msg_array/end_date" /></xsl:variable>
- <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
- </xsl:if>
- <input
class="date" id="end_date" name="end_date" type="text">
- <xsl:if
test="activity/end_date != ''">
- <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(activity/end_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- <span class="help_text
line">Angi startdato for aktiviteten</span>
- </xsl:when>
- <xsl:otherwise>
- <span><xsl:value-of
select="php:function('date', $date_format, number(activity/end_date))"/></span>
- </xsl:otherwise>
- </xsl:choose>
+ <span><xsl:value-of
select="php:function('date', $date_format, number(activity/end_date))"/></span>
</dd>
<dt>
<label
for="end_date">Ansvarlig</label>
</dt>
<dd>
- <xsl:choose>
- <xsl:when
test="editable">
- <xsl:if
test="activity/error_msg_array/responsible_user_id != ''">
-
<xsl:variable name="error_msg"><xsl:value-of
select="activity/error_msg_array/responsible_user_id" /></xsl:variable>
- <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
- </xsl:if>
- <select
name="responsible_user_id">
- <option
value="">Velg ansvarlig bruker</option>
- <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>
- <xsl:choose>
- <xsl:when
test="//activity/responsible_user_id = account_id">
-
<option selected="selected" value="{account_id}">
-
<xsl:value-of disable-output-escaping="yes" select="$full_name"/>
-
</option>
- </xsl:when>
- <xsl:otherwise>
- <option
value="{account_id}">
-
<xsl:value-of disable-output-escaping="yes" select="$full_name"/>
-
</option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </select>
- <span class="help_text line">Angi
startdato for aktiviteten</span>
- </xsl:when>
- <xsl:otherwise>
- <span><xsl:value-of
select="activity/responsible_user_name"/></span>
- </xsl:otherwise>
- </xsl:choose>
+ <span><xsl:value-of
select="activity/responsible_user_name"/></span>
</dd>
</dl>
<div class="form-buttons">
- <xsl:choose>
- <xsl:when test="editable">
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
- <xsl:variable
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')"
/></xsl:variable>
- <input type="submit"
name="save_activity" value="{$lang_save}" title = "{$lang_save}" />
- <input type="submit"
name="cancel_activity" value="{$lang_cancel}" title = "{$lang_cancel}" />
- </xsl:when>
- <xsl:otherwise>
- <xsl:variable
name="params">
-
<xsl:text>menuaction:logistic.uiactivity.edit, id:</xsl:text>
- <xsl:value-of
select="activity/id" />
- </xsl:variable>
- <xsl:variable
name="edit_url">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $params )" />
- </xsl:variable>
- <a class="btn"
href="{$edit_url}"><xsl:value-of select="php:function('lang', 'edit')" /></a>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:variable name="params">
+
<xsl:text>menuaction:logistic.uiactivity.edit, id:</xsl:text>
+ <xsl:value-of
select="activity/id" />
+ </xsl:variable>
+ <xsl:variable name="edit_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $params )" />
+ </xsl:variable>
+ <a class="btn"
href="{$edit_url}"><xsl:value-of select="php:function('lang', 'edit')" /></a>
</div>
</form>
Modified: trunk/logistic/templates/base/project/project_item.xsl
===================================================================
--- trunk/logistic/templates/base/project/project_item.xsl 2012-11-05
08:38:35 UTC (rev 10468)
+++ trunk/logistic/templates/base/project/project_item.xsl 2012-11-05
09:02:14 UTC (rev 10469)
@@ -38,7 +38,7 @@
<xsl:variable
name="error_msg"><xsl:value-of select="project/error_msg_array/name"
/></xsl:variable>
<div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
</xsl:if>
- <div
style="margin-left:0; margin-bottom: 3px;" class="help_text line">Angi navn for
prosjektet</div>
+ <div
style="margin-left:0; margin-bottom: 3px;" class="help_text line"><xsl:value-of
select="php:function('lang','Give project name')" /></div>
<input type="text"
name="name" id="name" value="{project/name}" size="100"/>
</xsl:when>
<xsl:otherwise>
@@ -56,7 +56,7 @@
<xsl:variable
name="error_msg"><xsl:value-of select="project/error_msg_array/project_type_id"
/></xsl:variable>
<div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
</xsl:if>
- <div
style="margin-left:0; margin-bottom: 3px;" class="help_text line">Angi
prosjekttype</div>
+ <div
style="margin-left:0; margin-bottom: 3px;" class="help_text line"><xsl:value-of
select="php:function('lang','Give project type')" /></div>
<select
id="project_type_id" name="project_type_id">
<xsl:apply-templates select="options"/>
</select>
@@ -76,7 +76,7 @@
<xsl:variable
name="error_msg"><xsl:value-of select="project/error_msg_array/description"
/></xsl:variable>
<div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
</xsl:if>
- <div
style="margin-left:0; margin-bottom: 3px;" class="help_text line">Gi en
beskrivelse av prosjektet</div>
+ <div
style="margin-left:0; margin-bottom: 3px;" class="help_text line"><xsl:value-of
select="php:function('lang','Give description to the project')" /></div>
<textarea
id="description" name="description" rows="5" cols="60"><xsl:value-of
select="project/description" disable-output-escaping="yes"/></textarea>
</xsl:when>
<xsl:otherwise>
@@ -85,7 +85,7 @@
</xsl:choose>
</dd>
<dt>
- <label
for="start_date">Startdato</label>
+ <label
for="start_date"><xsl:value-of select="php:function('lang','Start date')"
/></label>
</dt>
<dd>
<xsl:choose>
@@ -99,7 +99,7 @@
<xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(project/start_date))"/></xsl:attribute>
</xsl:if>
</input>
- <span class="help_text
line">Angi startdato for prosjektet</span>
+ <span class="help_text
line"><xsl:value-of select="php:function('lang','Give start date to project')"
/></span>
</xsl:when>
<xsl:otherwise>
<span><xsl:value-of
select="php:function('date', $date_format, number(project/start_date))"/></span>
@@ -107,7 +107,7 @@
</xsl:choose>
</dd>
<dt>
- <label
for="end_date">Sluttdato</label>
+ <label
for="end_date"><xsl:value-of select="php:function('lang','End date')" /></label>
</dt>
<dd>
<xsl:choose>
@@ -121,7 +121,7 @@
<xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(project/end_date))"/></xsl:attribute>
</xsl:if>
</input>
- <span class="help_text
line">Angi sluttdato for prosjektet</span>
+ <span class="help_text
line"><xsl:value-of select="php:function('lang','Give end date to project')"
/></span>
</xsl:when>
<xsl:otherwise>
<span><xsl:value-of
select="php:function('date', $date_format, number(project/end_date))"/></span>
@@ -148,7 +148,7 @@
<xsl:variable
name="view_projects_url_2">
<xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:logistic.uiproject.index' )" />
</xsl:variable>
- <a class="btn"
href="{$view_projects_url_2}">Vis prosjektoversikt</a>
+ <a class="btn"
href="{$view_projects_url_2}"><xsl:value-of select="php:function('lang','Show
project overview')" /></a>
</xsl:otherwise>
</xsl:choose>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10469],
Torstein <=