[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8036]
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [8036] |
|
Date: |
Mon, 07 Nov 2011 08:39:11 +0000 |
Revision: 8036
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8036
Author: erikhl
Date: 2011-11-07 08:39:11 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uiprocedure.inc.php
trunk/controller/templates/base/procedure_item.xsl
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2011-11-07 08:29:12 UTC
(rev 8035)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2011-11-07 08:39:11 UTC
(rev 8036)
@@ -265,7 +265,7 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('controller') . '::' . lang('Procedure');
-
$this->use_yui_editor(array('purpose','description'));
+
$this->use_yui_editor(array('responsibility','description'));
self::render_template_xsl('procedure_item',
$data);
}
Modified: trunk/controller/templates/base/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure_item.xsl 2011-11-07 08:29:12 UTC
(rev 8035)
+++ trunk/controller/templates/base/procedure_item.xsl 2011-11-07 08:39:11 UTC
(rev 8036)
@@ -21,7 +21,7 @@
<dd>
<xsl:choose>
<xsl:when test="editable">
- <input type="text"
name="title" id="title" value="{procedure/title}" />
+ <input type="text"
name="title" id="title" value="{procedure/title}" size="100"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of
select="procedure/title" />
@@ -31,48 +31,68 @@
<dt>
<label
for="revision_no"><xsl:value-of select="php:function('lang','Procedure
revision')" /></label>
</dt>
- <dd>
- <xsl:value-of
select="procedure/revision_no" />
- </dd>
<dt>
- <label
for="purpose"><xsl:value-of select="php:function('lang','Procedure purpose')"
/></label>
+ <label
for="control_area"><xsl:value-of select="php:function('lang','Control area')"
/></label>
</dt>
<dd>
<xsl:choose>
<xsl:when test="editable">
- <textarea id="purpose"
name="purpose" rows="5" cols="60"><xsl:value-of select="procedure/purpose"
disable-output-escaping="yes"/></textarea>
+ <select
id="control_area" name="control_area">
+ <option
value="0">Ingen valgt</option>
+
<xsl:apply-templates select="control_area/options"/>
+ </select>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of
select="procedure/purpose" disable-output-escaping="yes"/>
+ <xsl:value-of
select="procedure/control_area_name" />
</xsl:otherwise>
</xsl:choose>
</dd>
<dt>
- <label
for="responsibility"><xsl:value-of select="php:function('lang','Procedure
responsibility')" /></label>
+ <label
for="start_date"><xsl:value-of select="php:function('lang','Procedure start
date')" /></label>
</dt>
<dd>
+ <xsl:value-of
disable-output-escaping="yes" select="start_date"/>
+ </dd>
+ <dt>
+ <label
for="revision_date"><xsl:value-of select="php:function('lang','Procedure
revision date')" /></label>
+ </dt>
+ <dd>
+ <xsl:value-of
disable-output-escaping="yes" select="revision_date"/>
+ </dd>
+ <xsl:if test="end_date != ''">
+ <dt>
+ <label
for="end_date"><xsl:value-of select="php:function('lang','Procedure end date')"
/></label>
+ </dt>
+ <dd>
+ <xsl:value-of
disable-output-escaping="yes" select="end_date"/>
+ </dd>
+ </xsl:if>
+ <dd>
+ <xsl:value-of
select="procedure/revision_no" />
+ </dd>
+ <dt>
+ <label
for="purpose"><xsl:value-of select="php:function('lang','Procedure purpose')"
/></label>
+ </dt>
+ <dd>
<xsl:choose>
<xsl:when test="editable">
- <textarea
id="responsibility" name="responsibility" rows="5" cols="60"><xsl:value-of
select="procedure/responsibility" /></textarea>
+ <textarea id="purpose"
name="purpose" rows="5" cols="60"><xsl:value-of select="procedure/purpose"
disable-output-escaping="yes"/></textarea>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of
select="procedure/responsibility" />
+ <xsl:value-of
select="procedure/purpose" disable-output-escaping="yes"/>
</xsl:otherwise>
</xsl:choose>
</dd>
<dt>
- <label
for="control_area"><xsl:value-of select="php:function('lang','Control area')"
/></label>
+ <label
for="responsibility"><xsl:value-of select="php:function('lang','Procedure
responsibility')" /></label>
</dt>
<dd>
<xsl:choose>
<xsl:when test="editable">
- <select
id="control_area" name="control_area">
- <option
value="0">Ingen valgt</option>
-
<xsl:apply-templates select="control_area/options"/>
- </select>
+ <textarea
id="responsibility" name="responsibility" rows="5" cols="60"><xsl:value-of
select="procedure/responsibility" /></textarea>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of
select="procedure/control_area_name" />
+ <xsl:value-of
select="procedure/responsibility" />
</xsl:otherwise>
</xsl:choose>
</dd>
@@ -90,26 +110,6 @@
</xsl:choose>
</dd>
<dt>
- <label
for="start_date"><xsl:value-of select="php:function('lang','Procedure start
date')" /></label>
- </dt>
- <dd>
- <xsl:value-of
disable-output-escaping="yes" select="start_date"/>
- </dd>
- <dt>
- <label
for="revision_date"><xsl:value-of select="php:function('lang','Procedure
revision date')" /></label>
- </dt>
- <dd>
- <xsl:value-of
disable-output-escaping="yes" select="revision_date"/>
- </dd>
- <xsl:if test="end_date != ''">
- <dt>
- <label
for="end_date"><xsl:value-of select="php:function('lang','Procedure end date')"
/></label>
- </dt>
- <dd>
- <xsl:value-of
disable-output-escaping="yes" select="end_date"/>
- </dd>
- </xsl:if>
- <dt>
<label
for="reference"><xsl:value-of select="php:function('lang','Procedure
Reference')" /></label>
</dt>
<dd>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8036],
Erik Holm-Larsen <=