From d480914ff8f3e0629cd386c6e6363446e2448fb6 Mon Sep 17 00:00:00 2001 From: Shane Hathaway <shane@hathawaymix.org> Date: Wed, 17 Jan 2001 15:12:03 +0000 Subject: [PATCH] Merge from 2_3 branch --- lib/python/App/dtml/manage_page_header.dtml | 3 ++- lib/python/App/dtml/manage_page_style.css.dtml | 2 ++ lib/python/App/dtml/zope_quick_start.dtml | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/python/App/dtml/manage_page_header.dtml b/lib/python/App/dtml/manage_page_header.dtml index 76be35171..82d2b9051 100644 --- a/lib/python/App/dtml/manage_page_header.dtml +++ b/lib/python/App/dtml/manage_page_header.dtml @@ -5,7 +5,8 @@ <title><dtml-if title><dtml-var title></dtml-if></title> <dtml-let ag="REQUEST.get('HTTP_USER_AGENT', '')" is_nav4="ag[:9] == 'Mozilla/4' and _.string.find(ag, 'MSIE') < 0" - use_css="REQUEST.get('zmi_use_css', '1')"> + use_css="REQUEST.get('zmi_use_css', '1')" + zmi_embedded_css="1"> <dtml-if use_css> <dtml-if is_nav4> <style type="text/css"> diff --git a/lib/python/App/dtml/manage_page_style.css.dtml b/lib/python/App/dtml/manage_page_style.css.dtml index ede11201d..a8462a7e7 100644 --- a/lib/python/App/dtml/manage_page_style.css.dtml +++ b/lib/python/App/dtml/manage_page_style.css.dtml @@ -1,4 +1,6 @@ +<dtml-unless zmi_embedded_css> <dtml-call "RESPONSE.setHeader('Content-Type','text/css')"> +</dtml-unless> h1 { font-family: Verdana, Helvetica, sans-serif; font-size: 24pt; diff --git a/lib/python/App/dtml/zope_quick_start.dtml b/lib/python/App/dtml/zope_quick_start.dtml index 7e801c76e..611ad5c32 100644 --- a/lib/python/App/dtml/zope_quick_start.dtml +++ b/lib/python/App/dtml/zope_quick_start.dtml @@ -4,7 +4,8 @@ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"> <title>Zope QuickStart</title> <dtml-let ag="REQUEST.get('HTTP_USER_AGENT', '')" - is_nav4="ag[:9] == 'Mozilla/4' and _.string.find(ag, 'MSIE') < 0"> + is_nav4="ag[:9] == 'Mozilla/4' and _.string.find(ag, 'MSIE') < 0" + zmi_embedded_css="1"> <dtml-if is_nav4> <style type="text/css"> <!-- -- 2.30.9