diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc index 32eae21b95..f677ed9125 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -40,7 +40,7 @@ //]]> [% END %] - [% IF ( virtualshelves || intranetbookbag ) %] - + [% END %] [% IF LocalCoverImages %] - - + - - + [% END %] - + - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt index 40c34464c4..8e14d0765d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt @@ -3,7 +3,7 @@ [% INCLUDE "doc-head-close.inc" %] - - - + - + [% IF ( OPACAmazonCoverImages ) %] - - + [% END %] [% IF ( SyndeticsCoverImages ) %] - - [% END %] + [% END %] -[% IF ( opacbookbag ) %] - -[% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %][% END %][% ELSE %][% END %] +[% IF ( opacbookbag ) %] +[% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %][% END %][% ELSE %][% END %] [% IF ( GoogleJackets ) %] - - + [% END %] [% IF OpenLibraryCovers %] - - + - + [% END %] -[% IF ( BakerTaylorEnabled ) %] - + - + [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc index 96294a649e..35884afe93 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc @@ -29,7 +29,7 @@ - + [% IF ( OPACAmazonCoverImages ) %] [% END %] [% IF ( SyndeticsCoverImages ) %] - - [% END %] + [% END %] -[% IF ( opacbookbag ) %] - -[% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %][% END %][% ELSE %][% END %] +[% IF ( opacbookbag ) %] +[% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %][% END %][% ELSE %][% END %] [% IF ( GoogleJackets ) %] - - + [% END %] [% IF OpenLibraryCovers %] - - + - + [% END %] -[% IF ( BakerTaylorEnabled ) %] - + - + [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc index 1aea5826a9..970324c957 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc @@ -1,5 +1,4 @@ - -[% IF ( bidi ) %][% ELSE %][% END %] + +[% IF ( bidi ) %][% ELSE %][% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index 1e6b6ce5b5..87e35a629a 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -170,12 +170,12 @@ </div> <div id="breadcrumbs" class="yui-g"> [% IF ( searchdesc ) %]<p>[% IF ( total ) %]<strong>Your search returned [% total |html %] results.</strong> [% IF ( related ) %] (related searches: [% FOREACH relate IN related %][% relate.related_search %][% END %]). [% END %] -<a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&count=[% countrss |html %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a> +<a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&count=[% countrss |html %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> [% ELSE %] <strong>No results found!</strong> <p> [% IF ( searchdesc ) %] - No results found for that in [% LibraryName %] catalog. <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&format=rss2" class="rsssearchlink"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a> + No results found for that in [% LibraryName %] catalog. <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html | url %][% limit_cgi | html | url %]&format=rss2" class="rsssearchlink"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a> [% ELSE %] You did not specify any search criteria. [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt index 5be6ac3696..0dc3fa7284 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt @@ -1,6 +1,6 @@ [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › ISBD view [% INCLUDE 'doc-head-close.inc' %] -<script type="text/JavaScript" language="JavaScript"> +<script type="text/javascript"> //<![CDATA[ YAHOO.util.Event.onContentReady("furtherm", function () { $("#furtherm").css("display","block").css("visibility","hidden"); diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt index bee65c2265..8998cc1627 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt @@ -8,7 +8,9 @@ <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tools.min.js"></script> [% IF ( SocialNetworks ) %] <script type="text/javascript" src="https://apis.google.com/js/plusone.js"> + //<![CDATA[ {lang: '[% lang %]'} + //]]> </script> <script type="text/javascript">!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> [% END %] @@ -16,8 +18,7 @@ <link rel="stylesheet" type="text/css" href="/opac-tmpl/prog/en/css/jquery.rating.css" />[% END %] [% IF ( OpacHighlightedWords ) %]<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.highlight-3.js"></script>[% END %] - -<script type="text/JavaScript" language="JavaScript"> +<script type="text/javascript"> //<![CDATA[ [% IF ( OpacBrowseResults && busc ) %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt index 53ccbbf9e9..5788b38ef8 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt @@ -323,7 +323,7 @@ [% IF ( reserve_in_future ) %] <td class="reserve_date"> <input name="reserve_date_[% bibitemloo.biblionumber %]" id="from" size="10" class="datepickerfrom"/> - <script language="JavaScript" type="text/javascript"> + <script type="text/javascript"> //<![CDATA[ $("#reserve_date_[% bibitemloo.biblionumber %]").attr( 'readonly', 'readonly' ); //]]> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt index bdf499fca9..4198701be1 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt @@ -3,7 +3,7 @@ <style type="text/css"> #custom-doc { width:37.08em;*width:36.16em;min-width:485px; margin:1em auto; text-align:left; } </style> -<script type="text/JavaScript" language="JavaScript"> +<script type="text/javascript"> //<![CDATA[ $(document).ready(function() { var inject_old = function(comment) { diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt index 3bfa668e35..6ef3578ab0 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt @@ -2,7 +2,7 @@ [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your search history [% INCLUDE 'doc-head-close.inc' %] <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> -<script type="text/JavaScript" language="JavaScript"> +<script type="text/javascript"> //<![CDATA[ var MSG_CONFIRM_DELETE_HISTORY = _("Are you sure you want to delete your search history?"); $(document).ready(function() { diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt index cbf7aafdad..3f1b28814f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt @@ -4,7 +4,7 @@ [% INCLUDE 'doc-head-close.inc' %] <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> -<script type="text/JavaScript" language="JavaScript"> +<script type="text/javascript"> //<![CDATA[ $.tablesorter.addParser({ id: 'articles', diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt index b9ef41d7b1..460ce93584 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt @@ -1,7 +1,7 @@ [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Most popular titles [% INCLUDE 'doc-head-close.inc' %] <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> //<![CDATA[ $.tablesorter.addParser({ id: 'articles',