|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [9463] |
| Date: | Tue, 29 May 2012 02:12:51 +0000 |
Revision: 9463
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9463
Author: vator
Date: 2012-05-29 02:12:51 +0000 (Tue, 29 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/templates/base/check_list/view_open_cases.xsl
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-05-29 01:40:37 UTC
(rev 9462)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-05-29 02:12:51 UTC
(rev 9463)
@@ -639,7 +639,7 @@
$open_check_items_and_cases[$key] = $check_item;
}
-
+
$data = array
(
'open_check_items_and_cases' =>
$open_check_items_and_cases,
Modified: trunk/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-05-29 01:40:37 UTC (rev 9462)
+++ trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-05-29 02:12:51 UTC (rev 9463)
@@ -14,113 +14,103 @@
<ul class="check_items">
<xsl:for-each
select="open_check_items_and_cases">
<xsl:choose>
- <xsl:when
test="cases_array/child::node()">
- <li
class="check_item_case">
-
<xsl:choose>
-
<xsl:when test="control_item/type = 'control_item_type_1'">
-
<h2 class="last">Saker</h2>
-
<xsl:choose>
-
<xsl:when test="open_check_items_and_cases/child::node()">
-
<ul class="check_items">
-
<xsl:for-each select="open_check_items_and_cases">
-
<xsl:choose>
-
<xsl:when
test="cases_array/child::node()">
-
<li class="check_item_case">
-
<h4><span><xsl:value-of
select="control_item/title"/></span></h4>
-
<ul>
-
<xsl:for-each
select="cases_array">
-
<xsl:variable name="cases_id"><xsl:value-of select="id"/></xsl:variable>
-
<li>
-
-
<!--
==================== COL1: ORDERNR ===================== -->
-
<div
class="col_1">
-
<span class="order_nr"><xsl:number /></span>.
-
</div>
-
<!--
==================== COL2: CASE CONTENT ===================== -->
-
<div
class="col_2">
-
<form style="display:none;" class="frm_update_case">
-
<xsl:attribute name="action">
-
<xsl:text>index.php?menuaction=controller.uicase.save_case</xsl:text>
-
<xsl:text>&case_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="//check_list/id"/>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
</xsl:attribute>
-
-
<textarea name="case_descr"><xsl:value-of select="descr"/></textarea>
-
<div>
-
<input class='btn_m' type='submit' value='Oppdater' /><input
class='btn_m cancel' type='button' value='Avbryt' />
-
</div>
-
</form>
-
<div class="case_info">
-
<div class="case_descr"><xsl:value-of select="descr"/></div>
-
<div class="quick_menu">
-
<a class="quick_edit_case first" href="">
-
endre
-
</a>
-
<a class="close_case">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicase.close_case</xsl:text>
-
<xsl:text>&case_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="//check_list/id"/>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
</xsl:attribute>
-
lukk
-
</a>
-
<xsl:choose>
-
<xsl:when test="location_item_id = 0">
-
<a class="delete_case">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicase.delete_case</xsl:text>
-
<xsl:text>&case_id=</xsl:text>
-
<xsl:value-of
select="id"/>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of
select="//check_list/id"/>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
</xsl:attribute>
-
slett
-
</a>
-
</xsl:when>
-
</xsl:choose>
-
</div>
-
</div>
-
</div>
-
<!-- ==================== COL3: MESSAGE LINK ===================== -->
-
<div class="col_3">
-
-
<xsl:choose>
-
<xsl:when test="location_item_id > 0">
-
<a target="_blank">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
-
<xsl:text>&id=</xsl:text>
-
<xsl:value-of
select="location_item_id"/>
-
</xsl:attribute>
-
Vis melding
-
</a>
-
</xsl:when>
-
<xsl:otherwise>
-
<span class="message">Ingen melding</span>
-
</xsl:otherwise>
-
</xsl:choose>
-
</div>
-
</li>
-
</xsl:for-each>
-
</ul>
-
</li>
-
</xsl:when>
-
</xsl:choose>
-
</xsl:for-each>
-
</ul>
-
</xsl:when>
-
<xsl:otherwise>
-
<p>Ingen åpne saker</p>
-
</xsl:otherwise>
-
</xsl:choose>
-
</xsl:when>
+ <xsl:when
test="control_item/type = 'control_item_type_1'">
+ <h2>Saker</h2>
+ <xsl:choose>
+
<xsl:when test="cases_array/child::node()">
+
<li class="check_item_case">
+
+
<h4><span><xsl:value-of select="control_item/title"/></span></h4>
+ <span
style="display:none;" class="control_item_type"><xsl:value-of
select="control_item/type" /></span>
+ <ul>
+
+
<xsl:for-each select="cases_array">
+
<xsl:variable name="cases_id"><xsl:value-of select="id"/></xsl:variable>
+
<li>
+
+
<!-- ==================== COL1: ORDERNR ===================== -->
+
<div class="col_1">
+
<span class="order_nr"><xsl:number /></span>.
+
</div>
+
<!-- ==================== COL2: CASE CONTENT ===================== -->
+
<div class="col_2">
+
<form style="display:none;" class="frm_update_case">
+
<xsl:attribute name="action">
+
<xsl:text>index.php?menuaction=controller.uicase.save_case</xsl:text>
+
<xsl:text>&case_id=</xsl:text>
+
<xsl:value-of select="id"/>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="//check_list/id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
</xsl:attribute>
+
+
<textarea name="case_descr"><xsl:value-of
select="descr"/></textarea>
+
<div>
+
<input class='btn_m' type='submit'
value='Oppdater' /><input class='btn_m cancel' type='button' value='Avbryt' />
+
</div>
+
</form>
+
<div class="case_info">
+
<div class="case_descr"><xsl:value-of
select="descr"/></div>
+
<div class="quick_menu">
+
<a class="quick_edit_case first"
href="">
+
endre
+
</a>
+
<a class="close_case">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicase.close_case</xsl:text>
+
<xsl:text>&case_id=</xsl:text>
+
<xsl:value-of
select="id"/>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of
select="//check_list/id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
</xsl:attribute>
+
lukk
+
</a>
+
<xsl:choose>
+
<xsl:when
test="location_item_id = 0">
+
<a class="delete_case">
+
<xsl:attribute
name="href">
+
<xsl:text>index.php?menuaction=controller.uicase.delete_case</xsl:text>
+
<xsl:text>&case_id=</xsl:text>
+
<xsl:value-of select="id"/>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="//check_list/id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
</xsl:attribute>
+
slett
+
</a>
+
</xsl:when>
+
</xsl:choose>
+
</div>
+
</div>
+
</div>
+
<!-- ==================== COL3: MESSAGE LINK
===================== -->
+
<div class="col_3">
+
+
<xsl:choose>
+
<xsl:when test="location_item_id > 0">
+
<a target="_blank">
+
<xsl:attribute
name="href">
+
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
+
<xsl:text>&id=</xsl:text>
+
<xsl:value-of
select="location_item_id"/>
+
</xsl:attribute>
+
Vis melding
+
</a>
+
</xsl:when>
+
<xsl:otherwise>
+
<span class="message">Ingen
melding</span>
+
</xsl:otherwise>
+
</xsl:choose>
+
</div>
+
</li>
+
</xsl:for-each>
+
</ul>
+
+
</li>
+
</xsl:when>
+
</xsl:choose>
+
</xsl:when>
<xsl:when test="control_item/type = 'control_item_type_2'">
<h2>Målinger</h2>
<h4><span><xsl:value-of select="control_item/title"/></span></h4>
@@ -417,9 +407,6 @@
</ul>
</xsl:when>
</xsl:choose>
- </li>
- </xsl:when>
- </xsl:choose>
</xsl:for-each>
</ul>
</xsl:when>
| [Prev in Thread] | Current Thread | [Next in Thread] |