1. Added DOCTYPE to all management screens that needed.

2. Added lang=en to all <html> tags 3. Updated all python source and dtml source files to use the new <dtml-X > synt ax
zopefoundation · Nov 3, 1999 · 36fd085 · 36fd085
1 parent dfdc2a6
commit 36fd085
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 40 deletions.
diff --git a/addZCatalog.dtml b/addZCatalog.dtml
@@ -1,4 +1,5 @@
-<HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<HTML lang="en">
 <HEAD>
 <TITLE>Add Catalog</TITLE>
 </HEAD>

diff --git a/catalogAddRowForm.dtml b/catalogAddRowForm.dtml
@@ -1,9 +1,10 @@
-<HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<HTML lang="en">
 <HEAD>
 <TITLE>View Catalog Records</TITLE>
 </HEAD>
 <BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555">
-<!--#var manage_tabs-->
+<dtml-var manage_tabs>
 
 <form action=".">
 

diff --git a/catalogFind.dtml b/catalogFind.dtml
@@ -1,9 +1,10 @@
-<HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<HTML lang="en">
 <HEAD>
 <TITLE>Advanced Find</TITLE>
 </HEAD>
 <BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555">
-<!--#var manage_tabs-->
+<dtml-var manage_tabs>
 <P>
 Use this form to locate objects to be cataloged.
 <P>
@@ -17,9 +18,9 @@ Use this form to locate objects to be cataloged.
   <TD ALIGN="LEFT" VALIGN="TOP">
   <SELECT NAME="obj_metatypes:list" SIZE="4" MULTIPLE>
   <OPTION VALUE="all" SELECTED> All types
-<!--#in all_meta_types mapping-->
-  <OPTION VALUE="<!--#var name html_quote-->"> <!--#var name-->
-<!--#/in-->
+<dtml-in all_meta_types mapping>
+  <OPTION VALUE="<dtml-var name html_quote>"> <dtml-var name>
+</dtml-in>
   </SELECT>
   </TD>
 </TR>
@@ -70,9 +71,9 @@ Use this form to locate objects to be cataloged.
   </TD>
   <TD ALIGN="LEFT" VALIGN="TOP">
   <SELECT NAME="obj_roles:list" SIZE="3" MULTIPLE>
-<!--#in valid_roles-->
-  <OPTION VALUE="<!--#var sequence-item html_quote-->"> <!--#var sequence-item-->
-<!--#/in-->
+<dtml-in valid_roles>
+  <OPTION VALUE="<dtml-var sequence-item html_quote>"> <dtml-var sequence-item>
+</dtml-in>
   </SELECT>
   </TD>
 </TR>
@@ -83,9 +84,9 @@ Use this form to locate objects to be cataloged.
   </TD>
   <TD ALIGN="LEFT" VALIGN="TOP">
   <SELECT NAME="obj_permission">
-<!--#in permission_settings mapping-->
-  <OPTION VALUE="<!--#var name html_quote-->"> <!--#var name-->
-<!--#/in-->
+<dtml-in permission_settings mapping>
+  <OPTION VALUE="<dtml-var name html_quote>"> <dtml-var name>
+</dtml-in>
   </SELECT>
   </TD>
 </TR>

diff --git a/catalogIndexes.dtml b/catalogIndexes.dtml
@@ -1,9 +1,10 @@
-<HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<HTML lang="en">
 <HEAD>
 <TITLE>View Catalog Records</TITLE>
 </HEAD>
 <BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555">
-<!--#var manage_tabs-->
+<dtml-var manage_tabs>
 
 <p> This list defines what indexes the Catalog will contain.  When
 objects get cataloged, the values of any attributes they may have
@@ -24,14 +25,14 @@ values, such as 'meta_type'.</p>
 that have one or more keywords specified in a search query.</p>
 
 
-<form action="<!--#var URL1-->">
+<form action="<dtml-var URL1>">
 
 <ul>
-<!--#in indexes-->
+<dtml-in indexes>
  <li>
