|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [9459] |
| Date: | Tue, 29 May 2012 01:37:44 +0000 |
Revision: 9459
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9459
Author: vator
Date: 2012-05-29 01:37:44 +0000 (Tue, 29 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/templates/base/control_item/control_item.xsl
trunk/controller/templates/base/control_item/sort_check_list.xsl
Added Paths:
-----------
trunk/controller/templates/base/control_item/control_item_option.xsl
Modified: trunk/controller/templates/base/control_item/control_item.xsl
===================================================================
--- trunk/controller/templates/base/control_item/control_item.xsl
2012-05-29 01:37:11 UTC (rev 9458)
+++ trunk/controller/templates/base/control_item/control_item.xsl
2012-05-29 01:37:44 UTC (rev 9459)
@@ -4,30 +4,26 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:call-template name="yui_booking_i18n"/>
-<div class="identifier-header">
-<h1><img src="{img_go_home}" />
- <xsl:value-of select="php:function('lang', 'Control_item')" />
-</h1>
-</div>
+<div id="main_content">
+
+<h1><xsl:value-of select="php:function('lang', 'Register control item')"
/></h1>
+
<ul class="check_list">
- <xsl:for-each select="check_list_array">
- <li>
- <span>Tittel:</span><xsl:value-of
select="title"/><span>Start dato:</span><xsl:value-of select="start_date"/>
- </li>
- </xsl:for-each>
- </ul>
-
- <div class="yui-content">
- <div id="details">
- <form action="#" method="post">
- <input type="hidden" name="id" value =
"{value_id}">
- </input>
- <dl class="proplist-col">
- <dt>
- <label
for="title">Tittel</label>
- </dt>
- <dd>
+ <xsl:for-each select="check_list_array">
+ <li>
+ <span>Tittel:</span><xsl:value-of
select="title"/><span>Start dato:</span><xsl:value-of select="start_date"/>
+ </li>
+ </xsl:for-each>
+</ul>
+
+ <div id="control_item_details">
+ <form action="#" method="post">
+ <input type="hidden" name="id"
value="{control_item/id}">
+ </input>
+ <dl class="proplist-col">
+ <dt>
+ <label for="title">Tittel</label>
<xsl:choose>
<xsl:when test="editable">
<input type="text"
name="title" id="title" value="{control_item/title}" size="80"/>
@@ -36,11 +32,9 @@
<xsl:value-of
select="control_item/title"/>
</xsl:otherwise>
</xsl:choose>
- </dd>
- <dt>
- <label
for="required">Obligatorisk</label>
- </dt>
- <dd>
+ </dt>
+ <dt>
+ <label for="required">Skal det være
obligatorisk å sjekke kontrollpunktet</label>
<xsl:variable
name="required_item"><xsl:value-of select="control_item/required"
/></xsl:variable>
<xsl:choose>
<xsl:when test="editable">
@@ -64,113 +58,173 @@
</xsl:choose>
</xsl:otherwise>
</xsl:choose>
- </dd>
- <dt>
- <label
for="required">Måling</label>
- </dt>
- <dd>
- <xsl:variable
name="measurement_item"><xsl:value-of select="control_item/type"
/></xsl:variable>
- <xsl:choose>
- <xsl:when test="editable">
- <xsl:choose>
- <xsl:when
test="$measurement_item='control_item_type_2'">
- <input
type="checkbox" name="measurement" id="measurement" checked="true"/>
- </xsl:when>
- <xsl:otherwise>
- <input
type="checkbox" name="measurement" id="measurement"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- <xsl:otherwise>
- <xsl:choose>
- <xsl:when
test="$measurement_item='control_item_type_2'">
- <input
type="checkbox" name="measurement" id="measurement" checked="true"
disabled="true"/>
- </xsl:when>
- <xsl:otherwise>
- <input
type="checkbox" name="measurement" id="measurement" disabled="true" />
- </xsl:otherwise>
- </xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label for="what_to_do">Hva
skal utføres</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <textarea
name="what_to_do" id="what_to_do" rows="5" cols="60"><xsl:value-of
select="control_item/what_to_do" disable-output-escaping="yes" /></textarea>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control_item/what_to_do" disable-output-escaping="yes" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label
for="how_to_do">Utførelsesbeskrivelse</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <textarea
name="how_to_do" id="how_to_do" rows="5" cols="60"><xsl:value-of
select="control_item/how_to_do" disable-output-escaping="yes" /></textarea>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control_item/how_to_do" disable-output-escaping="yes" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
+ </dt>
+ <dt>
+ <label class="top" for="required">Velg
hvordan kontrollpunktet skal sjekkes av kontrollør</label>
+ <div class="styleWrp">
+ <xsl:variable
name="control_item_type"><xsl:value-of select="control_item/type"
/></xsl:variable>
+ <xsl:choose>
+ <xsl:when
test="editable">
+
+ <!--
============== RADIOBUTTONS FOR CHOOSING CONTROL ITEM TYPE ============== -->
+ <xsl:for-each
select="control_item/control_item_types">
+
+
<xsl:variable name="classes">
+
<xsl:choose>
+
<xsl:when test="position() = 1">
+
btn active
+
</xsl:when>
+
<xsl:otherwise>
+
btn
+
</xsl:otherwise>
+
</xsl:choose>
+
</xsl:variable>
+
+ <div
class="control_item_type">
+
<xsl:variable name="lang_type"><xsl:value-of select="." /></xsl:variable>
+
<xsl:variable name="current_control_item_type"><xsl:value-of select="."
/></xsl:variable>
+
+
<input class="{$classes}" type="button" value="Velg" />
+
<input type="radio" name="control_item_type"
value="{$current_control_item_type}" />
+
<xsl:value-of select="php:function('lang', $lang_type)" />
+ </div>
+ </xsl:for-each>
+
+ <!--
============== FORM FOR SAVING OPTION VALUES FOR LIST ============= -->
+ <div
id="add_control_item_option_panel">
+ <hr />
+
<h3>Legg til verdier som listen skal inneholde</h3>
+
+ <input
type="hidden" name="control_item_id">
+
<xsl:attribute name="value"><xsl:value-of
select="control_item/id"/></xsl:attribute>
+ </input>
+
+ <ul
id="control_item_options"></ul>
+
+ <div
id="add_control_item_list_value" class="row">
+
<label>Ny listeverdi</label>
+
<input type="text" name="option_value" />
+
<input class="btn" type="button" value="Legg til" />
+ </div>
+ </div>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable
name="lang_type"><xsl:value-of select="control_item/type" /></xsl:variable>
+ <xsl:value-of
select="php:function('lang', $lang_type)" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </dt>
+ <dt>
+ <label class="top" for="required">Velg
hvilken kontrollgruppe kontrollpunktet skal tilhøre</label>
+ <div class="styleWrp">
+ <div class="row">
<label
for="control_area">Kontrollområde</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <select
id="control_area" name="control_area">
-
<xsl:apply-templates select="control_area/options"/>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control_item/control_area_name" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
-
<dt>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <select
class="required" id="control_area" name="control_area">
+ <option
value="">Velg kontrollområde</option>
+
<xsl:for-each select="control_areas">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
<xsl:choose>
+
<xsl:when test="cat_id = //control_item/control_area_id">
+
<option value="{cat_id}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes"
select="name"/>
+
</option>
+
</xsl:when>
+
<xsl:otherwise>
+
<option value="{cat_id}">
+
<xsl:value-of disable-output-escaping="yes"
select="name"/>
+
</option>
+
</xsl:otherwise>
+
</xsl:choose>
+
</xsl:for-each>
+ </select>
+ <span
class="help_text">Angi hvilket kontrollområde kontrollen skal gjelde for</span>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control_item/control_area_name" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ <div class="row">
<label
for="control_group">Kontrollgruppe</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <select
id="control_group" name="control_group">
- <option
value="0">Ingen valgt</option>
-
<xsl:apply-templates select="control_group/options"/>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control_item/control_group_name" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- </dl>
-
- <div class="form-buttons">
- <xsl:choose>
- <xsl:when test="editable">
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
- <xsl:variable
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')"
/></xsl:variable>
- <input type="submit"
name="save_control_item" value="{$lang_save}" title = "{$lang_save}" />
- <input type="submit"
name="cancel_control_item" value="{$lang_cancel}" title = "{$lang_cancel}" />
- </xsl:when>
- <xsl:otherwise>
- <xsl:variable
name="lang_edit"><xsl:value-of select="php:function('lang', 'edit')"
/></xsl:variable>
- <input type="submit"
name="edit_control_item" value="{$lang_edit}" title = "{$lang_edit}" />
- </xsl:otherwise>
- </xsl:choose>
- </div>
-
- </form>
- </div>
+ <xsl:choose>
+ <xsl:when
test="editable">
+ <select
id="control_group" name="control_group">
+ <option
value="0">Ingen valgt</option>
+
<xsl:for-each select="control_groups">
+
<xsl:choose>
+
<xsl:when test="id = //control_item/control_group_id">
+
<option value="{id}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes"
select="group_name"/>
+
</option>
+
</xsl:when>
+
<xsl:otherwise>
+
<option value="{id}">
+
<xsl:value-of disable-output-escaping="yes"
select="group_name"/>
+
</option>
+
</xsl:otherwise>
+
</xsl:choose>
+
</xsl:for-each>
+ </select>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control_item/control_group_name" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </div>
+ </dt>
+ <dt>
+ <label for="what_to_do">Hva skal
utføres</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <textarea name="what_to_do"
id="what_to_do" rows="5" cols="60">
+ <xsl:value-of
select="control_item/what_to_do" disable-output-escaping="yes" />
+ </textarea>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control_item/what_to_do" disable-output-escaping="yes" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label
for="how_to_do">Utførelsesbeskrivelse</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <textarea name="how_to_do"
id="how_to_do" rows="5" cols="60"><xsl:value-of select="control_item/how_to_do"
disable-output-escaping="yes" /></textarea>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control_item/how_to_do" disable-output-escaping="yes" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+
+ </dl>
+
+ <div class="form-buttons">
+ <xsl:choose>
+ <xsl:when test="editable">
+ <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
+ <xsl:variable
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')"
/></xsl:variable>
+ <input type="submit"
name="save_control_item" value="{$lang_save}" title = "{$lang_save}" />
+ <input type="submit"
name="cancel_control_item" value="{$lang_cancel}" title = "{$lang_cancel}" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable
name="lang_edit"><xsl:value-of select="php:function('lang', 'edit')"
/></xsl:variable>
+ <input type="submit"
name="edit_control_item" value="{$lang_edit}" title = "{$lang_edit}" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </form>
</div>
+</div>
</xsl:template>
<xsl:template match="options">
Added: trunk/controller/templates/base/control_item/control_item_option.xsl
===================================================================
--- trunk/controller/templates/base/control_item/control_item_option.xsl
(rev 0)
+++ trunk/controller/templates/base/control_item/control_item_option.xsl
2012-05-29 01:37:44 UTC (rev 9459)
@@ -0,0 +1,32 @@
+<!-- $Id: control_item.xsl 8913 2012-02-17 10:14:42Z erikhl $ -->
+<!-- item -->
+
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+
+
+
+<xsl:call-template name="yui_booking_i18n"/>
+
+<div id="main_wrp">
+
+<h1>Legg verdier til liste</h1>
+
+<div class="yui-content">
+ <div id="details">
+ <form id="frm_add_control_item_option"
action="index.php?menuaction=controller.uicontrol_item_option.save"
method="post">
+ <input type="hidden" name="control_item_id">
+ <xsl:attribute name="value"><xsl:value-of
select="control_item/id"/></xsl:attribute>
+ </input>
+
+ <ul id="control_item_options"></ul>
+
+ <div class="row">
+ <label>Valgverdi</label>
+ <input type="text" name="label" />
+ <input type="submit" value="Lagre" />
+ </div>
+ </form>
+ </div>
+</div>
+</div>
+</xsl:template>
\ No newline at end of file
Property changes on:
trunk/controller/templates/base/control_item/control_item_option.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/controller/templates/base/control_item/sort_check_list.xsl
===================================================================
--- trunk/controller/templates/base/control_item/sort_check_list.xsl
2012-05-29 01:37:11 UTC (rev 9458)
+++ trunk/controller/templates/base/control_item/sort_check_list.xsl
2012-05-29 01:37:44 UTC (rev 9459)
@@ -4,6 +4,8 @@
<xsl:variable name="control_id"><xsl:value-of
select="control/id"/></xsl:variable>
<div class="yui-content tab_content">
+
+ <h2>Sorter kontrollgrupper og kontrollpunkt</h2>
<!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
<form action="#" id="frmSaveOrder">
@@ -37,7 +39,7 @@
</xsl:choose>
</xsl:for-each>
</ul>
- <input type="submit" value="Lagre rekkefølge" />
+ <span id="saveOrder" class="btn"><span
class="text">Lagre rekkefølge</span></span>
</form>
</div>
</xsl:template>
| [Prev in Thread] | Current Thread | [Next in Thread] |