[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14668] include javascript_end
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [14668] include javascript_end |
Date: |
Fri, 22 Jan 2016 12:33:50 +0000 |
Revision: 14668
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14668
Author: sigurdne
Date: 2016-01-22 12:33:38 +0000 (Fri, 22 Jan 2016)
Log Message:
-----------
include javascript_end
Modified Paths:
--------------
branches/dev-syncromind/phpgwapi/templates/activitycalendar/footer.tpl
branches/dev-syncromind/phpgwapi/templates/activitycalendar/navbar.inc.php
branches/dev-syncromind/phpgwapi/templates/bkbooking/footer.tpl
branches/dev-syncromind/phpgwapi/templates/bkbooking/navbar.inc.php
branches/dev-syncromind/phpgwapi/templates/idots/footer.tpl
branches/dev-syncromind/phpgwapi/templates/idsociety/footer.tpl
branches/dev-syncromind/phpgwapi/templates/linux-at-work.de/footer.tpl
branches/dev-syncromind/phpgwapi/templates/mobilefrontend/footer.tpl
branches/dev-syncromind/phpgwapi/templates/mobilefrontend/navbar.inc.php
branches/dev-syncromind/phpgwapi/templates/portico/footer.tpl
branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php
branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php
branches/dev-syncromind/phpgwapi/templates/probusiness/footer.tpl
branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php
branches/dev-syncromind/phpgwapi/templates/simple/footer.tpl
branches/dev-syncromind/phpgwapi/templates/verdilak/footer.tpl
Modified: branches/dev-syncromind/phpgwapi/templates/activitycalendar/footer.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/activitycalendar/footer.tpl
2016-01-21 14:27:35 UTC (rev 14667)
+++ branches/dev-syncromind/phpgwapi/templates/activitycalendar/footer.tpl
2016-01-22 12:33:38 UTC (rev 14668)
@@ -7,4 +7,5 @@
</div>
</body>
+ {javascript_end}
</html>
Modified:
branches/dev-syncromind/phpgwapi/templates/activitycalendar/navbar.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/activitycalendar/navbar.inc.php
2016-01-21 14:27:35 UTC (rev 14667)
+++ branches/dev-syncromind/phpgwapi/templates/activitycalendar/navbar.inc.php
2016-01-22 12:33:38 UTC (rev 14668)
@@ -158,6 +158,7 @@
$var = array
(
'powered_by' => lang('Powered by phpGroupWare
version %1', $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']),
+ 'javascript_end'=>
$GLOBALS['phpgw']->common->get_javascript_end()
);
$GLOBALS['phpgw']->template->set_var($var);
Modified: branches/dev-syncromind/phpgwapi/templates/bkbooking/footer.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/bkbooking/footer.tpl
2016-01-21 14:27:35 UTC (rev 14667)
+++ branches/dev-syncromind/phpgwapi/templates/bkbooking/footer.tpl
2016-01-22 12:33:38 UTC (rev 14668)
@@ -7,4 +7,5 @@
</div>
</body>
+ {javascript_end}
</html>
Modified: branches/dev-syncromind/phpgwapi/templates/bkbooking/navbar.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/bkbooking/navbar.inc.php
2016-01-21 14:27:35 UTC (rev 14667)
+++ branches/dev-syncromind/phpgwapi/templates/bkbooking/navbar.inc.php
2016-01-22 12:33:38 UTC (rev 14668)
@@ -158,6 +158,7 @@
$var = array
(
'powered_by' => lang('Powered by phpGroupWare
version %1', $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']),
+ 'javascript_end'=>
$GLOBALS['phpgw']->common->get_javascript_end()
);
$GLOBALS['phpgw']->template->set_var($var);
Modified: branches/dev-syncromind/phpgwapi/templates/idots/footer.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/idots/footer.tpl 2016-01-21
14:27:35 UTC (rev 14667)
+++ branches/dev-syncromind/phpgwapi/templates/idots/footer.tpl 2016-01-22
12:33:38 UTC (rev 14668)
@@ -2,6 +2,7 @@
</div>
<div id="copyright">{powered_by}</div>
</div>
+ {javascript_end}
</body>
</html>
<!-- END footer.tpl -->
Modified: branches/dev-syncromind/phpgwapi/templates/idsociety/footer.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/idsociety/footer.tpl
2016-01-21 14:27:35 UTC (rev 14667)
+++ branches/dev-syncromind/phpgwapi/templates/idsociety/footer.tpl
2016-01-22 12:33:38 UTC (rev 14668)
@@ -13,4 +13,5 @@
</td>
</tr>
</table>
+{javascript_end}
<!-- END footer -->
Modified: branches/dev-syncromind/phpgwapi/templates/linux-at-work.de/footer.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/linux-at-work.de/footer.tpl
2016-01-21 14:27:35 UTC (rev 14667)
+++ branches/dev-syncromind/phpgwapi/templates/linux-at-work.de/footer.tpl
2016-01-22 12:33:38 UTC (rev 14668)
@@ -1,4 +1,4 @@
<!-- BEGIN footer -->
</div>
-
+{javascript_end}
<!-- END footer -->
Modified: branches/dev-syncromind/phpgwapi/templates/mobilefrontend/footer.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/mobilefrontend/footer.tpl
2016-01-21 14:27:35 UTC (rev 14667)
+++ branches/dev-syncromind/phpgwapi/templates/mobilefrontend/footer.tpl
2016-01-22 12:33:38 UTC (rev 14668)
@@ -7,4 +7,5 @@
</div>
</body>
+ {javascript_end}
</html>
Modified:
branches/dev-syncromind/phpgwapi/templates/mobilefrontend/navbar.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/mobilefrontend/navbar.inc.php
2016-01-21 14:27:35 UTC (rev 14667)
+++ branches/dev-syncromind/phpgwapi/templates/mobilefrontend/navbar.inc.php
2016-01-22 12:33:38 UTC (rev 14668)
@@ -195,6 +195,7 @@
(
'powered_by' => lang('Powered by phpGroupWare
version %1', $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']),
'site_title' =>
"{$GLOBALS['phpgw_info']['server']['site_title']}",
+ 'javascript_end'=>
$GLOBALS['phpgw']->common->get_javascript_end()
);
$GLOBALS['phpgw']->template->set_var($var);
Modified: branches/dev-syncromind/phpgwapi/templates/portico/footer.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/footer.tpl
2016-01-21 14:27:35 UTC (rev 14667)
+++ branches/dev-syncromind/phpgwapi/templates/portico/footer.tpl
2016-01-22 12:33:38 UTC (rev 14668)
@@ -8,5 +8,6 @@
</div>
<div id="popupBox"></div>
<div id="curtain"></div>
+ {javascript_end}
</body>
</html>
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php
2016-01-21 14:27:35 UTC (rev 14667)
+++ branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php
2016-01-22 12:33:38 UTC (rev 14668)
@@ -178,12 +178,11 @@
function parse_footer_end_noframe()
{
- if( isset($GLOBALS['phpgw_info']['flags']['noframework']) )
- {
- }
+ $javascript_end =
$GLOBALS['phpgw']->common->get_javascript_end();
$footer = <<<HTML
</body>
+ {$javascript_end}
</html>
HTML;
echo $footer;
Modified: branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php
2016-01-21 14:27:35 UTC (rev 14667)
+++ branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php
2016-01-22 12:33:38 UTC (rev 14668)
@@ -392,7 +392,8 @@
$var = array
(
'powered_by' => $powered_by,
- 'lang_login' => lang('login')
+ 'lang_login' => lang('login'),
+ 'javascript_end'=>
$GLOBALS['phpgw']->common->get_javascript_end()
);
$GLOBALS['phpgw']->template->set_var($var);
Modified: branches/dev-syncromind/phpgwapi/templates/probusiness/footer.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/probusiness/footer.tpl
2016-01-21 14:27:35 UTC (rev 14667)
+++ branches/dev-syncromind/phpgwapi/templates/probusiness/footer.tpl
2016-01-22 12:33:38 UTC (rev 14668)
@@ -9,5 +9,6 @@
</td>
</tr>
</table>
+{javascript_end}
<!-- END footer -->
Modified: branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php
2016-01-21 14:27:35 UTC (rev 14667)
+++ branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php
2016-01-22 12:33:38 UTC (rev 14668)
@@ -140,13 +140,10 @@
function parse_footer_end_noframe()
{
- if( isset($GLOBALS['phpgw_info']['flags']['noframework']) )
- {
-// echo '</div>';
- }
-
+ $javascript_end =
$GLOBALS['phpgw']->common->get_javascript_end();
$footer = <<<HTML
</body>
+ {$javascript_end}
</html>
HTML;
echo $footer;
Modified: branches/dev-syncromind/phpgwapi/templates/simple/footer.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/simple/footer.tpl
2016-01-21 14:27:35 UTC (rev 14667)
+++ branches/dev-syncromind/phpgwapi/templates/simple/footer.tpl
2016-01-22 12:33:38 UTC (rev 14668)
@@ -8,5 +8,6 @@
</ul>
<br clear="both">
</ul>
+{javascript_end}
<!-- END footer -->
Modified: branches/dev-syncromind/phpgwapi/templates/verdilak/footer.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/verdilak/footer.tpl
2016-01-21 14:27:35 UTC (rev 14667)
+++ branches/dev-syncromind/phpgwapi/templates/verdilak/footer.tpl
2016-01-22 12:33:38 UTC (rev 14668)
@@ -15,4 +15,5 @@
<li>{powered_by}</li>
</ul>
</div>
+{javascript_end}
<!-- END footer -->
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14668] include javascript_end,
Sigurd Nes <=