|
| From: | sigurdne |
| Subject: | [Fmsystem-commits] [16663] formatting |
| Date: | Tue, 2 May 2017 03:51:43 -0400 (EDT) |
Revision: 16663
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16663
Author: sigurdne
Date: 2017-05-02 03:51:42 -0400 (Tue, 02 May 2017)
Log Message:
-----------
formatting
Modified Paths:
--------------
trunk/phpgwapi/templates/pure/js/mmenu.js
trunk/property/inc/class.bolocation.inc.php
trunk/property/templates/base/location_form.xsl
trunk/property/templates/base/location_form2.xsl
Modified: trunk/phpgwapi/templates/pure/js/mmenu.js
===================================================================
--- trunk/phpgwapi/templates/pure/js/mmenu.js 2017-05-01 18:10:43 UTC (rev
16662)
+++ trunk/phpgwapi/templates/pure/js/mmenu.js 2017-05-02 07:51:42 UTC (rev
16663)
@@ -139,6 +139,10 @@
{
$(this).removeClass('pure-input-1-2').addClass('pure-input-1');
});
+ $('.pure-u-3-5').each(function (i, obj)
+ {
+
$(this).removeClass('pure-u-3-5').addClass('pure-u-5-6');
+ });
})
.resize();//trigger the resize event on page load.
Modified: trunk/property/inc/class.bolocation.inc.php
===================================================================
--- trunk/property/inc/class.bolocation.inc.php 2017-05-01 18:10:43 UTC (rev
16662)
+++ trunk/property/inc/class.bolocation.inc.php 2017-05-02 07:51:42 UTC (rev
16663)
@@ -601,7 +601,7 @@
$input_name_entity[] =
$location['location'][$i]['extra'][0]['input_name'];
$location['location'][$i]['extra'][0]['input_type'] = 'text';
$location['location'][$i]['extra'][0]['size'] = 30;
-
$location['location'][$i]['extra'][0]['size'] = 'pure-u-3-5';
+
$location['location'][$i]['extra'][0]['class'] = 'pure-u-3-5';
$location['location'][$i]['extra'][0]['lookup_function_call'] =
'lookup_entity_' . $entity['id'] . '()';
$location['location'][$i]['extra'][0]['is_entity'] = true;
Modified: trunk/property/templates/base/location_form.xsl
===================================================================
--- trunk/property/templates/base/location_form.xsl 2017-05-01 18:10:43 UTC
(rev 16662)
+++ trunk/property/templates/base/location_form.xsl 2017-05-02 07:51:42 UTC
(rev 16663)
@@ -1,63 +1,99 @@
<!-- $Id$ -->
<xsl:template name="location_form">
- <xsl:apply-templates select="location_data"/>
+ <xsl:apply-templates select="location_data"/>
</xsl:template>
<!-- New template-->
<xsl:template match="location_data" xmlns:php="http://php.net/xsl";>
- <xsl:for-each select="location">
+ <xsl:for-each select="location">
<div class="pure-control-group">
- <label>
- <xsl:choose>
- <xsl:when
test="lookup_link=1">
- <a
href="javascript:{lookup_function_call}" title="{statustext}">
-
<xsl:value-of select="name"/>
- </a>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="name"/>
- </xsl:otherwise>
- </xsl:choose>
- </label>
- <input size="{size}" type="{input_type}"
id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
- <xsl:attribute
name="title">
-
<xsl:value-of select="statustext"/>
+ <label title="{statustext}">
+ <xsl:choose>
+ <xsl:when test="lookup_link=1">
+ <a
href="javascript:{lookup_function_call}" title="{statustext}">
+ <xsl:value-of
select="name"/>
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="name"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </label>
+ <div class="pure-g pure-custom">
+ <div>
+ <xsl:if test="input_type != 'hidden'">
+ <xsl:attribute name="class">
+
<xsl:text>pure-u-1-6</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="class != ''">
+ <xsl:attribute name="class">
+ <xsl:value-of
select="class"/>
+ </xsl:attribute>
+ </xsl:if>
+ <input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
+ <xsl:if test="input_type !=
'hidden'">
+ <xsl:attribute
name="class">
+
<xsl:text>pure-input-1</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="readonly=1">
+ <xsl:attribute
name="class">
+
<xsl:text>readonly</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="input_type !=
'hidden' and required = 1">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="statustext"/>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation">
+
<xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-error-msg">
+ <xsl:value-of
select="php:function('lang', 'Please select a location !')"/>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </div>
+ <xsl:for-each select="extra">
+ <div>
+ <xsl:if test="input_type !=
'hidden'">
+ <xsl:attribute
name="class">
+
<xsl:text>pure-u-3-5</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="class != ''">
+ <xsl:attribute
name="class">
+ <xsl:value-of
select="class"/>
+ </xsl:attribute>
+ </xsl:if>
+ <input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
+ <xsl:if
test="input_type != 'hidden'">
+ <xsl:attribute
name="class">
+
<xsl:text>pure-input-1</xsl:text>
</xsl:attribute>
- <xsl:if test="readonly=1">
- <xsl:attribute name="readonly">
- <xsl:text> readonly</xsl:text>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="required='1'">
- <xsl:attribute name="data-validation">
- <xsl:text>required</xsl:text>
+ </xsl:if>
+ <xsl:if
test="is_entity=1">
+ <xsl:attribute
name="class">
+
<xsl:text>pure-input-2-3</xsl:text>
</xsl:attribute>
- <xsl:attribute
name="data-validation-error-msg">
- <xsl:value-of
select="php:function('lang', 'Please select a location !')"/>
- </xsl:attribute>
- </xsl:if>
- </input>
- <xsl:for-each select="extra">
+ </xsl:if>
+ <xsl:if
test="readonly=1">
+ <xsl:attribute
name="readonly">
+
<xsl:text>readonly</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="statustext"/>
+ </xsl:attribute>
+ </input>
<xsl:choose>
- <xsl:when
test="readonly=1">
- <input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" readonly="readonly">
-
<xsl:attribute name="title">
-
<xsl:value-of select="statustext"/>
-
</xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="statustext"/>
-
</xsl:attribute>
- </input>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:choose>
<xsl:when
test="is_entity=1">
- <input
type="checkbox" name="clear_{input_name}_box" onClick="blank_entity_values()">
+ <a
href="javascript:blank_entity_values();">
+
<xsl:value-of select="php:function('lang', 'delete')"/>
+ </a>
+ <!--input
type="checkbox" name="clear_{input_name}_box" onClick="blank_entity_values();">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'delete')"/>
</xsl:attribute>
@@ -64,10 +100,12 @@
<xsl:attribute name="readonly">
<xsl:text>readonly</xsl:text>
</xsl:attribute>
- </input>
+ </input-->
</xsl:when>
</xsl:choose>
- </xsl:for-each>
+ </div>
+ </xsl:for-each>
+ </div>
</div>
- </xsl:for-each>
+ </xsl:for-each>
</xsl:template>
Modified: trunk/property/templates/base/location_form2.xsl
===================================================================
--- trunk/property/templates/base/location_form2.xsl 2017-05-01 18:10:43 UTC
(rev 16662)
+++ trunk/property/templates/base/location_form2.xsl 2017-05-02 07:51:42 UTC
(rev 16663)
@@ -27,11 +27,11 @@
<xsl:text>pure-u-1-6</xsl:text>
</xsl:attribute>
</xsl:if>
- <xsl:if test="class != ''">
- <xsl:attribute
name="class">
- <xsl:value-of
select="class"/>
- </xsl:attribute>
- </xsl:if>
+ <xsl:if test="class != ''">
+ <xsl:attribute name="class">
+ <xsl:value-of
select="class"/>
+ </xsl:attribute>
+ </xsl:if>
<input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
<xsl:if test="input_type !=
'hidden'">
<xsl:attribute
name="class">
@@ -74,6 +74,11 @@
<xsl:text>pure-input-1</xsl:text>
</xsl:attribute>
</xsl:if>
+ <xsl:if
test="is_entity=1">
+ <xsl:attribute
name="class">
+
<xsl:text>pure-input-2-3</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
<xsl:if
test="readonly=1">
<xsl:attribute
name="readonly">
<xsl:text>readonly</xsl:text>
@@ -85,7 +90,10 @@
</input>
<xsl:choose>
<xsl:when
test="is_entity=1">
- <input
type="checkbox" name="clear_{input_name}_box" onClick="blank_entity_values()">
+ <a
href="javascript:blank_entity_values();">
+
<xsl:value-of select="php:function('lang', 'delete')"/>
+ </a>
+ <!--input
type="checkbox" name="clear_{input_name}_box" onClick="blank_entity_values();">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'delete')"/>
</xsl:attribute>
@@ -92,7 +100,7 @@
<xsl:attribute name="readonly">
<xsl:text>readonly</xsl:text>
</xsl:attribute>
- </input>
+ </input-->
</xsl:when>
</xsl:choose>
</div>
| [Prev in Thread] | Current Thread | [Next in Thread] |