Bug 17859 - Move JavaScript to the footer on about and auth pages

This patch modifies the about page and the login page templates so that
JavaScript is included in the footer instead of the header.

To test, apply the patch and test each page to confirm that
JavaScript-based interactions are unaffected:

- On the About page tabs and header menu dropdowns should work correctly

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Owen Leonard 2017-01-06 16:12:25 +00:00 committed by Kyle M Hall
parent b9cf724e98
commit dc915ce1f7
2 changed files with 21 additions and 16 deletions

View file

@ -1,14 +1,7 @@
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; About Koha</title>
[% INCLUDE 'doc-head-close.inc' %]
<script type="text/javascript">
//<![CDATA[
$(document).ready(function() {
$('#abouttabs').tabs();
});
//]]>
</script>
</head>
<body id="about_about" class="about">
[% INCLUDE 'header.inc' %]
@ -896,4 +889,13 @@
</div>
</div></div></div>
[% MACRO jsinclude BLOCK %]
<script type="text/javascript">
$(document).ready(function() {
$('#abouttabs').tabs();
});
</script>
[% END %]
<!-- the main div is closed in intranet-bottom.inc -->
[% INCLUDE 'intranet-bottom.inc' %]

View file

@ -1,4 +1,5 @@
[% USE Branches %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo;
[% IF ( nopermission ) %]Access denied[% END %]
@ -103,12 +104,14 @@
</div>
</div>
<script>
$(document).ready( function() {
if ( document.location.hash ) {
$( '#loginform' ).append( '<input name="auth_forwarded_hash" type="hidden" value="' + document.location.hash + '"/>' );
}
} );
</script>
[% MACRO jsinclude BLOCK %]
<script type="text/javascript">
$(document).ready( function() {
if ( document.location.hash ) {
$( '#loginform' ).append( '<input name="auth_forwarded_hash" type="hidden" value="' + document.location.hash + '"/>' );
}
});
</script>
[% END %]
<!-- the main div is closed in intranet-bottom.inc -->
[% INCLUDE 'intranet-bottom.inc' %]