[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13311] bookingfrontend: include jquery
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [13311] bookingfrontend: include jquery |
|
Date: |
Fri, 29 May 2015 12:25:17 +0000 |
Revision: 13311
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13311
Author: sigurdne
Date: 2015-05-29 12:25:16 +0000 (Fri, 29 May 2015)
Log Message:
-----------
bookingfrontend: include jquery
Modified Paths:
--------------
trunk/phpgwapi/templates/bkbooking/head.inc.php
trunk/phpgwapi/templates/bkbooking/head.tpl
Modified: trunk/phpgwapi/templates/bkbooking/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/bkbooking/head.inc.php 2015-05-28 21:09:14 UTC
(rev 13310)
+++ trunk/phpgwapi/templates/bkbooking/head.inc.php 2015-05-29 12:25:16 UTC
(rev 13311)
@@ -1,4 +1,5 @@
<?php
+ phpgw::import_class('phpgwapi.jquery');
phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.template_portico');
@@ -44,6 +45,7 @@
$javascripts = array();
+ phpgwapi_jquery::load_widget('core');
phpgwapi_yui::load_widget('dragdrop');
phpgwapi_yui::load_widget('element');
phpgwapi_yui::load_widget('container');
@@ -76,9 +78,10 @@
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
+ // $javascripts[] = "/phpgwapi/js/jquery/js/jquery-1.7.2.min.js";
+
//FIXME: To consider...
/*
- $javascripts[] = "/phpgwapi/js/jquery/js/jquery-1.7.2.min.js";
$javascripts[] = "/phpgwapi/templates/stavanger/js/minid.js";
*/
foreach ( $javascripts as $javascript )
Modified: trunk/phpgwapi/templates/bkbooking/head.tpl
===================================================================
--- trunk/phpgwapi/templates/bkbooking/head.tpl 2015-05-28 21:09:14 UTC (rev
13310)
+++ trunk/phpgwapi/templates/bkbooking/head.tpl 2015-05-29 12:25:16 UTC (rev
13311)
@@ -20,7 +20,6 @@
<script type="text/javascript">
<!--
var strBaseURL = '{str_base_url}';
- {win_on_events}
//-->
</script>
{javascript}
@@ -28,6 +27,12 @@
<script type="text/javascript"
src="{javascript_uri}"></script>
<!-- END javascript -->
+ <script type="text/javascript">
+ <!--
+ {win_on_events}
+ //-->
+ </script>
+
</head>
<body>
<div id="wrapper">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13311] bookingfrontend: include jquery,
Sigurd Nes <=