[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8636]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8636] |
|
Date: |
Sat, 21 Jan 2012 11:30:08 +0000 |
Revision: 8636
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8636
Author: vator
Date: 2012-01-21 11:30:07 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
Added Paths:
-----------
trunk/controller/templates/base/tab_view_check_lists_garbage.xsl
Removed Paths:
-------------
trunk/controller/templates/base/tab_view_check_lists.xsl
trunk/controller/templates/base/view_locations_for_control.xsl
Deleted: trunk/controller/templates/base/tab_view_check_lists.xsl
===================================================================
--- trunk/controller/templates/base/tab_view_check_lists.xsl 2012-01-21
11:29:56 UTC (rev 8635)
+++ trunk/controller/templates/base/tab_view_check_lists.xsl 2012-01-21
11:30:07 UTC (rev 8636)
@@ -1,80 +0,0 @@
-<!-- $Id$ -->
-<xsl:template name="tab_view_check_lists" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
-
-<div class="yui-content tab_content">
-
- <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
- <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
- <input type="hidden" id="control_id" name="control_id"
value="{control_id}" />
-
- <fieldset class="tab_check_list_details">
- <label>Startdato</label>
- <xsl:if test="control_as_array/start_date != ''">
- <xsl:value-of select="php:function('date',
$date_format, number(control_as_array/start_date))"/><br/>
- </xsl:if>
- <label>Sluttdato</label>
- <xsl:if test="control_as_array/end_date != ''">
- <xsl:value-of select="php:function('date',
$date_format, number(control_as_array/end_date))"/><br/>
- </xsl:if>
- <label>Syklustype</label><xsl:value-of
select="control_as_array/repeat_type"/><br/>
- <label>Syklusfrekvens</label><xsl:value-of
select="control_as_array/repeat_interval"/><br/>
- </fieldset>
-
- <ul class="check_list">
- <li class="heading">
- <div class="status">Status</div>
- <div>Skal utføres innen dato</div>
- <div>Planlagt utført dato</div>
- <div>Ble utført dato</div>
- <div>Kommentar</div>
- </li>
- <xsl:choose>
- <xsl:when test="check_list_array/child::node()">
- <xsl:for-each select="check_list_array">
- <li>
- <div
class="order_nr"><xsl:number/>.</div>
- <div class="status">
- <xsl:variable
name="status"><xsl:value-of select="status"/></xsl:variable>
- <xsl:choose>
- <xsl:when
test="status = 1">
- <img
height="15" src="controller/images/status_icon_light_green.png" />
- </xsl:when>
- <xsl:otherwise>
- <img
height="15" src="controller/images/status_icon_red.png" />
- </xsl:otherwise>
- </xsl:choose>
- </div>
- <div>
- <a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.view_check_list</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
</xsl:attribute>
- <xsl:if
test="deadline != ''">
-
<xsl:value-of select="php:function('date', $date_format, number(deadline))"/>
-
</xsl:if>
- </a>
- </div>
- <div>
- <xsl:if
test="planned_date != ''">
-
<xsl:value-of select="php:function('date', $date_format,
number(planned_date))"/>
- </xsl:if>
- </div>
- <div>
- <xsl:if
test="completed_date != ''">
-
<xsl:value-of select="php:function('date', $date_format,
number(completed_date))"/>
- </xsl:if>
- </div>
- <div><xsl:value-of
select="comment"/></div>
- </li>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- Ingen sjekklister for denne kontrollen
- </xsl:otherwise>
- </xsl:choose>
- </ul>
-</div>
-</xsl:template>
Copied: trunk/controller/templates/base/tab_view_check_lists_garbage.xsl (from
rev 8487, trunk/controller/templates/base/tab_view_check_lists.xsl)
===================================================================
--- trunk/controller/templates/base/tab_view_check_lists_garbage.xsl
(rev 0)
+++ trunk/controller/templates/base/tab_view_check_lists_garbage.xsl
2012-01-21 11:30:07 UTC (rev 8636)
@@ -0,0 +1,80 @@
+<!-- $Id$ -->
+<xsl:template name="tab_view_check_lists" xmlns:php="http://php.net/xsl";>
+<xsl:variable name="date_format">d/m-Y</xsl:variable>
+
+<div class="yui-content tab_content">
+
+ <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
+ <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
+ <input type="hidden" id="control_id" name="control_id"
value="{control_id}" />
+
+ <fieldset class="tab_check_list_details">
+ <label>Startdato</label>
+ <xsl:if test="control_as_array/start_date != ''">
+ <xsl:value-of select="php:function('date',
$date_format, number(control_as_array/start_date))"/><br/>
+ </xsl:if>
+ <label>Sluttdato</label>
+ <xsl:if test="control_as_array/end_date != ''">
+ <xsl:value-of select="php:function('date',
$date_format, number(control_as_array/end_date))"/><br/>
+ </xsl:if>
+ <label>Syklustype</label><xsl:value-of
select="control_as_array/repeat_type"/><br/>
+ <label>Syklusfrekvens</label><xsl:value-of
select="control_as_array/repeat_interval"/><br/>
+ </fieldset>
+
+ <ul class="check_list">
+ <li class="heading">
+ <div class="status">Status</div>
+ <div>Skal utføres innen dato</div>
+ <div>Planlagt utført dato</div>
+ <div>Ble utført dato</div>
+ <div>Kommentar</div>
+ </li>
+ <xsl:choose>
+ <xsl:when test="check_list_array/child::node()">
+ <xsl:for-each select="check_list_array">
+ <li>
+ <div
class="order_nr"><xsl:number/>.</div>
+ <div class="status">
+ <xsl:variable
name="status"><xsl:value-of select="status"/></xsl:variable>
+ <xsl:choose>
+ <xsl:when
test="status = 1">
+ <img
height="15" src="controller/images/status_icon_light_green.png" />
+ </xsl:when>
+ <xsl:otherwise>
+ <img
height="15" src="controller/images/status_icon_red.png" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ <div>
+ <a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_check_list</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="id"/>
+
</xsl:attribute>
+ <xsl:if
test="deadline != ''">
+
<xsl:value-of select="php:function('date', $date_format, number(deadline))"/>
+
</xsl:if>
+ </a>
+ </div>
+ <div>
+ <xsl:if
test="planned_date != ''">
+
<xsl:value-of select="php:function('date', $date_format,
number(planned_date))"/>
+ </xsl:if>
+ </div>
+ <div>
+ <xsl:if
test="completed_date != ''">
+
<xsl:value-of select="php:function('date', $date_format,
number(completed_date))"/>
+ </xsl:if>
+ </div>
+ <div><xsl:value-of
select="comment"/></div>
+ </li>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ Ingen sjekklister for denne kontrollen
+ </xsl:otherwise>
+ </xsl:choose>
+ </ul>
+</div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/tab_view_check_lists_garbage.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Revision Author Id
Deleted: trunk/controller/templates/base/view_locations_for_control.xsl
===================================================================
--- trunk/controller/templates/base/view_locations_for_control.xsl
2012-01-21 11:29:56 UTC (rev 8635)
+++ trunk/controller/templates/base/view_locations_for_control.xsl
2012-01-21 11:30:07 UTC (rev 8636)
@@ -1,125 +0,0 @@
-<!-- $Id$ -->
-<func:function name="phpgw:conditional">
- <xsl:param name="test"/>
- <xsl:param name="true"/>
- <xsl:param name="false"/>
-
- <func:result>
- <xsl:choose>
- <xsl:when test="$test">
- <xsl:value-of select="$true"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$false"/>
- </xsl:otherwise>
- </xsl:choose>
- </func:result>
-</func:function>
-
-<xsl:template name="view_locations_for_control">
- <!-- IMPORTANT!!! Loads YUI javascript -->
- <xsl:call-template name="common"/>
-
- <div class="yui-content">
- <div id="control_details">
- <div style="margin: 10px;padding: 10px; width: 25%;">
-
- <!-- When control area is chosen, an ajax
request is executed.
- The operation fetches controls from db
and populates the control list.
- The ajax operation is handled in
ajax.js
- -->
- <select style="float:left;"
id="control_area_list" name="control_area_list">
- <xsl:for-each
select="control_area_array">
- <xsl:variable
name="control_area_id"><xsl:value-of select="id"/></xsl:variable>
- <option
value="{$control_area_id}">
- <xsl:value-of
select="title"/>
- </option>
- </xsl:for-each>
- </select>
-
- <form id="loc_form" action="" method="GET">
-
- <select id="control_id"
name="control_id">
- <xsl:choose>
- <xsl:when
test="control_array/child::node()">
- <xsl:for-each
select="control_array">
- <xsl:variable
name="control_id"><xsl:value-of select="id"/></xsl:variable>
- <option
value="{$control_id}">
-
<xsl:value-of select="title"/>
- </option>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- <option>
- Ingen kontroller
- </option>
- </xsl:otherwise>
- </xsl:choose>
-
- </select>
- </form>
- </div>
-
- <div id="addedProperties">
- <ul id="locations_for_control"
name="locations_for_control">
- <xsl:for-each
select="locations_for_control">
- <li>
- <div><xsl:value-of
select="id"/></div>
- <div><xsl:value-of
select="title"/></div>
- <div><xsl:value-of
select="location_code"/></div>
- </li>
- </xsl:for-each>
- </ul>
- </div>
-
- <iframe id="yui-history-iframe"
src="phpgwapi/js/yahoo/history/assets/blank.html"
style="position:absolute;top:0; left:0;width:1px;
height:1px;visibility:hidden;"></iframe>
- <input id="yui-history-field" type="hidden"/>
-
- <xsl:apply-templates select="locations_table"/>
- <xsl:call-template name="yui_booking_i18n"/>
- </div>
- </div>
-</xsl:template>
-
-<xsl:template match="locations_table" xmlns:php="http://php.net/xsl";>
-
- <div id="loc_paginator"/>
- <div style="margin:20px;" id="locations-container"/>
- <xsl:call-template name="locations-definition" />
-</xsl:template>
-
-<xsl:template name="locations-definition">
- <script>
-
- YAHOO.controller.columnDefs = [
- <xsl:for-each select="//locations_table/field">
- {
- key: "<xsl:value-of
select="key"/>",
- <xsl:if test="label">
- label: "<xsl:value-of
select="label"/>",
- </xsl:if>
- sortable: <xsl:value-of
select="phpgw:conditional(not(sortable = 0), 'true', 'false')"/>,
- <xsl:if test="hidden">
- hidden: true,
- </xsl:if>
- <xsl:if test="formatter">
- formatter: <xsl:value-of
select="formatter"/>,
- </xsl:if>
- className: "<xsl:value-of
select="className"/>"
- }<xsl:value-of
select="phpgw:conditional(not(position() = last()), ',', '')"/>
- </xsl:for-each>
- ];
-
- var loc_source = '<xsl:value-of select="source"/>';
- var loc_columnDefs = YAHOO.controller.columnDefs;
- var loc_form = 'loc_form';
- var loc_filters = ['control_id'];
- var loc_container = 'locations-container';
- var loc_table_id = 'locations_table';
- var loc_data_table_pag = 'loc_paginator';
-
- setDataSource(loc_source, loc_columnDefs, loc_form,
loc_filters, loc_container, loc_data_table_pag, loc_table_id, null, null,
null);
-
- </script>
-
-</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8636],
Torstein <=