[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17172] handle url
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17172] handle url |
|
Date: |
Thu, 19 Oct 2017 19:06:03 -0400 (EDT) |
Revision: 17172
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17172
Author: sigurdne
Date: 2017-10-19 19:06:03 -0400 (Thu, 19 Oct 2017)
Log Message:
-----------
handle url
Modified Paths:
--------------
trunk/bookingfrontend/templates/base/building.xsl
trunk/bookingfrontend/templates/base/building_schedule.xsl
trunk/bookingfrontend/templates/base/delegate.xsl
trunk/bookingfrontend/templates/base/delegate_edit.xsl
trunk/bookingfrontend/templates/base/group.xsl
trunk/bookingfrontend/templates/base/group_edit.xsl
trunk/bookingfrontend/templates/base/organization.xsl
trunk/bookingfrontend/templates/base/resource.xsl
trunk/bookingfrontend/templates/base/resource_schedule.xsl
Modified: trunk/bookingfrontend/templates/base/building.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/building.xsl 2017-10-19 19:48:09 UTC
(rev 17171)
+++ trunk/bookingfrontend/templates/base/building.xsl 2017-10-19 23:06:03 UTC
(rev 17172)
@@ -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: trunk/bookingfrontend/templates/base/building_schedule.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/building_schedule.xsl 2017-10-19
19:48:09 UTC (rev 17171)
+++ trunk/bookingfrontend/templates/base/building_schedule.xsl 2017-10-19
23:06:03 UTC (rev 17172)
@@ -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: trunk/bookingfrontend/templates/base/delegate.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/delegate.xsl 2017-10-19 19:48:09 UTC
(rev 17171)
+++ trunk/bookingfrontend/templates/base/delegate.xsl 2017-10-19 23:06:03 UTC
(rev 17172)
@@ -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: trunk/bookingfrontend/templates/base/delegate_edit.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/delegate_edit.xsl 2017-10-19
19:48:09 UTC (rev 17171)
+++ trunk/bookingfrontend/templates/base/delegate_edit.xsl 2017-10-19
23:06:03 UTC (rev 17172)
@@ -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: trunk/bookingfrontend/templates/base/group.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/group.xsl 2017-10-19 19:48:09 UTC
(rev 17171)
+++ trunk/bookingfrontend/templates/base/group.xsl 2017-10-19 23:06:03 UTC
(rev 17172)
@@ -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: trunk/bookingfrontend/templates/base/group_edit.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/group_edit.xsl 2017-10-19 19:48:09 UTC
(rev 17171)
+++ trunk/bookingfrontend/templates/base/group_edit.xsl 2017-10-19 23:06:03 UTC
(rev 17172)
@@ -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: trunk/bookingfrontend/templates/base/organization.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/organization.xsl 2017-10-19
19:48:09 UTC (rev 17171)
+++ trunk/bookingfrontend/templates/base/organization.xsl 2017-10-19
23:06:03 UTC (rev 17172)
@@ -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: trunk/bookingfrontend/templates/base/resource.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/resource.xsl 2017-10-19 19:48:09 UTC
(rev 17171)
+++ trunk/bookingfrontend/templates/base/resource.xsl 2017-10-19 23:06:03 UTC
(rev 17172)
@@ -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: trunk/bookingfrontend/templates/base/resource_schedule.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/resource_schedule.xsl 2017-10-19
19:48:09 UTC (rev 17171)
+++ trunk/bookingfrontend/templates/base/resource_schedule.xsl 2017-10-19
23:06:03 UTC (rev 17172)
@@ -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>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17172] handle url,
sigurdne <=