[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7726]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [7726] |
|
Date: |
Tue, 27 Sep 2011 05:54:10 +0000 |
Revision: 7726
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7726
Author: vator
Date: 2011-09-27 05:54:10 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/templates/base/control.xsl
trunk/controller/templates/base/control_groups.xsl
trunk/controller/templates/base/control_items.xsl
trunk/controller/templates/base/control_tabs.xsl
Modified: trunk/controller/templates/base/control.xsl
===================================================================
--- trunk/controller/templates/base/control.xsl 2011-09-27 05:53:39 UTC (rev
7725)
+++ trunk/controller/templates/base/control.xsl 2011-09-27 05:54:10 UTC (rev
7726)
@@ -32,7 +32,7 @@
<label>Prosedyre</label>
</dt>
<dd>
- <select id="procedure" name="procedure">
+ <select id="procedure_id"
name="procedure_id">
<xsl:for-each
select="procedure_options/options">
<option value="{id}">
<xsl:if
test="selected != 0">
@@ -84,7 +84,7 @@
<label>Frekvens</label>
</dt>
<dd>
- <input size="2" type="text"
name="repeat_interval" value="" />
+ <input size="2" type="text"
name="repeat_interval" value="2" />
</dd>
</dl>
Modified: trunk/controller/templates/base/control_groups.xsl
===================================================================
--- trunk/controller/templates/base/control_groups.xsl 2011-09-27 05:53:39 UTC
(rev 7725)
+++ trunk/controller/templates/base/control_groups.xsl 2011-09-27 05:54:10 UTC
(rev 7726)
@@ -12,9 +12,15 @@
<div class="yui-content">
<div id="details">
- <h1><xsl:value-of select="title"/></h1>
+ <h1><xsl:value-of select="control_area/title"/></h1>
- <form action="#" method="post">
+ <form action="#" method="post">
+ <xsl:variable name="control_area_id"><xsl:value-of
select="control_area/id"/></xsl:variable>
+ <input type="hidden" name="control_area_id"
value="{$control_area_id}" />
+
+ <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
+ <input type="hidden" name="control_id" value="{control_id}" />
+
<ul>
<xsl:for-each select="//control_groups">
<xsl:variable name="control_group_id"><xsl:value-of
select="id"/></xsl:variable>
Modified: trunk/controller/templates/base/control_items.xsl
===================================================================
--- trunk/controller/templates/base/control_items.xsl 2011-09-27 05:53:39 UTC
(rev 7725)
+++ trunk/controller/templates/base/control_items.xsl 2011-09-27 05:54:10 UTC
(rev 7726)
@@ -9,23 +9,80 @@
<div class="yui-content">
<div id="details">
+
+ <xsl:choose>
+ <xsl:when test="boolean(choose_control_items)">
+
+ <!-- =========================== CHOOSE CONTROL ITEMS
=============================== -->
+ <h2>Velg dine kontrollpunkt</h2>
<form action="#" method="post">
- <xsl:for-each select="//control_items">
- <ul>
- <h4><xsl:value-of select="group_name"/></h4>
- <xsl:for-each select="control_item">
- <xsl:variable
name="control_items_id"><xsl:value-of select="id"/></xsl:variable>
- <li><input type="checkbox"
name="control_items_ids[]" value="{$control_items_id}" /><xsl:value-of
select="title"/></li>
- </xsl:for-each>
+ <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
+ <input type="hidden" name="control_id" value="{control_id}" />
+
+ <ul class="control_items">
+ <xsl:for-each select="//control_items">
+ <ul class="expand_list">
+ <li>
+ <h4><img src="controller/images/arrow_left.png"
width="14"/><span><xsl:value-of select="control_group/group_name"/></span></h4>
+ <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
+ <ul>
+ <xsl:for-each
select="control_item">
+ <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
+
+ <li><input type="checkbox"
name="control_tag_ids[]" value="{$control_group_id}:{$control_item_id}"
/><xsl:value-of select="title"/></li>
+ </xsl:for-each>
+ </ul>
+ </li>
</ul>
- </xsl:for-each>
+ </xsl:for-each>
+ </ul>
<div class="form-buttons">
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save')" /></xsl:variable>
<input type="submit" name="save_control_items"
value="{$lang_save}" title = "{$lang_save}" />
</div>
- </form>
+ </form>
+
+ </xsl:when>
+
+ <!-- =========================== SHOW RECEIPT
=============================== -->
+ <xsl:otherwise>
+
+ <h2>Kvittering</h2>
+ <form action="#" method="post">
+
+ <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
+ <input type="hidden" name="control_id"
value="{control_id}" />
+
+ <ul class="control_items">
+ <xsl:for-each select="control_receipt_items">
+ <ul>
+ <li>
+ <h4><xsl:value-of
select="control_group/group_name"/></h4>
+ <ul>
+ <xsl:for-each
select="control_items">
+ <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
+ <li><input
type="checkbox" name="control_item_ids[]" value="{$control_item_id}"
/><xsl:value-of select="title"/></li>
+ </xsl:for-each>
+ </ul>
+ </li>
+ </ul>
+ </xsl:for-each>
+ </ul>
+
+ <div class="form-buttons">
+ <xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save')" /></xsl:variable>
+ <input type="submit" name="show_receipt"
value="{$lang_save}" title = "{$lang_save}" />
+ </div>
+ </form>
+
+ </xsl:otherwise>
+ </xsl:choose>
+
+
+
+
</div>
</div>
-</xsl:template>
+</xsl:template>
\ No newline at end of file
Modified: trunk/controller/templates/base/control_tabs.xsl
===================================================================
--- trunk/controller/templates/base/control_tabs.xsl 2011-09-27 05:53:39 UTC
(rev 7725)
+++ trunk/controller/templates/base/control_tabs.xsl 2011-09-27 05:54:10 UTC
(rev 7726)
@@ -15,8 +15,8 @@
</div>
</div>
</div>
- <script type="text/javascript">
+ <!-- script type="text/javascript">
var resource_id = <xsl:value-of select="resource/id"/>;
var lang = <xsl:value-of select="php:function('js_lang',
'Name', 'Category', 'Actions', 'Edit', 'Delete', 'Account', 'Role')"/>;
- </script>
+ </script-->
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7726],
Torstein <=