projects / contrib / Conifer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 46e2337)
Remove no-longer-necessary DTD override in vandelay
authorBill Erickson <berick@esilibrary.com>
Mon, 12 Sep 2011 13:10:23 +0000 (09:10 -0400)
committerBill Erickson <berick@esilibrary.com>
Mon, 12 Sep 2011 13:10:23 +0000 (09:10 -0400)
Also, since vandelay was the only code using this hacked-in override
option, remove the option from the base template.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Open-ILS/src/templates/base.tt2 patch | blob | history
Open-ILS/src/templates/vandelay/vandelay.tt2 patch | blob | history

diff --git a/Open-ILS/src/templates/base.tt2 b/Open-ILS/src/templates/base.tt2
index 8a7d682..b26a952 100644 (file)
--- a/Open-ILS/src/templates/base.tt2
+++ b/Open-ILS/src/templates/base.tt2
@@ -1,8 +1,4 @@
-[%- ctx.final_dtd = 
-'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' -%]
-[%- IF !ctx.dtd; ctx.dtd = ctx.final_dtd; END -%]
-[% ctx.dtd %]
-<!-- note: after vandelay strings are ported to l('...'), we can remove the DTD conditional -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns='http://www.w3.org/1999/xhtml' lang='[% ctx.locale %]' xml:lang='[% ctx.locale %]'>
     <head>
         <title>[% ctx.page_title %]</title>
diff --git a/Open-ILS/src/templates/vandelay/vandelay.tt2 b/Open-ILS/src/templates/vandelay/vandelay.tt2
index 1775028..6e7c849 100644 (file)
--- a/Open-ILS/src/templates/vandelay/vandelay.tt2
+++ b/Open-ILS/src/templates/vandelay/vandelay.tt2
@@ -1,6 +1,5 @@
 [% WRAPPER 'base.tt2' %]
 [% ctx.page_title = 'MARC Import/Export' %]
-[% ctx.dtd = '<!DOCTYPE html SYSTEM "'_ ctx.web_dir _'/opac/locale/' _ ctx.locale _ '/vandelay.dtd">' %]
 
 <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'/>
Evergreen contribs