[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14647] more on bookingfrontend
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [14647] more on bookingfrontend |
Date: |
Thu, 14 Jan 2016 15:16:09 +0000 |
Revision: 14647
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14647
Author: sigurdne
Date: 2016-01-14 15:16:08 +0000 (Thu, 14 Jan 2016)
Log Message:
-----------
more on bookingfrontend
Modified Paths:
--------------
branches/dev-syncromind/bookingfrontend/inc/class.uiresource.inc.php
branches/dev-syncromind/phpgwapi/templates/base/attributes_form.xsl
branches/dev-syncromind/phpgwapi/templates/base/attributes_view.xsl
branches/dev-syncromind/property/templates/base/attributes_form.xsl
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uiresource.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uiresource.inc.php
2016-01-14 13:15:56 UTC (rev 14646)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uiresource.inc.php
2016-01-14 15:16:08 UTC (rev 14647)
@@ -97,13 +97,13 @@
}
}
}
-// _debug_array($fields);
$organized_fields =
$custom_fields->organize_fields($location, $fields);
+// _debug_array($organized_fields);
$data = array(
'attributes_group' => $organized_fields,
);
-
$GLOBALS['phpgw']->xslttpl->add_file(array('attributes_form'));
+
$GLOBALS['phpgw']->xslttpl->add_file(array('attributes_view'));
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('custom_fields' => $data));
}
Modified: branches/dev-syncromind/phpgwapi/templates/base/attributes_form.xsl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/base/attributes_form.xsl
2016-01-14 13:15:56 UTC (rev 14646)
+++ branches/dev-syncromind/phpgwapi/templates/base/attributes_form.xsl
2016-01-14 15:16:08 UTC (rev 14647)
@@ -12,18 +12,6 @@
TINY.box.show({iframe:requestUrl,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});
};
</script>
-
- <xsl:for-each select="attributes_group">
- <div id="{link}">
- <fieldset>
- <xsl:apply-templates select="attributes"/>
- </fieldset>
- </div>
- </xsl:for-each>
-</xsl:template>
-
-<!-- New template-->
-<xsl:template xmlns:php="http://php.net/xsl" match="attributes">
<xsl:variable name="lang_hour">
<xsl:value-of select="php:function('lang', 'hour')" />
</xsl:variable>
@@ -41,6 +29,39 @@
<xsl:value-of select="php:function('get_phpgw_info',
'user|preferences|property|textarearows')" />
</xsl:variable>
+ <xsl:for-each select="attributes_group">
+ <div id="{link}">
+ <fieldset>
+ <xsl:apply-templates select="attributes">
+ <xsl:with-param name="lang_hour">
+ <xsl:value-of
select="$lang_hour" />
+ </xsl:with-param>
+ <xsl:with-param name="lang_min">
+ <xsl:value-of
select="$lang_min" />
+ </xsl:with-param>
+ <xsl:with-param name="statustext">
+ <xsl:value-of
select="$statustext" />
+ </xsl:with-param>
+ <xsl:with-param name="textareacols">
+ <xsl:value-of
select="$textareacols" />
+ </xsl:with-param>
+ <xsl:with-param name="textarearows">
+ <xsl:value-of
select="$textarearows" />
+ </xsl:with-param>
+ </xsl:apply-templates>
+ </fieldset>
+ </div>
+ </xsl:for-each>
+</xsl:template>
+
+<!-- New template-->
+<xsl:template xmlns:php="http://php.net/xsl" match="attributes">
+ <xsl:param name="lang_hour" />
+ <xsl:param name="lang_min" />
+ <xsl:param name="statustext" />
+ <xsl:param name="textareacols" />
+ <xsl:param name="textarearows" />
+
<xsl:choose>
<xsl:when test="datatype='section'">
<div class="pure-control-group">
Modified: branches/dev-syncromind/phpgwapi/templates/base/attributes_view.xsl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/base/attributes_view.xsl
2016-01-14 13:15:56 UTC (rev 14646)
+++ branches/dev-syncromind/phpgwapi/templates/base/attributes_view.xsl
2016-01-14 15:16:08 UTC (rev 14647)
@@ -1,175 +1,477 @@
<!-- $Id$ -->
+<xsl:template xmlns:php="http://php.net/xsl" match="custom_fields">
+ <xsl:call-template name="attributes_values"/>
+</xsl:template>
- <xsl:template match="attributes_view">
- <xsl:variable name="lang_attribute_statustext"><xsl:value-of
select="lang_attribute_statustext"/></xsl:variable>
- <tr>
- <xsl:attribute name="class">
+<!-- New template-->
+<xsl:template xmlns:php="http://php.net/xsl" name="attributes_values">
+ <script type="text/javascript">
+ help_Popup = function(requestUrl)
+ {
+ TINY.box.show({iframe:requestUrl,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});
+ };
+ </script>
+ <xsl:variable name="lang_hour">
+ <xsl:value-of select="php:function('lang', 'hour')" />
+ </xsl:variable>
+ <xsl:variable name="lang_min">
+ <xsl:value-of select="php:function('lang', 'minute')" />
+ </xsl:variable>
+ <xsl:variable name="statustext">
+ <xsl:value-of select="statustext"/>
+ </xsl:variable>
+
+ <xsl:variable name="textareacols">
+ <xsl:value-of select="php:function('get_phpgw_info',
'user|preferences|property|textareacols')" />
+ </xsl:variable>
+ <xsl:variable name="textarearows">
+ <xsl:value-of select="php:function('get_phpgw_info',
'user|preferences|property|textarearows')" />
+ </xsl:variable>
+
+ <xsl:for-each select="attributes_group">
+ <div id="{link}">
+ <fieldset>
+ <xsl:apply-templates select="attributes">
+ <xsl:with-param name="lang_hour">
+ <xsl:value-of
select="$lang_hour" />
+ </xsl:with-param>
+ <xsl:with-param name="lang_min">
+ <xsl:value-of
select="$lang_min" />
+ </xsl:with-param>
+ <xsl:with-param name="statustext">
+ <xsl:value-of
select="$statustext" />
+ </xsl:with-param>
+ <xsl:with-param name="textareacols">
+ <xsl:value-of
select="$textareacols" />
+ </xsl:with-param>
+ <xsl:with-param name="textarearows">
+ <xsl:value-of
select="$textarearows" />
+ </xsl:with-param>
+ </xsl:apply-templates>
+ </fieldset>
+ </div>
+ </xsl:for-each>
+</xsl:template>
+
+<!-- New template-->
+<xsl:template xmlns:php="http://php.net/xsl" match="attributes">
+ <xsl:param name="lang_hour" />
+ <xsl:param name="lang_min" />
+ <xsl:param name="statustext" />
+ <xsl:param name="textareacols" />
+ <xsl:param name="textarearows" />
+ <xsl:choose>
+ <xsl:when test="datatype='section'">
+ <div class="pure-control-group">
+ <xsl:value-of select="descr"
disable-output-escaping="yes"/>
+ </div>
+ </xsl:when>
+ </xsl:choose>
+
+ <div class="pure-control-group">
+ <xsl:choose>
+ <xsl:when test="not(hide_row)">
+ <label>
<xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of
select="@class"/>
+ <xsl:when test="helpmsg=1">
+ <xsl:variable
name="help_url">
+ <xsl:value-of
select="help_url"/>
+ </xsl:variable>
+ <a
href="javascript:help_Popup('{$help_url}');">
+
<xsl:text>[</xsl:text>
+ <xsl:value-of
select="input_text"/>
+
<xsl:text>]</xsl:text>
+ </a>
</xsl:when>
- <xsl:when test="position() mod
2 = 0">
-
<xsl:text>row_off</xsl:text>
- </xsl:when>
<xsl:otherwise>
-
<xsl:text>row_on</xsl:text>
+ <xsl:value-of
select="input_text"/>
</xsl:otherwise>
</xsl:choose>
- </xsl:attribute>
-
- <td align="left" valign="top">
- <xsl:value-of select="input_text"/>
<xsl:choose>
- <xsl:when test="datatype='D'">
-
<xsl:text>[</xsl:text><xsl:value-of
select="//lang_dateformat"/><xsl:text>]</xsl:text>
- </xsl:when>
- </xsl:choose>
- </td>
- <td align="left">
- <xsl:choose>
- <xsl:when test="name!=''">
- <input type="hidden"
name="values_attribute[{counter}][name]" value="{name}"></input>
- <input type="hidden"
name="values_attribute[{counter}][datatype]" value="{datatype}"></input>
+ <xsl:when test="datatype='pwd'">
+ <br/>
+ <xsl:text>[ </xsl:text>
<xsl:choose>
- <xsl:when
test="datatype='R'">
-
<xsl:call-template name="choice_view"/>
+ <xsl:when
test="value!=''">
+
<xsl:value-of select="php:function('lang', 'edit')"/>
</xsl:when>
- <xsl:when
test="datatype='CH'">
-
<xsl:call-template name="choice_view"/>
- </xsl:when>
- <xsl:when
test="datatype='LB'">
- <select
disabled="disabled" class="forms" onMouseover="window.status='{statustext}';
return true;" onMouseout="window.status='';return true;">
-
<option value=""><xsl:value-of select="//lang_none"/></option>
-
<xsl:for-each select="choice">
-
<xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
-
<xsl:choose>
-
<xsl:when test="checked='checked'">
-
<option value="{$id}" selected="selected"><xsl:value-of
disable-output-escaping="yes" select="value"/></option>
-
</xsl:when>
-
<xsl:otherwise>
-
<option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="value"/></option>
-
</xsl:otherwise>
-
</xsl:choose>
-
</xsl:for-each>
-
</select>
- </xsl:when>
- <xsl:when
test="datatype='AB'">
- <input
type="text" value="{value}" readonly="readonly" size="5"
onMouseout="window.status='';return true;" >
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- <input
size="30" type="text" value="{contact_name}" readonly="readonly">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:when>
- <xsl:when
test="datatype='VENDOR'">
- <input
type="text" value="{value}" readonly="readonly" size="6"
onMouseout="window.status='';return true;" >
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- <input
size="30" type="text" value="{vendor_name}" readonly="readonly">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:when>
- <xsl:when
test="datatype='D'">
- <input
type="text" name="values_attribute[{counter}][value]" value="{value}"
readonly="readonly" size="12" maxlength="10"
onMouseout="window.status='';return true;" >
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="statustext"/>
-
<xsl:text>';return true;</xsl:text>
-
</xsl:attribute>
- </input>
- </xsl:when>
- <xsl:when
test="datatype='T'">
-
<textarea cols="40" rows="6" name="values_attribute[{counter}][value]"
wrap="virtual" readonly="readonly" onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="statustext"/>
-
<xsl:text>';return true;</xsl:text>
-
</xsl:attribute>
-
<xsl:value-of select="value"/>
-
</textarea>
- </xsl:when>
<xsl:otherwise>
- <input
type="text" name="values_attribute[{counter}][value]" value="{value}"
readonly="readonly" size="30" onMouseout="window.status='';return true;" >
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="statustext"/>
-
<xsl:text>';return true;</xsl:text>
-
</xsl:attribute>
- </input>
+
<xsl:value-of select="php:function('lang', 'add')"/>
</xsl:otherwise>
</xsl:choose>
- <xsl:choose>
- <xsl:when
test="history=1">
-
<xsl:variable name="link_history"><xsl:value-of
select="link_history"/></xsl:variable>
-
<xsl:variable name="lang_history_help"><xsl:value-of
select="//lang_history_help"/></xsl:variable>
-
<xsl:variable name="lang_history"><xsl:value-of
select="//lang_history"/></xsl:variable>
- <a
href="javascript:var
w=window.open('{$link_history}','','width=550,height=400,scrollbars')"
-
onMouseOver="overlib('{$lang_history_help}', CAPTION, '{$lang_history}')"
-
onMouseOut="nd()">
-
<xsl:value-of select="//lang_history"/></a>
-
- </xsl:when>
- </xsl:choose>
-
+ <xsl:text> ]</xsl:text>
</xsl:when>
</xsl:choose>
- </td>
- </tr>
- </xsl:template>
+ </label>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="name!=''">
+ <xsl:choose>
+ <xsl:when test="datatype='R'">
+ <xsl:call-template
name="choice">
+ <xsl:with-param
name="input_type">radio</xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="datatype='CH'">
+ <xsl:call-template
name="choice">
+ <xsl:with-param
name="input_type">checkbox</xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:when test="datatype='LB'">
+ <select id="id_{name}"
title="{$statustext}">
+ <xsl:attribute
name="disabled">
+ <xsl:text>
disabled</xsl:text>
+ </xsl:attribute>
+ <option value="">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </option>
+ <xsl:for-each
select="choice">
+ <xsl:variable
name="id">
+
<xsl:value-of select="id"/>
+ </xsl:variable>
+ <xsl:choose>
+
<xsl:when test="selected='1'">
+
<option value="{$id}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="value"/>
+
</option>
+
</xsl:when>
+
<xsl:otherwise>
+
<option value="{$id}">
+
<xsl:value-of disable-output-escaping="yes" select="value"/>
+
</option>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ </xsl:when>
+ <xsl:when test="datatype='AB'">
+ <input size="30" type="text"
value="{contact_name}" readonly="readonly">
+ <xsl:attribute
name="disabled">
+ <xsl:text>
disabled</xsl:text>
+ </xsl:attribute>
+ </input>
+ <xsl:choose>
+ <xsl:when
test="contact_tel!=''">
+ <xsl:value-of
select="contact_tel"/>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="contact_email!=''">
+ <a
href="mailto:{contact_email}">
+
<xsl:value-of select="contact_email"/>
+ </a>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:when test="datatype='ABO'">
+ <xsl:variable name="org_name">
+ <xsl:value-of
select="name"/>
+
<xsl:text>_name</xsl:text>
+ </xsl:variable>
+ <input type="hidden"
name="{name}" value="{value}" readonly="readonly" size="5">
+ <xsl:attribute
name="disabled">
+ <xsl:text>
disabled</xsl:text>
+ </xsl:attribute>
+ </input>
+ <input size="30" type="text"
value="{org_name}" readonly="readonly">
+ <xsl:attribute
name="disabled">
+ <xsl:text>
disabled</xsl:text>
+ </xsl:attribute>
+ </input>
+ <xsl:choose>
+ <xsl:when
test="org_tel!=''">
+ <xsl:value-of
select="org_tel"/>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="org_email!=''">
+ <a
href="mailto:{org_email}">
+
<xsl:value-of select="org_email"/>
+ </a>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:when test="datatype='VENDOR'">
+ <xsl:variable
name="vendor_name">
+ <xsl:value-of
select="name"/>
+
<xsl:text>_org_name</xsl:text>
+ </xsl:variable>
+ <input type="text" id="{name}"
value="{value}" readonly="readonly" size="6">
+ <xsl:attribute
name="disabled">
+ <xsl:text>
disabled</xsl:text>
+ </xsl:attribute>
+ </input>
+ <input size="30" type="text"
id="{$vendor_name}" value="{vendor_name}" readonly="readonly">
+ <xsl:attribute
name="disabled">
+ <xsl:text>
disabled</xsl:text>
+ </xsl:attribute>
+ </input>
+ </xsl:when>
+ <xsl:when test="datatype='custom1'">
+ <select>
+ <xsl:attribute
name="disabled">
+ <xsl:text>
disabled</xsl:text>
+ </xsl:attribute>
+ <option value="">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </option>
+ <xsl:for-each
select="choice">
+ <xsl:variable
name="id">
+
<xsl:value-of select="id"/>
+ </xsl:variable>
+ <xsl:choose>
+
<xsl:when test="selected='1'">
+
<option value="{$id}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
</option>
+
</xsl:when>
+
<xsl:otherwise>
+
<option value="{$id}">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
</option>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ </xsl:when>
+ <xsl:when test="datatype='custom2'">
+ <input type="text"
value="{value}" readonly="readonly" size="6">
+ </input>
+ <input size="30" type="text"
value="{custom_name}" readonly="readonly">
+ </input>
+ </xsl:when>
+ <xsl:when test="datatype='custom3'">
+ <xsl:variable name="custom_id">
+ <xsl:value-of
select="name"/>
+ <xsl:text>_id</xsl:text>
+ </xsl:variable>
- <xsl:template name="choice_view">
- <xsl:variable name="counter"><xsl:value-of
select="counter"/></xsl:variable>
- <table cellpadding="2" cellspacing="2" width="50%"
align="left">
- <xsl:for-each select="choice" >
- <tr>
- <xsl:attribute name="class">
+ <xsl:variable
name="custom_name">
+ <xsl:value-of
select="name"/>
+
<xsl:text>_name</xsl:text>
+ </xsl:variable>
+
+ <xsl:variable
name="custom_container">
+ <xsl:value-of
select="name"/>
+
<xsl:text>_container</xsl:text>
+ </xsl:variable>
+
+ <input id="{$custom_name}"
type="text" value="{custom_name}">
+ <xsl:attribute
name="disabled">
+ <xsl:text>
disabled</xsl:text>
+ </xsl:attribute>
+ </input>
+ <div id="{$custom_container}"/>
+ </xsl:when>
+ <xsl:when test="datatype='user'">
+ <xsl:variable name="user_name">
+ <xsl:value-of
select="name"/>
+
<xsl:text>_user_name</xsl:text>
+ </xsl:variable>
+ <input type="text" id="{name}"
name="{name}" value="{value}" readonly="readonly" size="6">
+ <xsl:attribute
name="disabled">
+ <xsl:text>
disabled</xsl:text>
+ </xsl:attribute>
+ </input>
+ <input size="30" type="text"
id="{$user_name}" name="{$user_name}" value="{user_name}" readonly="readonly">
+ <xsl:attribute
name="disabled">
+ <xsl:text>
disabled</xsl:text>
+ </xsl:attribute>
+ </input>
+ </xsl:when>
+ <xsl:when test="datatype='D'">
+ <input type="text"
id="values_attribute_{id}" value="{value}" size="12" maxlength="12">
+ <xsl:attribute
name="readonly">
+ <xsl:text>
readonly</xsl:text>
+ </xsl:attribute>
+ </input>
+ </xsl:when>
+ <xsl:when test="datatype='DT'">
+ <table>
+ <tr>
+ <td>
+ <input
type="text" id="values_attribute_{id}" value="{value/date}" size="12"
maxlength="12">
+
<xsl:attribute name="readonly">
+
<xsl:text> readonly</xsl:text>
+
</xsl:attribute>
+ </input>
+ </td>
+ <td>
+ <input
type="text" id="values_attribute_{id}_hour" value="{value/hour}" size="2"
maxlength="2" title="{$lang_hour}">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+ </input>
+ </td>
+ <td>
+
<xsl:text> : </xsl:text>
+ </td>
+ <td>
+ <input
type="text" id="values_attribute_{id}_min" value="{value/min}" size="2"
maxlength="2" title="{$lang_min}">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ </table>
+ </xsl:when>
+ <xsl:when test="datatype='T'">
+ <textarea id="id_{name}">
+ <xsl:attribute
name="disabled">
+ <xsl:text>
disabled</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="cols">
+ <xsl:choose>
+
<xsl:when test="$textareacols!=''">
+
<xsl:value-of select="$textareacols"/>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:text>60</xsl:text>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <xsl:attribute
name="rows">
+ <xsl:choose>
+
<xsl:when test="$textarearows!=''">
+
<xsl:value-of select="$textarearows"/>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:text>6</xsl:text>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <xsl:value-of
select="value"/>
+ </textarea>
+ </xsl:when>
+ <xsl:when test="datatype='bolean'">
+ <input id="id_{name}"
type="checkbox" value="1" readonly="readonly">
<xsl:choose>
- <xsl:when
test="@class">
-
<xsl:value-of select="@class"/>
+ <xsl:when
test="value!=''">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
</xsl:when>
- <xsl:when
test="position() mod 2 = 0">
-
<xsl:text>row_off</xsl:text>
- </xsl:when>
- <xsl:otherwise>
-
<xsl:text>row_on</xsl:text>
- </xsl:otherwise>
</xsl:choose>
- </xsl:attribute>
- <td align="left">
- <xsl:value-of select="value"/>
- <xsl:text> </xsl:text>
- </td>
- <xsl:variable
name="checked"><xsl:value-of select="checked"/></xsl:variable>
- <td align="left">
+ </input>
+ </xsl:when>
+ <xsl:when test="datatype='link'">
<xsl:choose>
- <xsl:when
test="checked='checked'">
- <input
type="{input_type}" name="values_attribute[{$counter}][value][]" value="{id}"
checked="$checked" disabled="disabled"></input>
+ <xsl:when
test="value!=''">
+ <br/>
+ <a
href="{value}" target="_blank">
+
<xsl:value-of select="value"/>
+ </a>
</xsl:when>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:when test="datatype='event'">
+ <xsl:choose>
+ <xsl:when
test="warning!=''">
+ <xsl:value-of
select="warning"/>
+ </xsl:when>
<xsl:otherwise>
- <input
type="{input_type}" name="values_attribute[{$counter}][value][]" value="{id}"
disabled="disabled"></input>
+ <div
class="pure-custom">
+ <input
type="text" name="{name}" value="{value}" readonly="readonly" size="6"/>
+ <input
size="30" type="text" value="{descr}" readonly="readonly">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+ </input>
+
<xsl:choose>
+
<xsl:when test="next!=''">
+
<div>
+
<xsl:value-of select="lang_next_run"/>
+
<xsl:text>: </xsl:text>
+
<xsl:value-of select="next"/>
+
</div>
+
<div>
+
<xsl:value-of select="lang_enabled"/>
+
<xsl:text>: </xsl:text>
+
<xsl:value-of select="enabled"/>
+
</div>
+
</xsl:when>
+
</xsl:choose>
+ </div>
</xsl:otherwise>
</xsl:choose>
- </td>
- </tr>
- </xsl:for-each>
- </table>
- </xsl:template>
+ </xsl:when>
+ <xsl:when test="datatype='I'">
+ <input id="id_{name}"
type="text" value="{value}" size="30">
+ <xsl:attribute
name="disabled">
+ <xsl:text>
disabled</xsl:text>
+ </xsl:attribute>
+ </input>
+ </xsl:when>
+ <xsl:when test="datatype='N'">
+ <input id="id_{name}"
type="text" value="{value}" size="30">
+ <xsl:attribute
name="disabled">
+ <xsl:text>
disabled</xsl:text>
+ </xsl:attribute>
+ </input>
+ </xsl:when>
+ <xsl:when test="datatype='email'">
+ <input data-validation="email"
id="id_{name}" type="text" value="{value}" size="30">
+ <xsl:attribute
name="disabled">
+ <xsl:text>
disabled</xsl:text>
+ </xsl:attribute>
+ </input>
+ </xsl:when>
+ <xsl:otherwise>
+ <input id="id_{name}"
type="text" value="{value}" size="30">
+ <xsl:attribute
name="disabled">
+ <xsl:text>
disabled</xsl:text>
+ </xsl:attribute>
+ </input>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="history=1">
+ <input type="text"
id="values_attribute_{id}_date" value="" size="12" maxlength="10"
readonly="readonly">
+ </input>
+ <xsl:variable
name="link_history">
+ <xsl:value-of
select="link_history"/>
+ </xsl:variable>
+ <xsl:variable
name="lang_history_help">
+ <xsl:value-of
select="//lang_history_help"/>
+ </xsl:variable>
+ <xsl:variable
name="lang_history">
+ <xsl:value-of
select="php:function('lang', 'history')" />
+ </xsl:variable>
+ <a
href="javascript:JqueryPortico.showlightbox_history('{$link_history}')"
title="{$lang_history}">
+ <xsl:value-of
select="$lang_history"/>
+ </a>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
+ </div>
+</xsl:template>
+<!-- New template-->
+<xsl:template name="choice">
+ <xsl:param name="input_type" />
+ <xsl:variable name="id">
+ <xsl:value-of select="id"/>
+ </xsl:variable>
+ <xsl:variable name="name">
+ <xsl:value-of select="name"/>
+ </xsl:variable>
+ <div class="pure-custom">
+ <xsl:for-each select="choice">
+ <xsl:choose>
+ <xsl:when test="selected='1'">
+ <input id="id_{$name}_{id}"
type="{$input_type}" value="{id}" checked="checked" disabled="disabled="/>
+ </xsl:when>
+ <xsl:otherwise>
+ <input id="id_{$name}_{id}"
type="{$input_type}" value="{id}" disabled="disabled="/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:value-of select="value"/>
+ <br></br>
+ </xsl:for-each>
+ </div>
+</xsl:template>
Modified: branches/dev-syncromind/property/templates/base/attributes_form.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/attributes_form.xsl
2016-01-14 13:15:56 UTC (rev 14646)
+++ branches/dev-syncromind/property/templates/base/attributes_form.xsl
2016-01-14 15:16:08 UTC (rev 14647)
@@ -12,18 +12,6 @@
TINY.box.show({iframe:requestUrl,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});
};
</script>
-
- <xsl:for-each select="attributes_group">
- <div id="{link}">
- <fieldset>
- <xsl:apply-templates select="attributes"/>
- </fieldset>
- </div>
- </xsl:for-each>
-</xsl:template>
-
-<!-- New template-->
-<xsl:template xmlns:php="http://php.net/xsl" match="attributes">
<xsl:variable name="lang_hour">
<xsl:value-of select="php:function('lang', 'hour')" />
</xsl:variable>
@@ -41,6 +29,39 @@
<xsl:value-of select="php:function('get_phpgw_info',
'user|preferences|property|textarearows')" />
</xsl:variable>
+ <xsl:for-each select="attributes_group">
+ <div id="{link}">
+ <fieldset>
+ <xsl:apply-templates select="attributes">
+ <xsl:with-param name="lang_hour">
+ <xsl:value-of
select="$lang_hour" />
+ </xsl:with-param>
+ <xsl:with-param name="lang_min">
+ <xsl:value-of
select="$lang_min" />
+ </xsl:with-param>
+ <xsl:with-param name="statustext">
+ <xsl:value-of
select="$statustext" />
+ </xsl:with-param>
+ <xsl:with-param name="textareacols">
+ <xsl:value-of
select="$textareacols" />
+ </xsl:with-param>
+ <xsl:with-param name="textarearows">
+ <xsl:value-of
select="$textarearows" />
+ </xsl:with-param>
+ </xsl:apply-templates>
+ </fieldset>
+ </div>
+ </xsl:for-each>
+</xsl:template>
+
+<!-- New template-->
+<xsl:template xmlns:php="http://php.net/xsl" match="attributes">
+ <xsl:param name="lang_hour" />
+ <xsl:param name="lang_min" />
+ <xsl:param name="statustext" />
+ <xsl:param name="textareacols" />
+ <xsl:param name="textarearows" />
+
<xsl:choose>
<xsl:when test="datatype='section'">
<div class="pure-control-group">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14647] more on bookingfrontend,
Sigurd Nes <=