[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8497]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8497] |
|
Date: |
Thu, 05 Jan 2012 15:53:01 +0000 |
Revision: 8497
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8497
Author: vator
Date: 2012-01-05 15:53:00 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/templates/base/view_control_info.xsl
Added Paths:
-----------
trunk/controller/templates/base/control_item/view_control_items.xsl
trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
Removed Paths:
-------------
trunk/controller/templates/base/control_item/sort_control_items.xsl
Deleted: trunk/controller/templates/base/control_item/sort_control_items.xsl
===================================================================
--- trunk/controller/templates/base/control_item/sort_control_items.xsl
2012-01-05 15:52:45 UTC (rev 8496)
+++ trunk/controller/templates/base/control_item/sort_control_items.xsl
2012-01-05 15:53:00 UTC (rev 8497)
@@ -1,18 +0,0 @@
-<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
-
-<xsl:template match="sort_control_items">
-
-<div>
- <ul class="control_items">
- <xsl:for-each select="control_items_array">
- <li>
- <h4><xsl:value-of select="title"/></h4>
- </li>
- </xsl:for-each>
- </ul>
-
- <div>
- <input class="btn" type="submit" name="save_control_items"
value="Print" />
- </div>
-</div>
-</xsl:template>
Copied: trunk/controller/templates/base/control_item/view_control_items.xsl
(from rev 8495,
trunk/controller/templates/base/control_item/sort_control_items.xsl)
===================================================================
--- trunk/controller/templates/base/control_item/view_control_items.xsl
(rev 0)
+++ trunk/controller/templates/base/control_item/view_control_items.xsl
2012-01-05 15:53:00 UTC (rev 8497)
@@ -0,0 +1,57 @@
+<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
+
+<xsl:template match="view_control_items">
+
+<ul class="groups">
+ <xsl:for-each select="saved_groups_with_items_array">
+ <li class="drag_group list_item">
+ <h3><span class="group_order_nr"><xsl:number/></span>.
<xsl:value-of select="control_group/group_name"/></h3>
+
+ <form
action="index.php?menuaction=controller.uicontrol_item.save_item_order"
class="frm_save_order">
+ <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 id="list">
+ <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 class="list_item">
+ <span class="drag">
+ <span
class="order_nr"><xsl:number/></span>. <xsl:value-of select="title"/><input
type="hidden" name="order_nr[]" value="{$order_tag}" />
+ </span>
+ <a class="delete">
+ <xsl:attribute
name="href">
+
<xsl:text>index.php?menuaction=controller.uicontrol_item.delete_item_list</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="//control_id"/>
+
<xsl:text>&control_item_id=</xsl:text>
+
<xsl:value-of select="id"/>
+ </xsl:attribute>
+ <span>x</span>
+ </a>
+ </li>
+ </xsl:for-each>
+ </ul>
+ <div>
+ <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_order')"
/></xsl:variable>
+ <input type="submit" id="save_order"
name="save_order" value="{$lang_save}" title = "{$lang_save}" style="opacity:
0.5;" disabled="disabled"/>
+ </div>
+ </form>
+ </li>
+ </xsl:for-each>
+</ul>
+
+
+
+
+</xsl:template>
Property changes on:
trunk/controller/templates/base/control_item/view_control_items.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
===================================================================
--- trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
(rev 0)
+++ trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
2012-01-05 15:53:00 UTC (rev 8497)
@@ -0,0 +1,21 @@
+<!-- $Id: procedure_item.xsl 8485 2012-01-05 08:21:03Z erikhl $ -->
+
+<xsl:template match="view_procedures_for_control">
+ <h3 style="margin:5px 0;">Prosedyre for kontroll</h3>
+
+ <span>Tittel: </span><xsl:value-of select="control_procedure/title"/>
+
+ <h3 style="margin:15px 0 3px 0;">Prosedyrer for grupper</h3>
+
+ <ul class="groups">
+ <xsl:for-each select="group_procedures_array">
+ <li class="list_item">
+ <h4 style="margin:2px 0;"><xsl:value-of
select="procedure/title"/></h4>
+ <div style="margin-left:10px;">
+ <span>Gruppe: </span><xsl:value-of
select="control_group/group_name"/>
+ <span style="margin-left:10px;">Skriv
ut</span>
+ </div>
+ </li>
+ </xsl:for-each>
+ </ul>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/controller/templates/base/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/view_control_info.xsl 2012-01-05
15:52:45 UTC (rev 8496)
+++ trunk/controller/templates/base/view_control_info.xsl 2012-01-05
15:53:00 UTC (rev 8497)
@@ -56,6 +56,20 @@
return false;
});
+ $("#view_procedures").click(function(){
+ var requestUrl = $(this).attr("href");
+
+ $.ajax({
+ type: 'POST',
+ url: requestUrl,
+ success: function(data) {
+ $("#tab_content").html(data);
+ }
+ });
+
+ return false;
+ });
+
});
</script>
@@ -80,19 +94,25 @@
Vis info om kontroll
</a>
</div>
-
-
+
<div class="tab_menu">
<a class="active">Kontrolldetaljer</a>
<a id="view_control_items">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_items</xsl:text>
- <xsl:text>&control_id=</xsl:text>
- <xsl:value-of select="control/id"/>
- </xsl:attribute>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_items</xsl:text>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of select="control/id"/>
+ </xsl:attribute>
Kontrollpunkter
</a>
- <a id="view_procedure" href="#view_procedure">Prosedyre</a>
+ <a id="view_procedures">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uiprocedure.view_procedures_for_control</xsl:text>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of select="control/id"/>
+ </xsl:attribute>
+ Prosedyrer
+ </a>
</div>
<div id="tab_content" class="content_wrp">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8497],
Torstein <=