[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7845]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [7845] |
|
Date: |
Fri, 07 Oct 2011 06:41:24 +0000 |
Revision: 7845
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7845
Author: vator
Date: 2011-10-07 06:41:23 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/templates/base/control_groups.xsl
trunk/controller/templates/base/control_items.xsl
trunk/controller/templates/base/control_items_receipt.xsl
trunk/controller/templates/base/control_tabs.xsl
Added Paths:
-----------
trunk/controller/templates/base/control.xsl
Removed Paths:
-------------
trunk/controller/templates/base/control.xsl
Deleted: trunk/controller/templates/base/control.xsl
===================================================================
--- trunk/controller/templates/base/control.xsl 2011-10-07 06:40:45 UTC (rev
7844)
+++ trunk/controller/templates/base/control.xsl 2011-10-07 06:41:23 UTC (rev
7845)
@@ -1,140 +0,0 @@
-<xsl:template name="control" 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')" />
-</h1>
-</div>
-<div class="yui-content">
- <div id="details">
- <form action="#" method="post">
- <input type="hidden" name="id" value = "{value_id}" />
-
- <dl class="proplist-col">
- <dt>
- <label>Kontrollområde</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <select id="control_area_id"
name="control_area_id">
- <xsl:for-each
select="control_area_options/options">
- <option
value="{id}">
- <xsl:if
test="selected != 0">
-
<xsl:attribute name="selected" value="selected" />
-
</xsl:if>
-
<xsl:value-of disable-output-escaping="yes" select="title"/>
- </option>
- </xsl:for-each>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/control_area_id" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label>Prosedyre</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <select id="procedure_id"
name="procedure_id">
- <xsl:for-each
select="procedure_options/options">
- <option
value="{id}">
- <xsl:if
test="selected != 0">
-
<xsl:attribute name="selected" value="selected" />
-
</xsl:if>
-
<xsl:value-of disable-output-escaping="yes" select="title"/>
- </option>
- </xsl:for-each>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/procedure_id" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label for="title">Tittel</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <input type="text" name="title"
id="title" value="{control/title}" />
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/title" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label
for="description">Beskrivelse</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <textarea cols="70" rows="5"
name="description" id="description"><xsl:value-of select="control/description"
/></textarea>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/description" disable-output-escaping="yes"/>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label
for="start_date">Startdato</label>
- </dt>
- <dd>
- <xsl:value-of
disable-output-escaping="yes" select="start_date"/>
- </dd>
- <dt>
- <label for="end_date">Sluttdato</label>
- </dt>
- <dd>
- <xsl:value-of
disable-output-escaping="yes" select="end_date"/>
- </dd>
- <dt>
- <label>Frekvenstype</label>
- </dt>
- <dd>
- <select id="repeat_type"
name="repeat_type">
- <option value="0">Ikke
angitt</option>
- <option
value="1">Daglig</option>
- <option
value="2">Ukentlig</option>
- <option value="3">Månedlig pr
dato</option>
- <option value="4">Månedlig pr
dag</option>
- <option value="5">Årlig</option>
- </select>
- </dd>
- <dt>
- <label>Frekvens</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <input size="2" type="text"
name="repeat_interval" value="{control/repeat_interval}" />
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/repeat_interval" />
- </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>
- <input type="submit"
name="save_control" value="{$lang_save}" title = "{$lang_save}" />
- </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" value="{$lang_edit}" title = "{$lang_edit}" />
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </form>
- </div>
-</div>
-</xsl:template>
\ No newline at end of file
Added: trunk/controller/templates/base/control.xsl
===================================================================
--- trunk/controller/templates/base/control.xsl (rev 0)
+++ trunk/controller/templates/base/control.xsl 2011-10-07 06:41:23 UTC (rev
7845)
@@ -0,0 +1,150 @@
+<xsl:template name="control" xmlns:php="http://php.net/xsl";>
+
+<xsl:variable name="control_id"><xsl:value-of
select="control/id"/></xsl:variable>
+<xsl:variable name="control_area_id"><xsl:value-of
select="control/control_area_id"/></xsl:variable>
+<xsl:variable name="control_procedure_id"><xsl:value-of
select="control/procedure_id"/></xsl:variable>
+
+<div class="yui-content">
+ <div id="control_details">
+ <form action="#" method="post">
+ <input type="hidden" name="control_id"
value="{$control_id}" />
+
+ <dl class="proplist-col">
+ <dt>
+ <label>Kontrollområde</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <select id="control_area_id"
name="control_area_id">
+ <xsl:for-each
select="control_areas_array">
+ <xsl:choose>
+
<xsl:when test="id != $control_area_id">
+
<option value="{id}">
+
<xsl:value-of disable-output-escaping="yes" select="title"/>
+
</option>
+
</xsl:when>
+
<xsl:otherwise>
+
<option value="{id}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="title"/>
+
</option>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/control_area_id" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label>Prosedyre</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <select id="procedure_id"
name="procedure_id">
+ <xsl:for-each
select="procedures_array">
+ <xsl:choose>
+
<xsl:when test="id != $control_procedure_id">
+
<option value="{id}">
+
<xsl:value-of disable-output-escaping="yes" select="title"/>
+
</option>
+
</xsl:when>
+
<xsl:otherwise>
+
<option value="{id}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="title"/>
+
</option>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/procedure_id" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label for="title">Tittel</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <input type="text" name="title"
id="title" value="{control/title}" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/title" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label
for="description">Beskrivelse</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <textarea cols="70" rows="5"
name="description" id="description"><xsl:value-of select="control/description"
/></textarea>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/description" disable-output-escaping="yes"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label
for="start_date">Startdato</label>
+ </dt>
+ <dd>
+ <xsl:value-of
disable-output-escaping="yes" select="start_date"/>
+ </dd>
+ <dt>
+ <label for="end_date">Sluttdato</label>
+ </dt>
+ <dd>
+ <xsl:value-of
disable-output-escaping="yes" select="end_date"/>
+ </dd>
+ <dt>
+ <label>Frekvenstype</label>
+ </dt>
+ <dd>
+ <select id="repeat_type"
name="repeat_type">
+ <option value="0">Ikke
angitt</option>
+ <option
value="1">Daglig</option>
+ <option
value="2">Ukentlig</option>
+ <option value="3">Månedlig pr
dato</option>
+ <option value="4">Månedlig pr
dag</option>
+ <option value="5">Årlig</option>
+ </select>
+ </dd>
+ <dt>
+ <label>Frekvens</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <input size="2" type="text"
name="repeat_interval" value="{control/repeat_interval}" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/repeat_interval" />
+ </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>
+ <input type="submit"
name="save_control" value="{$lang_save}" title = "{$lang_save}" />
+ </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" value="{$lang_edit}" title = "{$lang_edit}" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </form>
+ </div>
+</div>
+</xsl:template>
\ No newline at end of file
Property changes on: trunk/controller/templates/base/control.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/controller/templates/base/control_groups.xsl
===================================================================
--- trunk/controller/templates/base/control_groups.xsl 2011-10-07 06:40:45 UTC
(rev 7844)
+++ trunk/controller/templates/base/control_groups.xsl 2011-10-07 06:41:23 UTC
(rev 7845)
@@ -1,18 +1,9 @@
<xsl:template name="control_groups" 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_groups')"/> for
<xsl:value-of select="group_name" />
-</h1>
-
-</div>
-
<div class="yui-content">
- <div id="details">
+ <div id="control_groups">
- <h1><xsl:value-of select="control_area/title"/></h1>
+ <h2><xsl:value-of select="control_area/title"/></h2>
<form action="#" method="post">
<xsl:variable name="control_area_id"><xsl:value-of
select="control_area/id"/></xsl:variable>
@@ -21,7 +12,7 @@
<xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
<input type="hidden" name="control_id" value="{control_id}" />
- <ul>
+ <ul class="itemlist">
<xsl:for-each select="//control_groups">
<xsl:variable name="control_group_id"><xsl:value-of
select="id"/></xsl:variable>
<li><input type="checkbox" name="control_group_ids[]"
value="{$control_group_id}" /><xsl:value-of select="group_name"/></li>
Modified: trunk/controller/templates/base/control_items.xsl
===================================================================
--- trunk/controller/templates/base/control_items.xsl 2011-10-07 06:40:45 UTC
(rev 7844)
+++ trunk/controller/templates/base/control_items.xsl 2011-10-07 06:41:23 UTC
(rev 7845)
@@ -1,33 +1,28 @@
<xsl:template name="control_items" 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_items')" />
-</h1>
-</div>
-
<div class="yui-content">
<div>
<!-- =========================== CHOOSE CONTROL ITEMS
=============================== -->
<h2>Velg dine kontrollpunkt</h2>
- <form action="#" method="post">
+
+ <h4 class="expand_header"><div class="expand_all">Vis
alle</div><div class="collapse_all">Skjul alle</div></h4>
+ <form id="frm_control_items" 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}" />
+ <input type="hidden" name="control_id" value="{control_id}" />
<ul class="control_items">
- <xsl:for-each select="//control_items">
- <ul class="expand_list">
+ <xsl:for-each select="groups_with_control_items">
+ <ul class="proplist-col 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:for-each
select="group_control_items">
<xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
- <li><xsl:number/>. <input
type="checkbox" name="control_tag_ids[]"
value="{$control_group_id}:{$control_item_id}" /><xsl:value-of
select="title"/></li>
+ <li><xsl:number/>. <input
type="checkbox" id="ch_{$control_group_id}:{$control_item_id}"
value="{$control_group_id}:{$control_item_id}" /><xsl:value-of
select="title"/></li>
</xsl:for-each>
</ul>
</li>
Modified: trunk/controller/templates/base/control_items_receipt.xsl
===================================================================
--- trunk/controller/templates/base/control_items_receipt.xsl 2011-10-07
06:40:45 UTC (rev 7844)
+++ trunk/controller/templates/base/control_items_receipt.xsl 2011-10-07
06:41:23 UTC (rev 7845)
@@ -1,12 +1,5 @@
<xsl:template name="control_items_receipt" 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_items')" />
-</h1>
-</div>
-
<div class="yui-content">
<div>
@@ -18,7 +11,7 @@
<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">
+ <ul class="proplist-col control_items">
<xsl:for-each select="control_receipt_items">
<ul>
<li>
Modified: trunk/controller/templates/base/control_tabs.xsl
===================================================================
--- trunk/controller/templates/base/control_tabs.xsl 2011-10-07 06:40:45 UTC
(rev 7844)
+++ trunk/controller/templates/base/control_tabs.xsl 2011-10-07 06:41:23 UTC
(rev 7845)
@@ -1,25 +1,38 @@
<!-- separate tabs and inline tables-->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div class="yui-navset yui-navset-top" id="control_tabview">
- <xsl:value-of disable-output-escaping="yes" select="tabs" />
- <div class="yui-content">
- <div id="details">
- <xsl:call-template name="control" />
+<div class="yui-navset yui-navset-top" id="control_tabview">
+ <xsl:choose>
+ <xsl:when test="view = 'control_details'">
+ <xsl:call-template name="yui_booking_i18n"/>
+ <div class="identifier-header">
+ <h1><xsl:value-of select="php:function('lang',
'Control')"/></h1>
</div>
- <div id="control_groups">
- <xsl:call-template name="control_groups" />
+ <xsl:value-of disable-output-escaping="yes"
select="tabs" />
+ <xsl:call-template name="control" />
+ </xsl:when>
+ <xsl:when test="view = 'control_groups'">
+ <div class="identifier-header">
+ <h1><xsl:value-of select="php:function('lang',
'Control_groups')"/> for <xsl:value-of select="group_name" /></h1>
</div>
- <div id="control_items">
- <xsl:call-template name="control_items" />
+ <xsl:value-of disable-output-escaping="yes"
select="tabs" />
+ <xsl:call-template name="control_groups" />
+ </xsl:when>
+ <xsl:when test="view = 'control_items'">
+ <div class="identifier-header">
+ <h1><xsl:value-of select="php:function('lang',
'Control_items')"/></h1>
</div>
- <div id="receipt">
- <xsl:call-template name="control_items_receipt"
/>
+ <xsl:value-of disable-output-escaping="yes"
select="tabs" />
+ <xsl:call-template name="control_items" />
+ </xsl:when>
+ <xsl:when test="view = 'receipt'">
+ <div class="identifier-header">
+ <h1><xsl:value-of select="php:function('lang',
'Receipt')"/></h1>
</div>
- </div>
- </div>
- <!-- 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-->
+ <xsl:value-of disable-output-escaping="yes"
select="tabs" />
+ <xsl:call-template name="control_items_receipt" />
+ </xsl:when>
+ </xsl:choose>
+</div>
+
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7845],
Torstein <=