-  <input type="checkbox" name="names:list" value="<!--#var sequence-item html_quote-->">
-<!--#var sequence-item--></li>
-<!--#/in-->
+  <input type="checkbox" name="names:list" value="<dtml-var sequence-item html_quote>">
+<dtml-var sequence-item></li>
+</dtml-in>
 </ul>
 <br>
 <input name="manage_delIndexes:method" type=submit value=" Delete "><br>

diff --git a/catalogSchema.dtml b/catalogSchema.dtml
@@ -1,9 +1,10 @@
-<HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<HTML lang="en">
 <HEAD>
 <TITLE>View Catalog Records</TITLE>
 </HEAD>
 <BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555">
-<!--#var manage_tabs-->
+<dtml-var manage_tabs>
 
 <p>This list defines what per object meta data the Catalog will store.
 When objects get cataloged, the values of any attributes they may have
@@ -22,14 +23,14 @@ content in it's entirety (it is useful in this example to <i>index</i>
 the text contents, which is configured in the <b>Indexes</b> View
 tab).  This way, the summary data may be shown in the search results.</p>
 
-<form action="<!--#var URL1-->">
+<form action="<dtml-var URL1>">
 
 <ul>
-<!--#in schema-->
+<dtml-in schema>
  <li>
-  <input type="checkbox" name="names:list" value="<!--#var sequence-item html_quote-->">
-<!--#var sequence-item--></li>
-<!--#/in-->
+  <input type="checkbox" name="names:list" value="<dtml-var sequence-item html_quote>">
+<dtml-var sequence-item></li>
+</dtml-in>
 </ul>
 <br>
 <input name="manage_delColumns:method" type=submit value=" Delete ">

diff --git a/catalogStatus.dtml b/catalogStatus.dtml
@@ -1,9 +1,10 @@
-<HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<HTML lang="en">
   <HEAD>
     <TITLE>View Catalog Records</TITLE>
   </HEAD>
   <BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555">
-    <!--#var manage_tabs-->
+    <dtml-var manage_tabs>
 
     <p> Subtransactions allow Zope to commit small parts of a
       transaction over a period of time instead of all at once.  For
@@ -47,8 +48,8 @@
       memory.  If this number is higher, the Catalog will index
       quickly but consume much more memory.</p>
 
-      Subtransaction threshold: <input name="threshold:int" value="<!--#var
-      threshold html_quote-->"><br> <input type=submit value=" Change ">
+      Subtransaction threshold: <input name="threshold:int" value="<dtml-var
+      threshold html_quote>"><br> <input type=submit value=" Change ">
 
     </dtml-if>
     </form>
@@ -57,12 +58,12 @@
     <h3>Index Status</h3>
 
     <ul>
-      <!--#in index_objects-->
+      <dtml-in index_objects>
       <li>
-	<!--#var "_.len(_['sequence-item'])"--> 
-	object are indexed in <b><!--#var "_['sequence-item'].id"--></b>
+	<dtml-var "_.len(_['sequence-item'])"> 
+	object are indexed in <b><dtml-var "_['sequence-item'].id"></b>
       </li>
-      <!--#/in-->
+      </dtml-in>
     </ul>
   </BODY>
 </HTML>

diff --git a/catalogView.dtml b/catalogView.dtml
@@ -1,4 +1,5 @@
-<HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<HTML lang="en">
 <HEAD>
 <TITLE>View Catalog Records</TITLE>
 </HEAD>

diff --git a/editCatalogerForm.dtml b/editCatalogerForm.dtml
@@ -1,15 +1,16 @@
-<HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<HTML lang="en">
 <HEAD>
 <TITLE>View Catalog Records</TITLE>
 </HEAD>
 <BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555">
-<!--#var manage_tabs-->
+<dtml-var manage_tabs>
 
 <form action="manage_editCataloger">
 <p>This element controls which Catalog this object will try index and
 unindex itself to.</p>
 Edit default Catalog: 
-<input name="default" value="<!--#var default_catalog html_quote-->"> <br>
+<input name="default" value="<dtml-var default_catalog html_quote>"> <br>
 <input type=submit value=" Change ">
 </form>