[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9772]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9772] |
|
Date: |
Sat, 14 Jul 2012 18:35:56 +0000 |
Revision: 9772
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9772
Author: vator
Date: 2012-07-14 18:35:56 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/setup/phpgw_no.lang
trunk/controller/templates/base/control/control.xsl
Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang 2012-07-14 18:35:40 UTC (rev
9771)
+++ trunk/controller/setup/phpgw_no.lang 2012-07-14 18:35:56 UTC (rev
9772)
@@ -351,4 +351,5 @@
select add controller no Velg for å legge til
select delete controller no Velg for sletting
error_msg_1 controller no Vennligst fyll inn dette feltet
-error_msg_2 controller no Vennligst velg en verdi i listen
\ No newline at end of file
+error_msg_2 controller no Vennligst velg en verdi i listen
+error_msg_3 controller no Vennligst angi sluttdato etter startdato
\ No newline at end of file
Modified: trunk/controller/templates/base/control/control.xsl
===================================================================
--- trunk/controller/templates/base/control/control.xsl 2012-07-14 18:35:40 UTC
(rev 9771)
+++ trunk/controller/templates/base/control/control.xsl 2012-07-14 18:35:56 UTC
(rev 9772)
@@ -39,6 +39,10 @@
<dd>
<xsl:choose>
<xsl:when test="editable">
+ <xsl:if
test="control/error_msg_array/control_area_id != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of select="control/error_msg_array/control_area_id"
/></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
<select class="required"
id="control_area_id" name="control_area_id">
<option value="">Velg
kontrollområde</option>
<xsl:for-each
select="control_areas_array">
@@ -56,7 +60,7 @@
</xsl:choose>
</xsl:for-each>
</select>
- <span class="help_text">Angi
hvilket kontrollområde kontrollen skal gjelde for</span>
+ <span class="help_text
line">Angi hvilket kontrollområde kontrollen skal gjelde for</span>
</xsl:when>
<xsl:otherwise>
<xsl:value-of
select="control/control_area_name" />
@@ -69,6 +73,10 @@
<dd>
<xsl:choose>
<xsl:when test="editable">
+ <xsl:if
test="control/error_msg_array/procedure_id != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of select="control/error_msg_array/procedure_id"
/></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
<select id="procedure_id"
name="procedure_id">
<option value="">Velg
prosedyre</option>
<xsl:for-each
select="procedures_array">
@@ -86,7 +94,7 @@
</xsl:choose>
</xsl:for-each>
</select>
- <span class="help_text">Angi
hvilken prosedyre som ligger til grunn for kontrollen</span>
+ <span class="help_text
line">Angi hvilken prosedyre som ligger til grunn for kontrollen</span>
</xsl:when>
<xsl:otherwise>
<xsl:value-of
select="control/procedure_name" />
@@ -99,8 +107,12 @@
<dd>
<xsl:choose>
<xsl:when test="editable">
+ <xsl:if
test="control/error_msg_array/title != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of select="control/error_msg_array/title"
/></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
<input class="required"
type="text" name="title" id="title" value="{control/title}" size="70"/>
- <div class="help_text
ext">Angi tittel på kontrollen</div>
+ <div class="help_text
below">Angi tittel på kontrollen</div>
</xsl:when>
<xsl:otherwise>
<xsl:value-of
select="control/title" />
@@ -111,33 +123,45 @@
<label
for="start_date">Startdato</label>
</dt>
<dd>
+ <xsl:if
test="control/error_msg_array/start_date != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of select="control/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="required date"
id="start_date" name="start_date" type="text">
- <xsl:if test="control/start_date != ''">
- <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(control/start_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- <span class="help_text">Angi startdato for
kontrollen</span>
+ <xsl:if test="control/start_date != 0">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(control/start_date))"/></xsl:attribute>
+ </xsl:if>
+ </input>
+ <span class="help_text line">Angi startdato for
kontrollen</span>
</dd>
<dt>
<label for="end_date">Sluttdato</label>
</dt>
<dd>
+ <xsl:if
test="control/error_msg_array/end_date != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of select="control/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="control/end_date != 0">
- <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(control/end_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- <span class="help_text">Angi sluttdato for
kontrollen. Hvis kontrollen ikke har sluttdato, lar du feltet være tomt</span>
+ <xsl:if test="control/end_date != 0">
+ <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(control/end_date))"/></xsl:attribute>
+ </xsl:if>
+ </input>
+ <span class="help_text line">Angi sluttdato
for kontrollen. Hvis kontrollen ikke har sluttdato, lar du feltet være
tomt</span>
</dd>
<dt>
<label>Frekvenstype</label>
</dt>
<dd>
+ <xsl:if
test="control/error_msg_array/repeat_type != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of select="control/error_msg_array/repeat_type"
/></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
<select class="required"
id="repeat_type" name="repeat_type">
<option value="">Velg
frekvenstype</option>
<xsl:for-each
select="repeat_type_array">
<xsl:choose>
- <xsl:when
test="id = $control_repeat_type">
+ <xsl:when
test="id = //control/repeat_type">
<option
value="{id}" selected="selected">
<xsl:value-of disable-output-escaping="yes" select="value"/>
</option>
@@ -150,7 +174,7 @@
</xsl:choose>
</xsl:for-each>
</select>
- <span class="help_text">Angi hvilken
frekvenstype kontrollen skal ha</span>
+ <span class="help_text line">Angi
hvilken frekvenstype kontrollen skal ha</span>
</dd>
<dt>
<label>Frekvens</label>
@@ -158,8 +182,12 @@
<dd>
<xsl:choose>
<xsl:when test="editable">
+ <xsl:if
test="control/error_msg_array/repeat_interval != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of select="control/error_msg_array/repeat_interval"
/></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
<input class="required"
id="repeat_interval" size="2" type="text" name="repeat_interval"
value="{control/repeat_interval}" />
- <span class="help_text">Angi
hvilket frekvensintervall kontrollen skal ha. Hvis du velger 2, betyr det
eksempelvis at kontrollen skal gjennomføres annenhver dag</span>
+ <span class="help_text
line">Angi frekvensintervall. 2, betyr det eksempelvis at kontrollen
gjennomføres annenhver dag</span>
</xsl:when>
<xsl:otherwise>
<xsl:value-of
select="control/repeat_interval" />
@@ -172,6 +200,10 @@
<dd>
<xsl:choose>
<xsl:when test="editable">
+ <xsl:if
test="control/error_msg_array/responsibility_id != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of
select="control/error_msg_array/responsibility_id" /></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
<select class="required"
id="responsibility_id" name="responsibility_id">
<xsl:for-each
select="role_array">
<xsl:choose>
@@ -188,7 +220,7 @@
</xsl:choose>
</xsl:for-each>
</select>
- <span class="help_text">Angi
hvilken rolle som skal ha ansvar for å gjennomføre kontrollen på de ulike
byggene</span>
+ <span class="help_text
line">Angi hvilken rolle som skal ha ansvar for å gjennomføre kontrollen på de
ulike byggene</span>
</xsl:when>
<xsl:otherwise>
<xsl:value-of
select="control/role_name" />
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9772],
Torstein <=