[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14150] bookingfrontend: prepare for convert
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14150] bookingfrontend: prepare for convert |
|
Date: |
Sun, 11 Oct 2015 15:26:07 +0000 |
Revision: 14150
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14150
Author: sigurdne
Date: 2015-10-11 15:26:06 +0000 (Sun, 11 Oct 2015)
Log Message:
-----------
bookingfrontend: prepare for convert
Modified Paths:
--------------
branches/dev-syncromind/bookingfrontend/inc/class.uisearch.inc.php
branches/dev-syncromind/bookingfrontend/templates/base/access_denied.xsl
branches/dev-syncromind/bookingfrontend/templates/base/allocation_cancel.xsl
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete.xsl
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete_preview.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_cancel.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_delete.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_delete_preview.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_edit_preview.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_massupdate.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_new.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_new_preview.xsl
branches/dev-syncromind/bookingfrontend/templates/base/building.xsl
branches/dev-syncromind/bookingfrontend/templates/base/building_schedule.xsl
branches/dev-syncromind/bookingfrontend/templates/base/group.xsl
branches/dev-syncromind/bookingfrontend/templates/base/organization.xsl
branches/dev-syncromind/bookingfrontend/templates/base/report_numbers.xsl
branches/dev-syncromind/bookingfrontend/templates/base/resource.xsl
branches/dev-syncromind/bookingfrontend/templates/base/resource_schedule.xsl
branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
branches/dev-syncromind/bookingfrontend/templates/base/system_message.xsl
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uisearch.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uisearch.inc.php
2015-10-11 13:20:36 UTC (rev 14149)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uisearch.inc.php
2015-10-11 15:26:06 UTC (rev 14150)
@@ -11,8 +11,8 @@
function __construct()
{
+ parent::__construct();
$this->bo = CreateObject('bookingfrontend.bosearch');
- parent::__construct();
$old_top = array_pop($this->tmpl_search_path);
array_push($this->tmpl_search_path, PHPGW_SERVER_ROOT .
'/booking/templates/base');
array_push($this->tmpl_search_path, $old_top);
@@ -42,8 +42,14 @@
$params = is_null($search) ? array('baseurl' =>
"{$GLOBALS['phpgw_info']['server']['webserver_url']}", 'frontimage' =>
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/bkbooking/images/newlayout/forsidebilde.jpg",
'frontpagetext' => $frontpagetext) : array('search' => $search);
- self::render_template('search', $params);
+// self::render_template('search', $params);
+ self::render_template_xsl('search', $params);
+
}
+
+ function query()
+ {
+
+ }
-
}
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/access_denied.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/access_denied.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++ branches/dev-syncromind/bookingfrontend/templates/base/access_denied.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<div id="content">
<div class="error"><xsl:value-of select="php:function('lang',
'Access denied')" /></div>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/allocation_cancel.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/allocation_cancel.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++
branches/dev-syncromind/bookingfrontend/templates/base/allocation_cancel.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -5,7 +5,7 @@
<dt class="heading"><xsl:value-of select="php:function('lang', 'Cancel
allocation')"/></dt>
</dl>
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<dl class="form">
<dd><xsl:value-of select="php:function('lang', 'Cancel
Information')"/></dd>
<dd><xsl:value-of select="php:function('lang', 'Cancel
Information2')"/></dd>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -5,7 +5,7 @@
<dt class="heading"><xsl:value-of select="php:function('lang', 'Delete
allocation')"/></dt>
</dl>
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<dl class="form">
<dd><xsl:value-of select="php:function('lang', 'Delete
Information')"/></dd>
<dd><xsl:value-of select="php:function('lang', 'Delete
Information2')"/></dd>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete_preview.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete_preview.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++
branches/dev-syncromind/bookingfrontend/templates/base/allocation_delete_preview.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -5,7 +5,7 @@
<dt class="heading"><xsl:value-of select="php:function('lang', 'Delete
Allocations')"/></dt>
</dl>
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<!-- <xsl:call-template name="xmlsource"/> -->
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_cancel.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_cancel.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_cancel.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -5,7 +5,7 @@
<dt class="heading"><xsl:value-of select="php:function('lang', 'Cancel
bookings')"/></dt>
</dl>
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<dl class="form">
<dd><xsl:value-of select="php:function('lang', 'Booking Cancel
Information')"/></dd>
<dd><xsl:value-of select="php:function('lang', 'Booking Cancel
Information2')"/></dd>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_delete.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_delete.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_delete.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -5,7 +5,7 @@
<dt class="heading"><xsl:value-of select="php:function('lang', 'Delete
Booking')"/></dt>
</dl>
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<dl class="form">
<dd><xsl:value-of select="php:function('lang', 'Booking Delete
Information')"/></dd>
<dd><xsl:value-of select="php:function('lang', 'Booking Delete
Information2')"/></dd>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_delete_preview.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/booking_delete_preview.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++
branches/dev-syncromind/bookingfrontend/templates/base/booking_delete_preview.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -5,7 +5,7 @@
<dt class="heading"><xsl:value-of select="php:function('lang', 'Delete
Booking')"/></dt>
</dl>
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<!-- <xsl:call-template name="xmlsource"/> -->
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -5,7 +5,7 @@
<dt class="heading"><xsl:value-of select="php:function('lang',
'Booking')"/> #<xsl:value-of select="booking/id"/></dt>
</dl>
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<form action="" method="POST">
<input type="hidden" name="season_id"
value="{booking/season_id}"/>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_edit_preview.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/booking_edit_preview.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++
branches/dev-syncromind/bookingfrontend/templates/base/booking_edit_preview.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -5,7 +5,7 @@
<dt class="heading"><xsl:value-of
select="php:function('lang', 'Mass update')"/></dt>
</dl>
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<xsl:choose>
<xsl:when test="step = 2">
<p>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_massupdate.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/booking_massupdate.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++
branches/dev-syncromind/bookingfrontend/templates/base/booking_massupdate.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -5,7 +5,7 @@
<dt class="heading"><xsl:value-of
select="php:function('lang', 'Mass update')"/></dt>
</dl>
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<xsl:choose>
<xsl:when test="step = 2">
<p>
Modified: branches/dev-syncromind/bookingfrontend/templates/base/booking_new.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_new.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_new.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -5,7 +5,7 @@
<dt class="heading"><xsl:value-of select="php:function('lang', 'New
Booking')"/></dt>
</dl>
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<form action="" method="POST">
<input type="hidden" name="season_id"
value="{booking/season_id}"/>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_new_preview.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/booking_new_preview.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++
branches/dev-syncromind/bookingfrontend/templates/base/booking_new_preview.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -5,7 +5,7 @@
<dt class="heading"><xsl:value-of select="php:function('lang', 'New
Booking')"/></dt>
</dl>
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<!-- <xsl:call-template name="xmlsource"/> -->
Modified: branches/dev-syncromind/bookingfrontend/templates/base/building.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/building.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++ branches/dev-syncromind/bookingfrontend/templates/base/building.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<div id="content">
<ul class="pathway">
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/building_schedule.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/building_schedule.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++
branches/dev-syncromind/bookingfrontend/templates/base/building_schedule.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<iframe id="yui-history-iframe"
src="{webserver_url}/phpgwapi/js/yahoo/history/assets/blank.html"
style="position:absolute;top:0; left:0;width:1px;
height:1px;visibility:hidden;"></iframe>
<input id="yui-history-field" type="hidden"/>
Modified: branches/dev-syncromind/bookingfrontend/templates/base/group.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/group.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++ branches/dev-syncromind/bookingfrontend/templates/base/group.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<div id="content">
<ul class="pathway">
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/organization.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/organization.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++ branches/dev-syncromind/bookingfrontend/templates/base/organization.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<div id="content">
<ul class="pathway">
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/report_numbers.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/report_numbers.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++ branches/dev-syncromind/bookingfrontend/templates/base/report_numbers.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -1,7 +1,7 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<div id="content">
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<xsl:if test="step = 1">
<dl class="form">
Modified: branches/dev-syncromind/bookingfrontend/templates/base/resource.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/resource.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++ branches/dev-syncromind/bookingfrontend/templates/base/resource.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<div id="content">
<ul class="pathway">
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/resource_schedule.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/resource_schedule.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++
branches/dev-syncromind/bookingfrontend/templates/base/resource_schedule.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<iframe id="yui-history-iframe"
src="{webserver_url}/phpgwapi/js/yahoo/history/assets/blank.html"
style="position:absolute;top:0; left:0;width:1px;
height:1px;visibility:hidden;"></iframe>
<input id="yui-history-field" type="hidden"/>
Modified: branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++ branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -14,7 +14,7 @@
</xsl:template>
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<div id="content">
<form action="" method="GET" id="search">
<input type="hidden" name="menuaction"
value="bookingfrontend.uisearch.index" />
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/system_message.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/system_message.xsl
2015-10-11 13:20:36 UTC (rev 14149)
+++ branches/dev-syncromind/bookingfrontend/templates/base/system_message.xsl
2015-10-11 15:26:06 UTC (rev 14150)
@@ -13,7 +13,7 @@
</dl>
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<form action="" method="POST">
<dl class="form-col">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14150] bookingfrontend: prepare for convert,
Sigurd Nes <=