[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16645] Stable: Merge 16643:16644 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16645] Stable: Merge 16643:16644 from trunk |
|
Date: |
Thu, 27 Apr 2017 11:53:37 -0400 (EDT) |
Revision: 16645
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16645
Author: sigurdne
Date: 2017-04-27 11:53:37 -0400 (Thu, 27 Apr 2017)
Log Message:
-----------
Stable: Merge 16643:16644 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
branches/Version-2_0-branch/eventplanner/setup/setup.inc.php
branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php
branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php
branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
branches/Version-2_0-branch/eventplanner/templates/base/application_info.xsl
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application_info.xsl
branches/Version-2_0-branch/eventplannerfrontend/templates/base/customer.xsl
branches/Version-2_0-branch/eventplannerfrontend/templates/base/vendor.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-04-27 15:52:49 UTC (rev 16644)
+++ branches/Version-2_0-branch 2017-04-27 15:53:37 UTC (rev 16645)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16587
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644
\ No newline at end of property
Modified:
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2017-04-27 15:52:49 UTC (rev 16644)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2017-04-27 15:53:37 UTC (rev 16645)
@@ -418,7 +418,8 @@
'select_name' => 'category_id',
'selected' =>
$application->category_id ? $application->category_id : $default_category,
'use_acl' => $this->_category_acl,
- 'required' => true)),
+ 'required' => true,
+ 'class'=>'pure-input-1-2')),
'status_list' => array('options' =>
$this->get_status_options($application->status)),
'application_type_list' =>
$application_type_list,
'wardrobe_list' => array('options' =>
$wardrobe_list),
Modified:
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
===================================================================
---
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
2017-04-27 15:52:49 UTC (rev 16644)
+++
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
2017-04-27 15:53:37 UTC (rev 16645)
@@ -62,6 +62,7 @@
$audience_limit,
$title,
$description,
+ $summary,
$remark,
$contact_name,
$contact_email,
@@ -177,6 +178,11 @@
'label' => 'application description',
'sortable' => false,
),
+ 'summary' => array('action'=> PHPGW_ACL_ADD |
PHPGW_ACL_EDIT,
+ 'type' => 'string',
+ 'label' => 'summary',
+ 'sortable' => false,
+ ),
'remark' => array('action'=> PHPGW_ACL_ADD |
PHPGW_ACL_EDIT,
'type' => 'string',
'label' => 'description',
Modified: branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
2017-04-27 15:52:49 UTC (rev 16644)
+++ branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
2017-04-27 15:53:37 UTC (rev 16645)
@@ -120,4 +120,5 @@
booking interval eventplanner no Booking intervall
days eventplanner no dager
hours eventplanner no Timer
-there is a minimum interval of %1 hours eventplanner no Det er
et minimumsintervall på %1 time(r)
\ No newline at end of file
+there is a minimum interval of %1 hours eventplanner no Det er
et minimumsintervall på %1 time(r)
+summary eventplanner no kortversjon programbeskrivelse
\ No newline at end of file
Modified: branches/Version-2_0-branch/eventplanner/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/setup.inc.php
2017-04-27 15:52:49 UTC (rev 16644)
+++ branches/Version-2_0-branch/eventplanner/setup/setup.inc.php
2017-04-27 15:53:37 UTC (rev 16645)
@@ -11,7 +11,7 @@
* @version $Id: setup.inc.php 14728 2016-02-11 22:28:46Z sigurdne $
*/
$setup_info['eventplanner']['name'] = 'eventplanner';
- $setup_info['eventplanner']['version'] = '0.9.18.008';
+ $setup_info['eventplanner']['version'] = '0.9.18.009';
$setup_info['eventplanner']['app_order'] = 20;
$setup_info['eventplanner']['enable'] = 1;
$setup_info['eventplanner']['app_group'] = 'office';
Modified: branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php
2017-04-27 15:52:49 UTC (rev 16644)
+++ branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php
2017-04-27 15:53:37 UTC (rev 16645)
@@ -148,6 +148,7 @@
'other_participants' => array('type' => 'text',
'nullable' => True),
'title' => array('type' => 'text', 'nullable'
=> False),
'description' => array('type' => 'text',
'nullable' => False),
+ 'summary' => array('type' => 'text', 'nullable'
=> true),
'remark' => array('type' => 'text', 'nullable'
=> True),
'contact_name' => array('type' => 'text',
'nullable' => False),
'contact_email' => array('type' => 'text',
'nullable' => False),
Modified: branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php
2017-04-27 15:52:49 UTC (rev 16644)
+++ branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php
2017-04-27 15:53:37 UTC (rev 16645)
@@ -355,3 +355,20 @@
}
return $GLOBALS['setup_info']['eventplanner']['currentver'];
}
+
+ $test[] = '0.9.18.008';
+ function eventplanner_upgrade0_9_18_008()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('eventplanner_application',
'summary', array(
+ 'type' => 'text',
+ 'nullable' => true
+ ));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['eventplanner']['currentver'] =
'0.9.18.009';
+ }
+ return $GLOBALS['setup_info']['eventplanner']['currentver'];
+ }
Modified:
branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
===================================================================
--- branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
2017-04-27 15:52:49 UTC (rev 16644)
+++ branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
2017-04-27 15:53:37 UTC (rev 16645)
@@ -129,7 +129,7 @@
<xsl:value-of select="$lang_vendor"/>
</xsl:attribute>
</input>
- <input
type="text" id="vendor_name" name="vendor_name"
value="{application/vendor_name}">
+ <input
type="text" id="vendor_name" name="vendor_name"
value="{application/vendor_name}" class="pure-input-1-2" >
<xsl:attribute name="placeholder">
<xsl:value-of select="$lang_vendor"/>
</xsl:attribute>
@@ -149,7 +149,7 @@
<label>
<xsl:value-of select="php:function('lang', 'contact name')"/>
</label>
- <input
type="text" id="contact_name" name="contact_name"
value="{application/contact_name}">
+ <input
type="text" id="contact_name" name="contact_name"
value="{application/contact_name}" class="pure-input-1-2" >
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -165,7 +165,7 @@
<label>
<xsl:value-of select="php:function('lang', 'contact email')"/>
</label>
- <input
type="text" id="contact_email" name="contact_email"
value="{application/contact_email}">
+ <input
type="text" id="contact_email" name="contact_email"
value="{application/contact_email}" class="pure-input-1-2" >
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -182,7 +182,7 @@
<label>
<xsl:value-of select="php:function('lang', 'contact phone')"/>
</label>
- <input
type="text" id="contact_phone" name="contact_phone"
value="{application/contact_phone}">
+ <input
type="text" id="contact_phone" name="contact_phone"
value="{application/contact_phone}" class="pure-input-1-2" >
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -198,7 +198,7 @@
<label>
<xsl:value-of select="php:function('lang', 'other participants')"/>
</label>
- <textarea
cols="47" rows="7" name="other_participants">
+ <textarea
cols="47" rows="7" name="other_participants" class="pure-input-1-2" >
<xsl:value-of select="application/other_participants"/>
</textarea>
</div>
@@ -211,7 +211,7 @@
<label>
<xsl:value-of select="php:function('lang', 'program title')"/>
</label>
- <input
type="text" id="title" name="title" value="{application/title}">
+ <input
type="text" id="title" name="title" value="{application/title}"
class="pure-input-1-2" >
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -227,7 +227,7 @@
<label>
<xsl:value-of select="php:function('lang', 'program description')"/>
</label>
- <textarea
cols="47" rows="7" name="description">
+ <textarea
cols="47" rows="7" name="description" class="pure-input-1-2" >
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'might be published')"/>
</xsl:attribute>
@@ -377,7 +377,7 @@
<label>
<xsl:value-of select="php:function('lang', 'remark')"/>
</label>
- <textarea
cols="47" rows="7" name="remark">
+ <textarea
cols="47" rows="7" name="remark" class="pure-input-1-2" >
<xsl:value-of select="application/remark"/>
</textarea>
</div>
@@ -438,9 +438,17 @@
</div>
<div
class="pure-control-group">
<label>
+
<xsl:value-of select="php:function('lang', 'summary')"/>
+ </label>
+ <textarea
cols="47" rows="7" name="summary" class="pure-input-1-2" >
+
<xsl:value-of select="application/summary"/>
+ </textarea>
+ </div>
+ <div
class="pure-control-group">
+ <label>
<xsl:value-of select="php:function('lang', 'comment')"/>
</label>
- <textarea
cols="47" rows="7" name="comment">
+ <textarea
cols="47" rows="7" name="comment" class="pure-input-1-2" >
<xsl:value-of select="application/comment"/>
</textarea>
</div>
@@ -504,7 +512,7 @@
<label>
<xsl:value-of select="php:function('lang', 'stage requirement')"/>
</label>
- <textarea
cols="47" rows="7" name="stage_requirement">
+ <textarea
cols="47" rows="7" name="stage_requirement" class="pure-input-1-2" >
<xsl:value-of select="application/stage_requirement"/>
</textarea>
</div>
@@ -683,7 +691,7 @@
<div
class="pure-control-group">
<label>
</label>
- <textarea
cols="47" rows="7" name="raider">
+ <textarea
cols="47" rows="7" name="raider" class="pure-input-1-2" >
<xsl:value-of select="application/raider"/>
</textarea>
</div>
Modified:
branches/Version-2_0-branch/eventplanner/templates/base/application_info.xsl
===================================================================
---
branches/Version-2_0-branch/eventplanner/templates/base/application_info.xsl
2017-04-27 15:52:49 UTC (rev 16644)
+++
branches/Version-2_0-branch/eventplanner/templates/base/application_info.xsl
2017-04-27 15:53:37 UTC (rev 16645)
@@ -18,6 +18,12 @@
<div class="pure-control-group">
<label>
+ <xsl:value-of select="php:function('lang', 'program
description')"/>
+ </label>
+ <xsl:value-of select="application/summary"/>
+ </div>
+ <div class="pure-control-group">
+ <label>
<xsl:value-of select="php:function('lang', 'remark')"/>
</label>
<xsl:value-of select="application/remark"/>
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
2017-04-27 15:52:49 UTC (rev 16644)
+++
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
2017-04-27 15:53:37 UTC (rev 16645)
@@ -129,7 +129,7 @@
<xsl:value-of select="$lang_vendor"/>
</xsl:attribute>
</input>
- <input
type="text" id="vendor_name" name="vendor_name"
value="{application/vendor_name}">
+ <input
type="text" id="vendor_name" name="vendor_name"
value="{application/vendor_name}" class="pure-input-1-2" >
<xsl:attribute name="placeholder">
<xsl:value-of select="$lang_vendor"/>
</xsl:attribute>
@@ -150,7 +150,7 @@
<label>
<xsl:value-of select="php:function('lang', 'contact name')"/>
</label>
- <input
type="text" id="contact_name" name="contact_name"
value="{application/contact_name}">
+ <input
type="text" id="contact_name" name="contact_name"
value="{application/contact_name}" class="pure-input-1-2" >
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -166,7 +166,7 @@
<label>
<xsl:value-of select="php:function('lang', 'contact email')"/>
</label>
- <input
type="text" id="contact_email" name="contact_email"
value="{application/contact_email}">
+ <input
type="text" id="contact_email" name="contact_email"
value="{application/contact_email}" class="pure-input-1-2" >
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -183,7 +183,7 @@
<label>
<xsl:value-of select="php:function('lang', 'contact phone')"/>
</label>
- <input
type="text" id="contact_phone" name="contact_phone"
value="{application/contact_phone}">
+ <input
type="text" id="contact_phone" name="contact_phone"
value="{application/contact_phone}" class="pure-input-1-2" >
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -199,7 +199,7 @@
<label>
<xsl:value-of select="php:function('lang', 'other participants')"/>
</label>
- <textarea
cols="47" rows="7" name="other_participants">
+ <textarea
cols="47" rows="7" name="other_participants" class="pure-input-1-2" >
<xsl:value-of select="application/other_participants"/>
</textarea>
</div>
@@ -212,7 +212,7 @@
<label>
<xsl:value-of select="php:function('lang', 'program title')"/>
</label>
- <input
type="text" id="title" name="title" value="{application/title}">
+ <input
type="text" id="title" name="title" value="{application/title}"
class="pure-input-1-2" >
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -228,7 +228,7 @@
<label>
<xsl:value-of select="php:function('lang', 'program description')"/>
</label>
- <textarea
cols="47" rows="7" name="description">
+ <textarea
cols="47" rows="7" name="description" class="pure-input-1-2" >
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'might be published')"/>
</xsl:attribute>
@@ -376,9 +376,17 @@
<div
class="pure-control-group">
<label>
+
<xsl:value-of select="php:function('lang', 'summary')"/>
+ </label>
+ <textarea
cols="47" rows="7" name="summary" class="pure-input-1-2" >
+
<xsl:value-of select="application/summary"/>
+ </textarea>
+ </div>
+ <div
class="pure-control-group">
+ <label>
<xsl:value-of select="php:function('lang', 'remark')"/>
</label>
- <textarea
cols="47" rows="7" name="remark">
+ <textarea
cols="47" rows="7" name="remark" class="pure-input-1-2" >
<xsl:value-of select="application/remark"/>
</textarea>
</div>
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application_info.xsl
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application_info.xsl
2017-04-27 15:52:49 UTC (rev 16644)
+++
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application_info.xsl
2017-04-27 15:53:37 UTC (rev 16645)
@@ -15,6 +15,12 @@
</label>
<xsl:value-of select="application/title"/>
</div>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of select="php:function('lang', 'program
description')"/>
+ </label>
+ <xsl:value-of select="application/summary"/>
+ </div>
<div class="pure-control-group">
<label>
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/customer.xsl
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/templates/base/customer.xsl
2017-04-27 15:52:49 UTC (rev 16644)
+++
branches/Version-2_0-branch/eventplannerfrontend/templates/base/customer.xsl
2017-04-27 15:53:37 UTC (rev 16645)
@@ -50,7 +50,7 @@
<label>
<xsl:value-of
select="$lang_category"/>
</label>
- <select
name="category_id">
+ <select
name="category_id" class="pure-input-1-2" >
<xsl:attribute
name="title">
<xsl:value-of select="$lang_category"/>
</xsl:attribute>
@@ -67,7 +67,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'name')"/>
</label>
- <input type="text"
name="name" value="{customer/name}">
+ <input type="text"
name="name" value="{customer/name}" class="pure-input-1-2" >
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -88,7 +88,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'address')"/>
</label>
- <input type="text"
name="address_1" value="{customer/address_1}">
+ <input type="text"
name="address_1" value="{customer/address_1}" class="pure-input-1-4" >
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -97,7 +97,7 @@
</xsl:attribute>
</input>
- <input type="text"
name="address_2" value="{customer/address_2}">
+ <input type="text"
name="address_2" value="{customer/address_2}" class="pure-input-1-4" >
<xsl:attribute
name="placeholder">
<xsl:value-of select="$lang_address_2"/>
</xsl:attribute>
@@ -107,7 +107,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'zip code')"/>
</label>
- <input type="text"
name="zip_code" value="{customer/zip_code}">
+ <input type="text"
name="zip_code" value="{customer/zip_code}" class="pure-input-1-4" >
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -115,7 +115,7 @@
<xsl:value-of select="php:function('lang', 'zip code')"/>
</xsl:attribute>
</input>
- <input type="text"
name="city" value="{customer/city}">
+ <input type="text"
name="city" value="{customer/city}" class="pure-input-1-4" >
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -128,7 +128,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'organization number')"/>
</label>
- <input type="text"
id="organization_number" name="organization_number"
value="{customer/organization_number}">
+ <input type="text"
id="organization_number" name="organization_number"
value="{customer/organization_number}" class="pure-input-1-2" >
<xsl:attribute
name="data-validation">
<xsl:text>organization_number</xsl:text>
</xsl:attribute>
@@ -144,7 +144,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'account number')"/>
</label>
- <input type="text"
id="account_number" name="account_number" value="{customer/account_number}">
+ <input type="text"
id="account_number" name="account_number" value="{customer/account_number}"
class="pure-input-1-2" >
<xsl:attribute
name="data-validation">
<xsl:text>account_number</xsl:text>
</xsl:attribute>
@@ -160,7 +160,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'number of users')"/>
</label>
- <input type="text"
name="number_of_users" value="{customer/number_of_users}">
+ <input type="text"
name="number_of_users" value="{customer/number_of_users}"
class="pure-input-1-2" >
<xsl:attribute
name="data-validation">
<xsl:text>number</xsl:text>
</xsl:attribute>
@@ -173,7 +173,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'contact name')"/>
</label>
- <input type="text"
name="contact_name" value="{customer/contact_name}">
+ <input type="text"
name="contact_name" value="{customer/contact_name}" class="pure-input-1-2" >
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -186,7 +186,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'email')"/>
</label>
- <input type="text"
name="contact_email" id="contact_email" value="{customer/contact_email}">
+ <input type="text"
name="contact_email" id="contact_email" value="{customer/contact_email}"
class="pure-input-1-2" >
<xsl:attribute
name="data-validation">
<xsl:text>email</xsl:text>
</xsl:attribute>
@@ -199,7 +199,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'contact phone')"/>
</label>
- <input type="text"
name="contact_phone" value="{customer/contact_phone}">
+ <input type="text"
name="contact_phone" value="{customer/contact_phone}" class="pure-input-1-2" >
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -213,7 +213,7 @@
<xsl:value-of
select="php:function('lang', 'contact name')"/>
<xsl:text>
2</xsl:text>
</label>
- <input type="text"
name="contact2_name" id="contact2_name" value="{customer/contact2_name}">
+ <input type="text"
name="contact2_name" id="contact2_name" value="{customer/contact2_name}"
class="pure-input-1-2" >
<xsl:attribute
name="data-validation-optional">
<xsl:text>true</xsl:text>
</xsl:attribute>
@@ -227,7 +227,7 @@
<xsl:value-of
select="php:function('lang', 'email')"/>
<xsl:text>
2</xsl:text>
</label>
- <input type="text"
name="contact2_email" id="contact2_email" value="{customer/contact2_email}">
+ <input type="text"
name="contact2_email" id="contact2_email" value="{customer/contact2_email}"
class="pure-input-1-2" >
<xsl:attribute
name="data-validation">
<xsl:text>email</xsl:text>
</xsl:attribute>
@@ -244,7 +244,7 @@
<xsl:value-of
select="php:function('lang', 'contact phone')"/>
<xsl:text>
2</xsl:text>
</label>
- <input type="text"
name="contact2_phone" id="contact2_phone" value="{customer/contact2_phone}">
+ <input type="text"
name="contact2_phone" id="contact2_phone" value="{customer/contact2_phone}"
class="pure-input-1-2" >
<xsl:attribute
name="data-validation-depends-on">
<xsl:text>contact2_name</xsl:text>
</xsl:attribute>
@@ -260,7 +260,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'description')"/>
</label>
- <textarea cols="47"
rows="7" name="description">
+ <textarea cols="47"
rows="7" name="description" class="pure-input-1-2" >
<xsl:value-of
select="customer/description"/>
</textarea>
</div>
@@ -268,7 +268,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'remark')"/>
</label>
- <textarea cols="47"
rows="7" name="remark">
+ <textarea cols="47"
rows="7" name="remark" class="pure-input-1-2" >
<xsl:value-of
select="customer/remark"/>
</textarea>
</div>
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/vendor.xsl
===================================================================
--- branches/Version-2_0-branch/eventplannerfrontend/templates/base/vendor.xsl
2017-04-27 15:52:49 UTC (rev 16644)
+++ branches/Version-2_0-branch/eventplannerfrontend/templates/base/vendor.xsl
2017-04-27 15:53:37 UTC (rev 16645)
@@ -50,7 +50,7 @@
<label>
<xsl:value-of
select="$lang_category"/>
</label>
- <select
name="category_id">
+ <select
name="category_id" class="pure-input-1-2" >
<xsl:attribute
name="title">
<xsl:value-of select="$lang_category"/>
</xsl:attribute>
@@ -67,7 +67,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'name')"/>
</label>
- <input type="text"
name="name" value="{vendor/name}">
+ <input type="text"
name="name" value="{vendor/name}" class="pure-input-1-2" >
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -88,7 +88,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'address')"/>
</label>
- <input type="text"
name="address_1" value="{vendor/address_1}">
+ <input type="text"
name="address_1" value="{vendor/address_1}" class="pure-input-1-4" >
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -97,7 +97,7 @@
</xsl:attribute>
</input>
- <input type="text"
name="address_2" value="{vendor/address_2}">
+ <input type="text"
name="address_2" value="{vendor/address_2}" class="pure-input-1-4" >
<xsl:attribute
name="placeholder">
<xsl:value-of select="$lang_address_2"/>
</xsl:attribute>
@@ -107,7 +107,8 @@
<label>
<xsl:value-of
select="php:function('lang', 'zip code')"/>
</label>
- <input type="text"
name="zip_code" value="{vendor/zip_code}">
+
+ <input type="text"
name="zip_code" value="{vendor/zip_code}" class="pure-input-1-4" >
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -115,7 +116,7 @@
<xsl:value-of select="php:function('lang', 'zip code')"/>
</xsl:attribute>
</input>
- <input type="text"
name="city" value="{vendor/city}">
+ <input type="text"
name="city" value="{vendor/city}" class="pure-input-1-4" >
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -128,7 +129,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'organization number')"/>
</label>
- <input type="text"
id="organization_number" name="organization_number"
value="{vendor/organization_number}">
+ <input type="text"
id="organization_number" name="organization_number"
value="{vendor/organization_number}" class="pure-input-1-2" >
<xsl:attribute
name="data-validation">
<xsl:text>organization_number</xsl:text>
</xsl:attribute>
@@ -141,7 +142,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'contact name')"/>
</label>
- <input type="text"
name="contact_name" value="{vendor/contact_name}">
+ <input type="text"
name="contact_name" value="{vendor/contact_name}" class="pure-input-1-2" >
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -154,7 +155,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'email')"/>
</label>
- <input type="text"
name="contact_email" id="contact_email" value="{vendor/contact_email}">
+ <input type="text"
name="contact_email" id="contact_email" value="{vendor/contact_email}"
class="pure-input-1-2" >
<xsl:attribute
name="data-validation">
<xsl:text>email</xsl:text>
</xsl:attribute>
@@ -167,7 +168,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'contact phone')"/>
</label>
- <input type="text"
name="contact_phone" value="{vendor/contact_phone}">
+ <input type="text"
name="contact_phone" value="{vendor/contact_phone}" class="pure-input-1-2" >
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -180,7 +181,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'account number')"/>
</label>
- <input type="text"
name="account_number" value="{vendor/account_number}">
+ <input type="text"
name="account_number" value="{vendor/account_number}" class="pure-input-1-2" >
<xsl:attribute
name="data-validation">
<xsl:text>account_number</xsl:text>
</xsl:attribute>
@@ -193,7 +194,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'vendor description')"/>
</label>
- <textarea cols="47"
rows="7" name="description">
+ <textarea cols="47"
rows="7" name="description" class="pure-input-1-2" >
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -204,7 +205,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'remark')"/>
</label>
- <textarea cols="47"
rows="7" name="remark">
+ <textarea cols="47"
rows="7" name="remark" class="pure-input-1-2" >
<xsl:value-of
select="vendor/remark"/>
</textarea>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16645] Stable: Merge 16643:16644 from trunk,
sigurdne <=