Bug 532990 - Fix jsps to declare correct doctype
All contain framesets so all other doctypes (some even conditional on
browser type?) are irrelevant.
Fix warning about improper comments while at it.
Change-Id: I3ca73fb83a8aa2a917ac6b278d471f0d0c397270
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/org.eclipse.help.webapp/advanced/fheader.jsp b/org.eclipse.help.webapp/advanced/fheader.jsp
index 5cc214f..9edfcc0 100644
--- a/org.eclipse.help.webapp/advanced/fheader.jsp
+++ b/org.eclipse.help.webapp/advanced/fheader.jsp
@@ -1,5 +1,5 @@
<%--
- Copyright (c) 2000, 2009 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -15,14 +15,9 @@
request.setCharacterEncoding("UTF-8");
boolean isRTL = UrlUtil.isRTL(request, response);
String direction = isRTL?"rtl":"ltr";
-if (new RequestData(application,request, response).isMozilla()) {
-%><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<%
-} else {
-%><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN">
-<%
-}
-%><!------------------------------------------------------------------------------
+%>
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<!--
! Copyright (c) 2000, 2007 IBM Corporation and others.
! All rights reserved. This program and the accompanying materials
! are made available under the terms of the Eclipse Public License v1.0
@@ -31,4 +26,4 @@
!
! Contributors:
! IBM Corporation - initial API and implementation
- ------------------------------------------------------------------------------->
\ No newline at end of file
+ -->
\ No newline at end of file
diff --git a/org.eclipse.help.webapp/advanced/header.jsp b/org.eclipse.help.webapp/advanced/header.jsp
index 8e435a7..0b9346c 100644
--- a/org.eclipse.help.webapp/advanced/header.jsp
+++ b/org.eclipse.help.webapp/advanced/header.jsp
@@ -1,5 +1,5 @@
<%--
- Copyright (c) 2000, 2009 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -15,15 +15,10 @@
request.setCharacterEncoding("UTF-8");
boolean isRTL = UrlUtil.isRTL(request, response);
String direction = isRTL?"rtl":"ltr";
-if (new RequestData(application,request, response).isMozilla()) {
-%><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<%
-} else {
-%><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%
-}
-%><!------------------------------------------------------------------------------
- ! Copyright (c) 2000, 2007 IBM Corporation and others.
+%>
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<!--
+ ! Copyright (c) 2000, 2018 IBM Corporation and others.
! All rights reserved. This program and the accompanying materials
! are made available under the terms of the Eclipse Public License v1.0
! which accompanies this distribution, and is available at
@@ -31,4 +26,4 @@
!
! Contributors:
! IBM Corporation - initial API and implementation
- ------------------------------------------------------------------------------->
\ No newline at end of file
+ -->
\ No newline at end of file
diff --git a/org.eclipse.help.webapp/basic/header.jsp b/org.eclipse.help.webapp/basic/header.jsp
index 307b69c..5eb481e 100644
--- a/org.eclipse.help.webapp/basic/header.jsp
+++ b/org.eclipse.help.webapp/basic/header.jsp
@@ -1,5 +1,5 @@
<%--
- Copyright (c) 2000, 2009 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -17,9 +17,9 @@
String direction = isRTL?"rtl":"ltr";
%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!------------------------------------------------------------------------------
- ! Copyright (c) 2000, 2004 IBM Corporation and others.
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<!--
+ ! Copyright (c) 2000, 2018 IBM Corporation and others.
! All rights reserved. This program and the accompanying materials
! are made available under the terms of the Eclipse Public License v1.0
! which accompanies this distribution, and is available at
@@ -27,5 +27,5 @@
!
! Contributors:
! IBM Corporation - initial API and implementation
- ------------------------------------------------------------------------------->
+ -->
