[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17174] Stable: Merge 17168:17173 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17174] Stable: Merge 17168:17173 from trunk |
|
Date: |
Fri, 20 Oct 2017 05:20:08 -0400 (EDT) |
Revision: 17174
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17174
Author: sigurdne
Date: 2017-10-20 05:20:08 -0400 (Fri, 20 Oct 2017)
Log Message:
-----------
Stable: Merge 17168:17173 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/bookingfrontend/templates/base/building.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/building_schedule.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/delegate.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/delegate_edit.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/group.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/group_edit.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/organization.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/resource.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/resource_schedule.xsl
branches/Version-2_0-branch/eventplannerfrontend/inc/class.hook_helper.inc.php
branches/Version-2_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
branches/Version-2_0-branch/mobilefrontend/templates/base/config.tpl
branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
branches/Version-2_0-branch/property/inc/class.uirequest.inc.php
branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
branches/Version-2_0-branch/property/templates/base/attributes_form.xsl
branches/Version-2_0-branch/property/templates/base/request.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/bookingfrontend/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-10-20 09:18:20 UTC (rev 17173)
+++ branches/Version-2_0-branch 2017-10-20 09:20:08 UTC (rev 17174)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/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,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167
\ 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,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173
\ No newline at end of property
Index: branches/Version-2_0-branch/bookingfrontend
===================================================================
--- branches/Version-2_0-branch/bookingfrontend 2017-10-20 09:18:20 UTC (rev
17173)
+++ branches/Version-2_0-branch/bookingfrontend 2017-10-20 09:20:08 UTC (rev
17174)
Property changes on: branches/Version-2_0-branch/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/dev-syncromind-2/bookingfrontend:14933-16846
/branches/stavangerkommune/bookingfrontend:9468-12740,12986
-/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046,16101-16130,16144-16212,16297-16305,16307-16314,16316-16318,16385,16387,16393-16395,16399-16402,16586-16588,16603-16608,16734-16739,16752-16755,16785-16788,16796-16802,16835-16836,16846-16847,16908-16909,16946,16948,16988-16999,17126-17132,17134-17143,17152-17157
\ No newline at end of property
+/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046,16101-16130,16144-16212,16297-16305,16307-16314,16316-16318,16385,16387,16393-16395,16399-16402,16586-16588,16603-16608,16734-16739,16752-16755,16785-16788,16796-16802,16835-16836,16846-16847,16908-16909,16946,16948,16988-16999,17126-17132,17134-17143,17152-17157,17169-17173
\ No newline at end of property
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/building.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/building.xsl
2017-10-20 09:18:20 UTC (rev 17173)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/building.xsl
2017-10-20 09:20:08 UTC (rev 17174)
@@ -1,9 +1,12 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
+
<div class="content">
<ul class="pathway">
<li>
- <a
href="index.php?menuaction=bookingfrontend.uisearch.index">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/bookingfrontend/index.php',
'menuaction:bookingfrontend.uisearch.index')"/>
+ </xsl:attribute>
<xsl:value-of
select="php:function('lang', 'Home')" />
</a>
</li>
@@ -14,7 +17,7 @@
</li>
</ul>
- <xsl:for-each select="building">
+ <xsl:for-each select="building">
<xsl:if test="deactivate_calendar=0">
<div>
<button
onclick="window.location.href='{schedule_link}'">
@@ -36,7 +39,7 @@
</dd>
</dl>
</xsl:if>
-
+
<xsl:if
test="normalize-space(homepage) or normalize-space(email) or
normalize-space(phone) or normalize-space(street)">
<h3>
<xsl:value-of
select="php:function('lang', 'Contact information')" />
@@ -61,7 +64,7 @@
</a>
</dd>
</xsl:if>
-
+
<xsl:if
test="email and normalize-space(email)">
<dt>
<xsl:value-of select="php:function('lang', 'Email')" />
@@ -72,7 +75,7 @@
</a>
</dd>
</xsl:if>
-
+
<xsl:if
test="phone and normalize-space(phone)">
<dt>
<xsl:value-of select="php:function('lang', 'Telephone')" />
@@ -81,7 +84,7 @@
<xsl:value-of select="phone"/>
</dd>
</xsl:if>
-
+
<xsl:if
test="street and normalize-space(street)">
<dt>
<xsl:value-of select="php:function('lang', 'Address')" />
@@ -98,7 +101,7 @@
</xsl:if>
</dl>
</xsl:if>
-
+
<h3>
<xsl:value-of
select="php:function('lang', 'Bookable resources')" />
</h3>
@@ -144,7 +147,7 @@
var iurl =
'https://maps.google.com/maps?f=q&source=s_q&hl=no&output=embed&geocode=&q=' +
address;
var linkurl =
'https://maps.google.com/maps?f=q&source=s_q&hl=no&geocode=&q=' + address;
]]>
-
+
var rResources = 'results';
var rBuilding_users = [{n: 'ResultSet'},{n:
'Result'}];
@@ -170,7 +173,7 @@
$("#googlemaplink").attr("href", linkurl);
}
});
-
+
</script>
</xsl:for-each>
</div>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/building_schedule.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/building_schedule.xsl
2017-10-20 09:18:20 UTC (rev 17173)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/building_schedule.xsl
2017-10-20 09:20:08 UTC (rev 17174)
@@ -1,10 +1,13 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
+
<div class="content">
<xsl:if test="backend != 'true'">
<ul class="pathway">
<li>
- <a
href="index.php?menuaction=bookingfrontend.uisearch.index">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/bookingfrontend/index.php',
'menuaction:bookingfrontend.uisearch.index')"/>
+ </xsl:attribute>
<xsl:value-of
select="php:function('lang', 'Home')" />
</a>
</li>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/delegate.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/delegate.xsl
2017-10-20 09:18:20 UTC (rev 17173)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/delegate.xsl
2017-10-20 09:20:08 UTC (rev 17174)
@@ -3,7 +3,10 @@
<div class="content">
<ul class="pathway">
<li>
- <a
href="index.php?menuaction=bookingfrontend.uisearch.index">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/bookingfrontend/index.php',
'menuaction:bookingfrontend.uisearch.index')"/>
+ </xsl:attribute>
<xsl:value-of
select="php:function('lang', 'Home')" />
</a>
</li>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/delegate_edit.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/delegate_edit.xsl
2017-10-20 09:18:20 UTC (rev 17173)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/delegate_edit.xsl
2017-10-20 09:20:08 UTC (rev 17174)
@@ -157,8 +157,7 @@
var endpoint = '<xsl:value-of select="module" />';
<![CDATA[
$(document).ready(function(){
- JqueryPortico.autocompleteHelper(phpGWLink('bookingfrontend/',
{menuaction: endpoint+'.uiorganization.index', phpgw_return_as: 'json'} ),
'field_organization_name', 'field_organization_id', 'organization_container');
-
//JqueryPortico.autocompleteHelper('index.php?menuaction='+endpoint+'.uiorganization.index&phpgw_return_as=json&','field_organization_name',
'field_organization_id','organization_container');
+ JqueryPortico.autocompleteHelper(phpGWLink('bookingfrontend/',
{menuaction: endpoint+'.uiorganization.index'},true ),
'field_organization_name', 'field_organization_id', 'organization_container');
});
]]>
</script>
Modified: branches/Version-2_0-branch/bookingfrontend/templates/base/group.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/group.xsl
2017-10-20 09:18:20 UTC (rev 17173)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/group.xsl
2017-10-20 09:20:08 UTC (rev 17174)
@@ -3,7 +3,10 @@
<div class="content">
<ul class="pathway">
<li>
- <a
href="index.php?menuaction=bookingfrontend.uisearch.index">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/bookingfrontend/index.php',
'menuaction:bookingfrontend.uisearch.index')"/>
+ </xsl:attribute>
<xsl:value-of
select="php:function('lang', 'Home')" />
</a>
</li>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/group_edit.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/group_edit.xsl
2017-10-20 09:18:20 UTC (rev 17173)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/group_edit.xsl
2017-10-20 09:20:08 UTC (rev 17174)
@@ -272,8 +272,7 @@
var endpoint = '<xsl:value-of select="module" />';
<![CDATA[
$(document).ready(function(){
- JqueryPortico.autocompleteHelper(phpGWLink('bookingfrontend/',
{menuaction: endpoint+'.uiorganization.index', phpgw_return_as: 'json'} ),
'field_organization_name', 'field_organization_id', 'organization_container');
-
//JqueryPortico.autocompleteHelper('index.php?menuaction='+endpoint+'.uiorganization.index&phpgw_return_as=json&','field_organization_name',
'field_organization_id','organization_container');
+ JqueryPortico.autocompleteHelper(phpGWLink('bookingfrontend/',
{menuaction: endpoint+'.uiorganization.index'}, true ),
'field_organization_name', 'field_organization_id', 'organization_container');
});
]]>
</script>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/organization.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/organization.xsl
2017-10-20 09:18:20 UTC (rev 17173)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/organization.xsl
2017-10-20 09:20:08 UTC (rev 17174)
@@ -3,7 +3,10 @@
<div class="content">
<ul class="pathway">
<li>
- <a
href="index.php?menuaction=bookingfrontend.uisearch.index">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/bookingfrontend/index.php',
'menuaction:bookingfrontend.uisearch.index')"/>
+ </xsl:attribute>
<xsl:value-of
select="php:function('lang', 'Home')" />
</a>
</li>
@@ -118,10 +121,10 @@
var lang = <xsl:value-of select="php:function('js_lang',
'Name', 'Activity', 'Contact 1', 'Contact 2', 'email','phone', 'active')"/>;
<![CDATA[
- var groupURL =
'index.php?menuaction=bookingfrontend.uigroup.index&sort=name&filter_organization_id='
+ organization_id + '&phpgw_return_as=json&';
- var delegateURL =
'index.php?menuaction=bookingfrontend.uidelegate.index&sort=name&filter_organization_id='
+ organization_id + '&phpgw_return_as=json&filter_active=-1&';
- var buildingURL =
'index.php?menuaction=bookingfrontend.uibuilding.find_buildings_used_by&sort=name&organization_id='
+ organization_id + '&phpgw_return_as=json&';
- ]]>
+ var groupURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uigroup.index', sort:'name',
filter_organization_id: organization_id}, true);
+ var delegateURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uidelegate.index', sort: 'name',
filter_organization_id: organization_id, filter_active:'-1'},true);
+ var buildingURL = phpGWLink('bookingfrontend/index.php',
{menuaction:'bookingfrontend.uibuilding.find_buildings_used_by', sort:'name',
organization_id: organization_id}, true);
+ ]]>
var rBuilding = [{n: 'ResultSet'},{n: 'Result'}];
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/resource.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/resource.xsl
2017-10-20 09:18:20 UTC (rev 17173)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/resource.xsl
2017-10-20 09:20:08 UTC (rev 17174)
@@ -3,8 +3,11 @@
<xsl:for-each select="pathway">
<ul class="pathway">
<li>
- <a
href="index.php?menuaction=bookingfrontend.uisearch.index">
- <xsl:value-of
select="lang_home" />
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/bookingfrontend/index.php',
'menuaction:bookingfrontend.uisearch.index')"/>
+ </xsl:attribute>
+ <xsl:value-of
select="php:function('lang', 'Home')" />
</a>
</li>
<li>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/resource_schedule.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/resource_schedule.xsl
2017-10-20 09:18:20 UTC (rev 17173)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/resource_schedule.xsl
2017-10-20 09:20:08 UTC (rev 17174)
@@ -4,8 +4,11 @@
<xsl:for-each select="pathway">
<ul class="pathway">
<li>
- <a
href="index.php?menuaction=bookingfrontend.uisearch.index">
- <xsl:value-of
select="lang_home" />
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/bookingfrontend/index.php',
'menuaction:bookingfrontend.uisearch.index')"/>
+ </xsl:attribute>
+ <xsl:value-of
select="php:function('lang', 'Home')" />
</a>
</li>
<li>
Modified:
branches/Version-2_0-branch/eventplannerfrontend/inc/class.hook_helper.inc.php
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/inc/class.hook_helper.inc.php
2017-10-20 09:18:20 UTC (rev 17173)
+++
branches/Version-2_0-branch/eventplannerfrontend/inc/class.hook_helper.inc.php
2017-10-20 09:20:08 UTC (rev 17174)
@@ -194,13 +194,13 @@
'menuaction' =>
phpgw::get_var('menuaction')
)
);
- $base = '/eventplannerfrontend/';
+ $base = 'eventplannerfrontend/';
$oArgs = '{menuaction:"' .
phpgw::get_var('menuaction') .'"}';
}
else
{
$action =
$GLOBALS['phpgw']->link('/eventplannerfrontend/home.php');
- $base =
'/eventplannerfrontend/home.php';
+ $base = 'eventplannerfrontend/home.php';
$oArgs = '{}';
}
Modified:
branches/Version-2_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
===================================================================
--- branches/Version-2_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
2017-10-20 09:18:20 UTC (rev 17173)
+++ branches/Version-2_0-branch/mobilefrontend/inc/class.hook_helper.inc.php
2017-10-20 09:20:08 UTC (rev 17174)
@@ -79,6 +79,7 @@
if (!empty($config->config_data['cookie_domain']))
{
$GLOBALS['phpgw_info']['server']['cookie_domain'] =
$config->config_data['cookie_domain'];
- }
+ }
+// $GLOBALS['phpgw_info']['server']['usecookies'] =
$config->config_data['usecookies'];
}
}
\ No newline at end of file
Modified: branches/Version-2_0-branch/mobilefrontend/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/mobilefrontend/templates/base/config.tpl
2017-10-20 09:18:20 UTC (rev 17173)
+++ branches/Version-2_0-branch/mobilefrontend/templates/base/config.tpl
2017-10-20 09:20:08 UTC (rev 17174)
@@ -22,6 +22,15 @@
</select>
</td>
</tr>
+ <tr class="pure-table-odd">
+ <td>{lang_Use_cookies_to_pass_sessionid}:</td>
+ <td>
+ <select name="newsettings[usecookies]">
+ <option value="">{lang_No}</option>
+ <option
value="True"{selected_usecookies_True}>{lang_Yes}</option>
+ </select>
+ </td>
+ </tr>
<tr class="row_off">
<td>{lang_cookie_domain_for_sessions_-_if_Same_as_framework_leave_empty}</td>
<td><input name="newsettings[cookie_domain]"
value="{value_cookie_domain}"></td>
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
2017-10-20 09:18:20 UTC (rev 17173)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
2017-10-20 09:20:08 UTC (rev 17174)
@@ -148,6 +148,7 @@
{
$this->_db =&
$GLOBALS['phpgw']->db;
$use_cookies = false;
+ $GLOBALS['phpgw']->hooks->process('set_cookie_domain',
array('mobilefrontend', 'bookingfrontend', 'activitycalendarfrontend'));
if (
isset($GLOBALS['phpgw_info']['server']['usecookies'])
&&
$GLOBALS['phpgw_info']['server']['usecookies'] == 'True' )
{
@@ -154,8 +155,6 @@
$use_cookies = true;
$this->_sessionid =
phpgw::get_var(session_name(), 'string', 'COOKIE');
-
$GLOBALS['phpgw']->hooks->process('set_cookie_domain', array('mobilefrontend',
'bookingfrontend', 'activitycalendarfrontend'));
-
$this->_phpgw_set_cookie_params();
}
else
@@ -914,12 +913,11 @@
*/
public function read_session($sessionid)
{
-/*
if($sessionid)
{
session_id($sessionid);
}
-*/
+
session_start();
if(!session_id() == $sessionid)
Modified: branches/Version-2_0-branch/property/inc/class.uirequest.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uirequest.inc.php
2017-10-20 09:18:20 UTC (rev 17173)
+++ branches/Version-2_0-branch/property/inc/class.uirequest.inc.php
2017-10-20 09:20:08 UTC (rev 17174)
@@ -1559,7 +1559,7 @@
'lang_cat_statustext' => lang('Select the
category the request belongs to. To do not use a category select NO CATEGORY'),
'value_cat_id' => $values['cat_id'],
'cat_select' =>
$this->cats->formatted_xslt_list(array('select_name' => 'values[cat_id]',
- 'selected' => $values['cat_id'],
'class' => 'required', 'required' => true)),
+ 'selected' => $values['cat_id'],
'class' => 'required pure-input-1-2', 'required' => true)),
'lang_coordinator' =>
isset($this->config->config_data['lang_request_coordinator']) &&
$this->config->config_data['lang_request_coordinator'] ?
$this->config->config_data['lang_request_coordinator'] : lang('request
coordinator'),
'lang_user_statustext' => lang('Select the
coordinator the request belongs to. To do not use a category select NO USER'),
'select_user_name' => 'values[coordinator]',
Modified: branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
2017-10-20 09:18:20 UTC (rev 17173)
+++ branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
2017-10-20 09:20:08 UTC (rev 17174)
@@ -2041,8 +2041,9 @@
$from_name =
$GLOBALS['phpgw']->accounts->get($common_data['workorder']['user_id'])->__toString();
+ $ecodimb = !empty($common_data['workorder']['ecodimb'])
? $common_data['workorder']['ecodimb'] : $project['ecodimb'];
$from = lang('date') . ": {$date}\n";
- $from .= lang('dimb') . ":
{$common_data['workorder']['ecodimb']}\n";
+ $from .= lang('dimb') . ": {$ecodimb}\n";
$from .= lang('from') . ":\n {$from_name}";
$from .= "\n
{$GLOBALS['phpgw']->preferences->data['property']['email']}";
$from .= "\n
{$GLOBALS['phpgw']->preferences->data['property']['cellphone']}";
Modified:
branches/Version-2_0-branch/property/templates/base/attributes_form.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/attributes_form.xsl
2017-10-20 09:18:20 UTC (rev 17173)
+++ branches/Version-2_0-branch/property/templates/base/attributes_form.xsl
2017-10-20 09:20:08 UTC (rev 17174)
@@ -126,7 +126,7 @@
<xsl:call-template
name="choice"/>
</xsl:when>
<xsl:when test="datatype='LB'">
- <select id="id_{name}"
name="values_attribute[{id}][value]" title="{$statustext}">
+ <select id="id_{name}"
name="values_attribute[{id}][value]" title="{$statustext}"
class="pure-input-1-2" >
<xsl:choose>
<xsl:when
test="disabled!=''">
<xsl:attribute name="disabled">
Modified: branches/Version-2_0-branch/property/templates/base/request.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/request.xsl
2017-10-20 09:18:20 UTC (rev 17173)
+++ branches/Version-2_0-branch/property/templates/base/request.xsl
2017-10-20 09:20:08 UTC (rev 17174)
@@ -259,7 +259,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'responsible unit')"/>
</label>
- <select
name="values[responsible_unit]" class="forms" style="width:300px;">
+ <select
name="values[responsible_unit]" class="pure-input-1-2" >
<xsl:attribute
name="title">
<xsl:value-of select="php:function('lang', 'Set responsible unit')"/>
</xsl:attribute>
@@ -273,7 +273,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'request status')"/>
</label>
- <select
name="values[status]" style="width:200px;">
+ <select
name="values[status]" class="pure-input-1-2" >
<xsl:attribute
name="title">
<xsl:value-of select="php:function('lang', 'Set the status of the request')"/>
</xsl:attribute>
@@ -323,7 +323,7 @@
<label>
<xsl:value-of select="lang_power_meter"/>
</label>
- <input
type="text" name="values[power_meter]" value="{value_power_meter}" size="12">
+ <input
type="text" name="values[power_meter]" value="{value_power_meter}" size="12"
class="pure-input-1-2" >
<xsl:attribute name="title">
<xsl:value-of select="lang_power_meter_statustext"/>
</xsl:attribute>
@@ -344,7 +344,7 @@
<label>
<xsl:value-of
select="php:function('lang', 'building part')"/>
</label>
- <select
data-validation="required" name="values[building_part]">
+ <select
data-validation="required" name="values[building_part]" class="pure-input-1-2" >
<xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'select building part')"/>
</xsl:attribute>
@@ -405,7 +405,7 @@
<label>
<xsl:value-of select="php:function('lang', 'Authorities Demands')"/>
</label>
- <select
name="values[authorities_demands]">
+ <select
name="values[authorities_demands]" class="pure-input-1-2" >
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'Is there a demand from the
authorities to correct this condition?')"/>
<xsl:text> + </xsl:text>
@@ -712,7 +712,7 @@
</xsl:attribute>
<xsl:value-of select="php:function('lang', 'condition
degree')"/>
</label>
- <select name="values[condition][{condition_type}][degree]"
class="forms">
+ <select name="values[condition][{condition_type}][degree]"
class="pure-input-1-2" >
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang',
'select value')"/>
</xsl:attribute>
@@ -728,7 +728,7 @@
</xsl:attribute>
<xsl:value-of
select="php:function('lang', 'consequence type')"/>
</label>
- <select
name="values[condition][{condition_type}][condition_type]" class="forms">
+ <select
name="values[condition][{condition_type}][condition_type]"
class="pure-input-1-2" >
<xsl:attribute name="title">
<xsl:value-of
select="php:function('lang', 'select value')"/>
</xsl:attribute>
@@ -744,7 +744,7 @@
</xsl:attribute>
<xsl:value-of select="php:function('lang',
'Consequence')"/>
</label>
- <select name="values[condition][{condition_type}][consequence]"
class="forms">
+ <select name="values[condition][{condition_type}][consequence]"
class="pure-input-1-2" >
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang',
'select value')"/>
</xsl:attribute>
@@ -758,7 +758,7 @@
</xsl:attribute>
<xsl:value-of select="php:function('lang',
'Probability')"/>
</label>
- <select name="values[condition][{condition_type}][probability]"
class="forms">
+ <select name="values[condition][{condition_type}][probability]"
class="pure-input-1-2" >
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang',
'select value')"/>
</xsl:attribute>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17174] Stable: Merge 17168:17173 from trunk,
sigurdne <=