[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9517]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9517] |
|
Date: |
Wed, 06 Jun 2012 10:26:30 +0000 |
Revision: 9517
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9517
Author: vator
Date: 2012-06-06 10:26:30 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/templates/base/check_list/view_control_details.xsl
trunk/controller/templates/base/check_list/view_control_items.xsl
trunk/controller/templates/base/control_item/choose_control_items.xsl
Modified: trunk/controller/templates/base/check_list/view_control_details.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_details.xsl
2012-06-06 10:25:58 UTC (rev 9516)
+++ trunk/controller/templates/base/check_list/view_control_details.xsl
2012-06-06 10:26:30 UTC (rev 9517)
@@ -3,6 +3,8 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <h2>Kontrolldetaljer</h2>
+
<fieldset id="control_details">
<div class="row">
<label>Kontrollområde</label>
Modified: trunk/controller/templates/base/check_list/view_control_items.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_items.xsl
2012-06-06 10:25:58 UTC (rev 9516)
+++ trunk/controller/templates/base/check_list/view_control_items.xsl
2012-06-06 10:26:30 UTC (rev 9517)
@@ -2,47 +2,62 @@
<xsl:template match="data">
-<ul>
- <xsl:for-each select="saved_groups_with_items_array">
- <li>
- <h3><xsl:value-of
select="control_group/group_name"/></h3>
+<div id="control-items">
+ <h2>Kontrollpunkter</h2>
- <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
+ <ul class="groups">
+ <xsl:for-each select="saved_groups_with_items_array">
+ <li>
+ <h3><xsl:value-of
select="control_group/group_name"/></h3>
+
+ <xsl:variable name="control_group_id"><xsl:value-of
select="control_group/id"/></xsl:variable>
<input type="hidden" name="control_group_id"
value="{$control_group_id}" />
- <ul>
- <xsl:for-each select="control_items">
- <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
- <xsl:variable name="order_tag">
- <xsl:choose>
- <xsl:when
test="order_nr > 0">
-
<xsl:value-of select="order_nr"/>
- </xsl:when>
- <xsl:otherwise>
-
<xsl:number/>
- </xsl:otherwise>
-
</xsl:choose>:<xsl:value-of select="id"/>
- </xsl:variable>
-
- <li>
- <span>
- <span
class="order_nr"><xsl:number/></span>. <xsl:value-of select="title"/><input
type="hidden" name="order_nr[]" value="{$order_tag}" />
- </span>
- </li>
- </xsl:for-each>
- </ul>
- </li>
- </xsl:for-each>
-</ul>
-
-<a id="print-control-items" class="btn" target="_blank">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.print_check_list</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- <xsl:text>&phpgw_return_as=stripped_html</xsl:text>
- </xsl:attribute>
- Skriv ut
-</a>
-
+ <xsl:choose>
+ <xsl:when
test="control_items/child::node()">
+ <ul class="control_items">
+ <xsl:for-each
select="control_items">
+
+ <!-- Control
Item Id -->
+ <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
+
+ <!-- Calculates
order nr -->
+ <xsl:variable
name="order_tag">
+
<xsl:choose>
+
<xsl:when test="order_nr > 0">
+
<xsl:value-of select="order_nr"/>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:number/>
+
</xsl:otherwise>
+
</xsl:choose>:<xsl:value-of select="id"/>
+ </xsl:variable>
+
+ <!-- Prints the
row -->
+ <li>
+ <span>
+
<span class="order_nr"><xsl:number/></span>. <xsl:value-of
select="title"/><input type="hidden" name="order_nr[]" value="{$order_tag}" />
+ </span>
+ </li>
+ </xsl:for-each>
+ </ul>
+ </xsl:when>
+ <xsl:otherwise>
+ <p class="no_items_msg">Ingen
kontrollpunkt lagt til fra denne gruppen</p>
+ </xsl:otherwise>
+ </xsl:choose>
+ </li>
+ </xsl:for-each>
+ </ul>
+
+ <a class="btn print" target="_blank">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.print_check_list</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ <xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ </xsl:attribute>
+ Skriv ut
+ </a>
+</div>
</xsl:template>
Modified: trunk/controller/templates/base/control_item/choose_control_items.xsl
===================================================================
--- trunk/controller/templates/base/control_item/choose_control_items.xsl
2012-06-06 10:25:58 UTC (rev 9516)
+++ trunk/controller/templates/base/control_item/choose_control_items.xsl
2012-06-06 10:26:30 UTC (rev 9517)
@@ -16,7 +16,7 @@
<xsl:variable name="control_group_ids"><xsl:value-of
select="control_group_ids"/></xsl:variable>
<input type="hidden" name="control_group_ids"
value="{control_group_ids}" />
- <ul class="control_items">
+
<xsl:for-each
select="groups_with_control_items">
<ul class="expand_list">
<li>
@@ -46,7 +46,7 @@
</li>
</ul>
</xsl:for-each>
- </ul>
+
<div>
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save')" /></xsl:variable>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9517],
Torstein <=