From c0ecfd0d34e2752a8f1d8db7c7c8ee3d491bd168 Mon Sep 17 00:00:00 2001
From: atz <atz@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 9 Jun 2010 21:43:59 +0000
Subject: [PATCH] </link> is not valid HTML
Although the DTD *may* specify xhtml, since in practice we are serving
with Content-Type: text/html and
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
we should avoid tags that are illegal in html.
These errors are reported in chrome as:
"Unmatched </link> encountered. Ignoring tag."
git-svn-id: svn://svn.open-ils.org/ILS/trunk@16643 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
Open-ILS/web/reports/oils_rpt_common.xhtml | 2 +-
Open-ILS/web/templates/base.tt2 | 6 +++---
.../web/templates/default/circ/selfcheck/main.tt2 | 2 +-
.../default/conify/global/action/survey/edit.tt2 | 20 +++++++++-----------
.../conify/global/asset/copy_location_order.tt2 | 2 +-
Open-ILS/web/templates/default/vandelay/vandelay.tt2 | 6 +++---
6 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/Open-ILS/web/reports/oils_rpt_common.xhtml b/Open-ILS/web/reports/oils_rpt_common.xhtml
index 9666f1f156..1715bd39f1 100644
--- a/Open-ILS/web/reports/oils_rpt_common.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_common.xhtml
@@ -70,7 +70,7 @@
<script type="text/javascript" src="oils_rpt_report_editor.js"></script>
<link type='text/css' rel='stylesheet' href="/opac/common/css/fm_table.css"/>
-<link rel="stylesheet" type="text/css" href="oils_rpt.css"> </link>
+<link rel="stylesheet" type="text/css" href="oils_rpt.css"/>
<script type="text/javascript">function _l(l) { location.href = l + location.search; }</script>
diff --git a/Open-ILS/web/templates/base.tt2 b/Open-ILS/web/templates/base.tt2
index 918bce2031..6bb7874aee 100644
--- a/Open-ILS/web/templates/base.tt2
+++ b/Open-ILS/web/templates/base.tt2
@@ -5,11 +5,11 @@
<html xmlns='http://www.w3.org/1999/xhtml' lang='[% ctx.locale %]' xml:lang='[% ctx.locale %]'>
<head>
<title>[% ctx.page_title %]</title>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<link rel='stylesheet' type='text/css'
- href='[% ctx.media_prefix %]/css/skin/[% ctx.skin %].css'></link>
+ href='[% ctx.media_prefix %]/css/skin/[% ctx.skin %].css' />
<link rel='stylesheet' type='text/css'
- href='[% ctx.media_prefix %]/css/theme/[% ctx.skin %].css'></link>
+ href='[% ctx.media_prefix %]/css/theme/[% ctx.skin %].css' />
<script type="text/javascript" src="[% ctx.media_prefix %]/js/dojo/dojo/dojo.js"
djConfig="parseOnLoad: true, isDebug:false"></script>
<script type="text/javascript" src="[% ctx.media_prefix %]/js/dojo/dojo/openils_dojo.js"></script>
diff --git a/Open-ILS/web/templates/default/circ/selfcheck/main.tt2 b/Open-ILS/web/templates/default/circ/selfcheck/main.tt2
index 7ce03842dd..a887da4a53 100644
--- a/Open-ILS/web/templates/default/circ/selfcheck/main.tt2
+++ b/Open-ILS/web/templates/default/circ/selfcheck/main.tt2
@@ -2,7 +2,7 @@
[% WRAPPER default/base.tt2 %]
<script src='[% ctx.media_prefix %]/js/ui/default/circ/selfcheck/selfcheck.js'> </script>
<script src="[% ctx.media_prefix %]/js/ui/default/circ/selfcheck/payment.js"></script>
-<link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/skin/[% ctx.skin %]/selfcheck.css'></link>
+<link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/skin/[% ctx.skin %]/selfcheck.css'/>
[% INCLUDE 'default/circ/selfcheck/audio_config.tt2' %]
<div id='oils-selfck-top-div'>
diff --git a/Open-ILS/web/templates/default/conify/global/action/survey/edit.tt2 b/Open-ILS/web/templates/default/conify/global/action/survey/edit.tt2
index 40f57a79fc..f7279386f1 100644
--- a/Open-ILS/web/templates/default/conify/global/action/survey/edit.tt2
+++ b/Open-ILS/web/templates/default/conify/global/action/survey/edit.tt2
@@ -1,17 +1,15 @@
[% WRAPPER 'default/base.tt2' %]
-<script src='[% ctx.media_prefix %]/js/ui/default/conify/global/action/survey/edit.js'></script>
- <link rel='stylesheet' type='text/css'
- href='[% ctx.media_prefix %]/css/skin/default/conify.css'></link>
- <link rel='stylesheet' type='text/css'
- href='[% ctx.media_prefix %]/css/theme/default/conify.css'></link>
- <script type="text/javascript">
- dojo.require('openils.Util');
-var surveyId = [%ctx.page_args.0 %];
-openils.Util.addOnLoad(function() { drawSurvey(surveyId) });
-
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/action/survey/edit.js'></script>
+<link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/skin/default/conify.css'/>
+<link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/theme/default/conify.css'/>
+<script type="text/javascript">
+ dojo.require('openils.Util');
+ var surveyId = [%ctx.page_args.0 %];
+ openils.Util.addOnLoad(function() { drawSurvey(surveyId) });
</script>
+
<!-- General survey info -->
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
<div id='edit-pane'> </div>
</div>
diff --git a/Open-ILS/web/templates/default/conify/global/asset/copy_location_order.tt2 b/Open-ILS/web/templates/default/conify/global/asset/copy_location_order.tt2
index fef90880d7..ca574ed229 100644
--- a/Open-ILS/web/templates/default/conify/global/asset/copy_location_order.tt2
+++ b/Open-ILS/web/templates/default/conify/global/asset/copy_location_order.tt2
@@ -1,7 +1,7 @@
[% WRAPPER default/base.tt2 %]
[% ctx.page_title = 'Copy Location Order' %]
<script src='[% ctx.media_prefix %]/js/ui/default/conify/global/asset/copy_location_order.js'> </script>
-<link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/js/dojo/dojo/resources/dnd.css'></link>
+<link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/js/dojo/dojo/resources/dnd.css'/>
<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
<div>Copy Location Order</div>
diff --git a/Open-ILS/web/templates/default/vandelay/vandelay.tt2 b/Open-ILS/web/templates/default/vandelay/vandelay.tt2
index 29bc1d4c94..019245f8c4 100644
--- a/Open-ILS/web/templates/default/vandelay/vandelay.tt2
+++ b/Open-ILS/web/templates/default/vandelay/vandelay.tt2
@@ -2,9 +2,9 @@
[% ctx.page_title = 'MARC Import/Export' %]
[% ctx.dtd = '<!DOCTYPE html SYSTEM "'_ ctx.web_dir _'/opac/locale/' _ ctx.locale _ '/vandelay.dtd">' %]
-<script src='[% ctx.media_prefix %]/js/ui/default/vandelay/vandelay.js'> </script>
-<link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/skin/[% ctx.skin %]/vandelay.css'></link>
-<link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/theme/[% ctx.skin %]/vandelay.css'></link>
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/vandelay/vandelay.js'> </script>
+<link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/skin/[% ctx.skin %]/vandelay.css'/>
+<link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/theme/[% ctx.skin %]/vandelay.css'/>
<div dojoType="dijit.layout.ContentPane" layoutAlign='top' id="vl-nav-bar" style="visibility: hidden;">
[% INCLUDE 'default/vandelay/inc/toolbar.tt2' %]
--
2.11.0