[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10757] Added status check for cancelled control
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [10757] Added status check for cancelled control |
|
Date: |
Wed, 06 Feb 2013 06:57:37 +0000 |
Revision: 10757
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10757
Author: vator
Date: 2013-02-06 06:57:37 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
Added status check for cancelled control
Modified Paths:
--------------
trunk/controller/templates/base/check_list/add_check_list.xsl
trunk/controller/templates/base/check_list/edit_check_list.xsl
Modified: trunk/controller/templates/base/check_list/add_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_check_list.xsl
2013-02-06 06:56:25 UTC (rev 10756)
+++ trunk/controller/templates/base/check_list/add_check_list.xsl
2013-02-06 06:57:37 UTC (rev 10757)
@@ -42,7 +42,7 @@
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
- Kontrollplan for bygg/eiendom (år)
+ Vis kontrollplan (år)
</a>
<a class="last">
@@ -62,7 +62,7 @@
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
- Kontrolplan for bygg/eiendom (måned)
+ Vis kontrollplan (måned)
</a>
</div>
</div>
@@ -121,15 +121,23 @@
<xsl:choose>
<xsl:when
test="check_list/status = 0">
<option
value="1">Utført</option>
- <option
value="0" SELECTED="SELECTED" >Ikke utført</option>
+ <option
value="0" SELECTED="SELECTED">Ikke utført</option>
+ <option value="3">Kansellert</option>
</xsl:when>
<xsl:when
test="check_list/status = 1">
<option
value="1" SELECTED="SELECTED">Utført</option>
<option
value="0">Ikke utført</option>
+ <option value="3">Kansellert</option>
</xsl:when>
+ <xsl:when test="check_list/status = 3">
+ <option
value="3" SELECTED="SELECTED">Kansellert</option>
+ <option
value="0">Ikke utført</option>
+ <option value="1">Utført</option>
+ </xsl:when>
<xsl:otherwise>
- <option
value="0">Ikke utført</option>
+ <option
value="0" SELECTED="SELECTED">Ikke utført</option>
<option
value="1">Utført</option>
+ <option value="3">Kansellert</option>
</xsl:otherwise>
</xsl:choose>
</select>
@@ -183,7 +191,7 @@
<div class="form-buttons">
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_list')" /></xsl:variable>
- <input class="btn not_active" type="submit"
value="Lagre detaljer" />
+ <input class="btn" type="submit" value="Lagre
detaljer" />
</div>
</form>
</div>
Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl
2013-02-06 06:56:25 UTC (rev 10756)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl
2013-02-06 06:57:37 UTC (rev 10757)
@@ -43,7 +43,7 @@
</xsl:choose>
<xsl:value-of select="$session_url"/>
</xsl:attribute>
- Kontrolplan for bygg/eiendom (år)
+ Vis kontrolplan (år)
</a>
<a class="last">
<xsl:attribute name="href">
@@ -63,7 +63,7 @@
</xsl:choose>
<xsl:value-of select="$session_url"/>
</xsl:attribute>
- Kontrolplan for bygg/eiendom (måned)
+ Vis kontrolplan (måned)
</a>
</div>
@@ -85,22 +85,30 @@
<div class="row">
<label>Status</label>
<xsl:variable name="status"><xsl:value-of
select="check_list/status"/></xsl:variable>
- <select id="status" name="status">
- <xsl:choose>
- <xsl:when
test="check_list/status = 0">
- <option
value="1">Utført</option>
- <option value="0"
SELECTED="SELECTED" >Ikke utført</option>
- </xsl:when>
- <xsl:when
test="check_list/status = 1">
- <option value="1"
SELECTED="SELECTED">Utført</option>
- <option value="0">Ikke
utført</option>
- </xsl:when>
- <xsl:otherwise>
- <option
value="1">Utført</option>
- <option value="0">Ikke
utført</option>
- </xsl:otherwise>
- </xsl:choose>
- </select>
+ <select id="status" name="status">
+ <xsl:choose>
+ <xsl:when
test="check_list/status = 0">
+ <option
value="1">Utført</option>
+ <option
value="0" SELECTED="SELECTED">Ikke utført</option>
+ <option value="3">Kansellert</option>
+ </xsl:when>
+ <xsl:when
test="check_list/status = 1">
+ <option
value="1" SELECTED="SELECTED">Utført</option>
+ <option
value="0">Ikke utført</option>
+ <option value="3">Kansellert</option>
+ </xsl:when>
+ <xsl:when test="check_list/status = 3">
+ <option
value="3" SELECTED="SELECTED">Kansellert</option>
+ <option
value="0">Ikke utført</option>
+ <option value="1">Utført</option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option
value="0" SELECTED="SELECTED">Ikke utført</option>
+ <option
value="1">Utført</option>
+ <option value="3">Kansellert</option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </select>
</div>
<div class="row">
<label>Skal utføres innen</label>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10757] Added status check for cancelled control,
Torstein <=