From 5b71dbb911616cf05d6ff3af353206cbbde2a4f1 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 12 Dec 2012 12:47:20 -0500 Subject: [PATCH] Bug 9265 - Switch to HTML5 doctype in OPAC and staff client Content-Type: text/plain; charset="utf-8" This patch replaces the XHTML DOCTYPE with an HTML5 one. The HTML5 validator seems to be significantly different than the XHTML one, so I'm seeing lots of new errors. This patch includes corrections for one: Deprecation of the "language" attribute of [% 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 d22cf5f..114a422 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 4f0e540..8eadd4f 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 @@ -31,7 +31,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 1aea582..970324c 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 3f661ad..61e64f6 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 5be6ac3..0dc3fa7 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 1753cce..8c0c231 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,7 +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 8096baf..4ed38fe 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt @@ -318,7 +318,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 5ab225d..072b2fd 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 3bfa668..6ef3578 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 3c62e55..1ac9598 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 b9ef41d..460ce93 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', -- 1.7.9.5