Index: openacs-4/packages/bookmarks/www/bookmark-add-import.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-import.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bookmarks/www/bookmark-add-import.adp	29 Jun 2004 10:17:48 -0000	1.6
+++ openacs-4/packages/bookmarks/www/bookmark-add-import.adp	23 Jun 2015 16:24:15 -0000	1.7
@@ -2,9 +2,9 @@
 <property name="title">@page_title@</property>
 <property name="context">@context;noquote@</property>
 <include src="bookmark-header">
-<% set hidden_form_vars "<input type=hidden name=return_url value=@return_url@>
-<input type=hidden name=viewed_user_id value=@viewed_user_id@>
-<input type=hidden name=bookmark_id value=@bookmark_id@>" %>
+<% set hidden_form_vars "<input type="hidden" name="return_url" value="@return_url@">
+<input type="hidden" name="viewed_user_id" value="@viewed_user_id@">
+<input type="hidden" name="bookmark_id" value="@bookmark_id@">" %>
 
 <h3>Add one Bookmark</h3>
 Insert the URL below.  If you leave the title blank, we will 
@@ -15,12 +15,12 @@
 
 <table>
 <tr>
-   <td valign=top align=right>URL:</td>
-   <td align=left><input name=complete_url size=70 maxlength=500 value="@complete_url@"></td>
+   <td valign="top" align="right">URL:</td>
+   <td align="left"><input name="complete_url" size="70" maxlength="500" value="@complete_url@"></td>
 </tr>
 <tr>
-   <td valign=top align=right>Title (Optional):</td>
-   <td align=left><input name=local_title size=70 maxlength=500 value="@local_title@"></td>
+   <td valign="top" align="right">Title (Optional):</td>
+   <td align="left"><input name="local_title" size="70" maxlength="500" value="@local_title@"></td>
 </tr>
 
 <tr>
@@ -32,8 +32,8 @@
 <tr>
    <td>
    </td>
-   <td align=left>
-   <input type=submit value="Add">
+   <td align="left">
+   <input type="submit" value="Add">
    </td>
 </tr>
 </table>
@@ -66,8 +66,8 @@
 <p>
 <table>
 <tr>
-<td>Bookmarks File: <input type=file name=upload_file size=10></td>
-<td><input type=submit value="Import file"></td>
+<td>Bookmarks File: <input type="file" name="upload_file" size="10"></td>
+<td><input type="submit" value="Import file"></td>
 </tr>
 </table>
 <p> 
Index: openacs-4/packages/bookmarks/www/bookmark-add-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bookmarks/www/bookmark-add-one.adp	29 Jun 2004 10:17:48 -0000	1.6
+++ openacs-4/packages/bookmarks/www/bookmark-add-one.adp	23 Jun 2015 16:24:15 -0000	1.7
@@ -24,7 +24,7 @@
     <table>
     <tr>
     <td>
-    <input type=submit value="Ok, add the bookmark">
+    <input type="submit" value="Ok, add the bookmark">
     </td>
     </tr>
     </table>
Index: openacs-4/packages/bookmarks/www/bookmark-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-edit.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bookmarks/www/bookmark-edit.adp	29 Jun 2004 10:17:48 -0000	1.6
+++ openacs-4/packages/bookmarks/www/bookmark-edit.adp	23 Jun 2015 16:24:15 -0000	1.7
@@ -5,37 +5,37 @@
 
 <form method=post action=bookmark-edit-2>
 @export_form_vars;noquote@
-<input type="hidden" name=bookmark_id value="@bookmark.bookmark_id@">
+<input type="hidden" name="bookmark_id" value="@bookmark.bookmark_id@">
 <table>
  
 <if @bookmark.folder_p@ eq "f">
 <tr> 
-<td align=right valign=top>URL:</td> 
-<td align=left><input type=text size=40 maxlength=500 name=complete_url value="@bookmark.complete_url@"></td>
+<td align="right" valign="top">URL:</td> 
+<td align="left"><input type="text" size="40" maxlength="500" name="complete_url" value="@bookmark.complete_url@"></td>
 </if>
 
 <tr>
-<td align=right valign=top>Title:</td>
-<td align=left><input type=text maxlength=500 size=40 name=local_title value="@bookmark.local_title@"></td>
+<td align="right" valign="top">Title:</td>
+<td align="left"><input type="text" maxlength="500" size="40" name="local_title" value="@bookmark.local_title@"></td>
 </tr>
 
 <tr>
-  <td align=right valign=top>Parent Folder:</td>
+  <td align="right" valign="top">Parent Folder:</td>
   <td><include src=folder-selection bookmark_id=@bookmark.bookmark_id;noquote@ folder_p="@bookmark.folder_p;noquote@" default_id="@bookmark.parent_id;noquote@" viewed_user_id="@bookmark.owner_id;noquote@"></td>
 </tr>
 
 <tr>
-  <td align=right valign=top>Access Permissions</td>
+  <td align="right" valign="top">Access Permissions</td>
 <if @public_possible_p@ eq "t">
-<td><input type=checkbox name=private_p value="t" <if @old_private_p@ eq "t"> checked</if>> Private (no other registered users have read access <if @folder_bookmark@ eq "folder">to this folder or any of its contained bookmarks and folders</if>)</td>
+<td><input type="checkbox" name="private_p" value="t" <if @old_private_p@ eq "t"> checked</if>> Private (no other registered users have read access <if @folder_bookmark@ eq "folder">to this folder or any of its contained bookmarks and folders</if>)</td>
 </if>
 <else>
 <td>This bookmark is private since it is contained in a private folder. To make this bookmark public you need to make the topmost private folder containing this bookmark public.</td>
 </else>
 </tr>
 
 <td></td>
-<td><input type=submit value="Submit these updates"></td>
+<td><input type="submit" value="Submit these updates"></td>
 
 </table>
 </form>
@@ -45,7 +45,7 @@
 
 <if @delete_p@ eq "t">
 <p>  
-<li><a href="bookmark-delete?bookmark_id=@bookmark.bookmark_id@&viewed_user_id=@viewed_user_id@&return_url=@return_url_urlenc@">Delete this <%= [ad_decode @bookmark.folder_p@ "t" "folder" "bookmark"] %></a>
+<li><a href="bookmark-delete?bookmark_id=@bookmark.bookmark_id@&amp;viewed_user_id=@viewed_user_id@&amp;return_url=@return_url_urlenc@">Delete this <%= [ad_decode @bookmark.folder_p@ "t" "folder" "bookmark"] %></a>
 </li>
 </if>
 
Index: openacs-4/packages/bookmarks/www/bookmark-header.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-header.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmark-header.adp	29 Jun 2004 10:17:48 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmark-header.adp	23 Jun 2015 16:24:15 -0000	1.3
@@ -4,30 +4,30 @@
         <div id="subnavbar-container">
           <div id="subnavbar">
    	   <div class="tab">
-	     <a href=index>My Bookmarks</a>
+	     <a href="index">My Bookmarks</a>
 	   </div>
 	  <if @browsing_user_id@ eq @viewed_user_id@>
    	   <div class="tab">
-	     <a href=bookmarks-export?viewed_user_id=@viewed_user_id@>Export</a>
+	     <a href="bookmarks-export?viewed_user_id=@viewed_user_id@">Export</a>
 	   </div>
 
 	    <if @write_p@ eq "t">
                 <div class="tab">
- 		  <a href=bookmark-add-import?return_url=@return_url_urlenc@&viewed_user_id=@viewed_user_id@>Add / Import</a>	
+ 		  <a href="bookmark-add-import?return_url=@return_url_urlenc@&amp;viewed_user_id=@viewed_user_id@">Add / Import</a>	
                 </div>
 		<div class="tab">
-	          <a href=folder-add?return_url=index&viewed_user_id=@viewed_user_id@>New Folder</a>
+	          <a href="folder-add?return_url=index&amp;viewed_user_id=@viewed_user_id@">New Folder</a>
 		</div>
             </if>
    	    <div class="tab">
-             <a href=bookmarks-check?return_url=index&viewed_user_id=@viewed_user_id@>Check Links</a>
+             <a href="bookmarks-check?return_url=index&amp;viewed_user_id=@viewed_user_id@">Check Links</a>
 	    </div>
 	  </if>
    	    <div class="tab">
  	     <a href="javascript:launch_window('@tree_url@')">Javascript</a>
 	    </div>
    	    <div class="tab">
-	     <a href=bookmarks-user-list>Other users</a> 
+	     <a href="bookmarks-user-list">Other users</a> 
 	    </div>
 	    <if @root_admin_p@ eq "1">
    	     <div class="tab">
Index: openacs-4/packages/bookmarks/www/bookmark-permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-permissions.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bookmarks/www/bookmark-permissions.adp	29 Jun 2004 10:17:48 -0000	1.5
+++ openacs-4/packages/bookmarks/www/bookmark-permissions.adp	23 Jun 2015 16:24:15 -0000	1.6
@@ -4,19 +4,19 @@
 <property name="viewed_user_id">@viewed_user_id;noquote@</property>
 <include src="bookmark-header">
 <form method=post action=bookmark-permissions-2>
-<input type=hidden name=root_folder_id value="@root_folder_id@">
-<input type=hidden name=viewed_user_id value="@viewed_user_id@">
+<input type="hidden" name="root_folder_id" value="@root_folder_id@">
+<input type="hidden" name="viewed_user_id" value="@viewed_user_id@">
 <table>
 
 <tr>
   <th>Default (root) access permissions</th>
-  <td><input type=checkbox name=private_p value="t" <if @old_private_p@ eq "t"> checked</if>> Private (no other registered users have read access to any of your bookmarks)</td>
+  <td><input type="checkbox" name="private_p" value="t" <if @old_private_p@ eq "t"> checked</if>> Private (no other registered users have read access to any of your bookmarks)</td>
 </tr>
 
 </table>
 
 <center>
-<input type=submit value="Update Permissions">
+<input type="submit" value="Update Permissions">
 </center>
 
 </form>
Index: openacs-4/packages/bookmarks/www/folder-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/folder-add.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bookmarks/www/folder-add.adp	29 Jun 2004 10:17:48 -0000	1.5
+++ openacs-4/packages/bookmarks/www/folder-add.adp	23 Jun 2015 16:24:15 -0000	1.6
@@ -5,23 +5,23 @@
 
 
 <form action=folder-add-2 method=post>
-<input type="hidden" name=bookmark_id value="@bookmark_id@">
-<input type="hidden" name=return_url value="@return_url@">
-<input type="hidden" name=viewed_user_id value="@viewed_user_id@">
+<input type="hidden" name="bookmark_id" value="@bookmark_id@">
+<input type="hidden" name="return_url" value="@return_url@">
+<input type="hidden" name="viewed_user_id" value="@viewed_user_id@">
 
 <table>
 <tr>
-  <td valign=top align=right>Input Folder Name:</td>
-  <td><input name=local_title></td>
+  <td valign="top" align="right">Input Folder Name:</td>
+  <td><input name="local_title"></td>
 </tr>
 <tr>
-  <td valign=top align=right>Place in folder:  
-  <img border=0 src=pics/ftv2folderopen align=top></td>
+  <td valign="top" align="right">Place in folder:  
+  <img border="0" src=pics/ftv2folderopen align=top></td>
   <td><include src="folder-selection" bookmark_id="@bookmark_id;noquote@" folder_p="t" default_id="" viewed_user_id=@viewed_user_id;noquote@></td>
 </tr>
 <tr>
   <td></td>
-  <td><input type=submit value=Submit></td>
+  <td><input type="submit" value="Submit"></td>
 </form>
 </tr>
 </table>
Index: openacs-4/packages/bookmarks/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/bookmarks/www/index.adp	18 Apr 2014 06:45:02 -0000	1.15
+++ openacs-4/packages/bookmarks/www/index.adp	23 Jun 2015 16:24:15 -0000	1.16
@@ -17,26 +17,26 @@
 <include src=bookmark-header>
 <if @viewed_user_id@ ne "0">
 <p>
-Sort by: [ <if @sort_by@ eq "access_date"><a href="index?viewed_user_id=@viewed_user_id@&sort_by=name">name</a></if><else><b>name</b></else> | 
-<if @sort_by@ eq "name"><a href="index?viewed_user_id=@viewed_user_id@&sort_by=access_date">access date</a></if><else><b>access date</b></else> 
-<!-- | <a href="index?viewed_user_id=@viewed_user_id@&sort_by=creation_date">creation date</a> --> ]
+Sort by: [ <if @sort_by@ eq "access_date"><a href="index?viewed_user_id=@viewed_user_id@&amp;sort_by=name">name</a></if><else><b>name</b></else> | 
+<if @sort_by@ eq "name"><a href="index?viewed_user_id=@viewed_user_id@&amp;sort_by=access_date">access date</a></if><else><b>access date</b></else> 
+<!-- | <a href="index?viewed_user_id=@viewed_user_id@&amp;sort_by=creation_date">creation date</a> --> ]
 
 </p>
 
 <form action="search" method=post>
 <input type="hidden" name="return_url" value="index">
 <input type="hidden" name="viewed_user_id" value="@viewed_user_id@">
 
-Search bookmarks for: <input name=search_text type=text size=20><input type=submit value=Search>
+Search bookmarks for: <input name="search_text" type="text" size="20"><input type="submit" value="Search">
 </form>
 
 <p>
 
-<table bgcolor=$folder_bgcolor cellpadding=0 cellspacing=0 border=0 width="100%">
+<table bgcolor=$folder_bgcolor cellpadding="0" cellspacing="0" border="0" width="100%">
 <tr>
-<td width="100%"><img border=0 src=pics/ftv2folderopen.gif
+<td width="100%"><img border="0" src=pics/ftv2folderopen.gif
 align=top><b> Bookmarks for @user_name;noquote@ </b> &nbsp; &nbsp;
-<a href=toggle-open-close?action=close_all&viewed_user_id=@viewed_user_id@&sort_by=@sort_by@&browsing_user_id=@browsing_user_id@>Close</a>/<a href=toggle-open-close?action=open_all&viewed_user_id=@viewed_user_id@&sort_by=@sort_by@&browsing_user_id=@browsing_user_id@>Open</a> All Folders</td>
+<a href="toggle-open-close?action=close_all&amp;viewed_user_id=@viewed_user_id@&amp;sort_by=@sort_by@&amp;browsing_user_id=@browsing_user_id@">Close</a>/<a href="toggle-open-close?action=open_all&amp;viewed_user_id=@viewed_user_id@&amp;sort_by=@sort_by@&amp;browsing_user_id=@browsing_user_id@">Open</a> All Folders</td>
 </tr>
 </table>
 
@@ -60,20 +60,20 @@
     set action_bar ""
 
     if { "@bookmark.admin_p@" ne "0" } {
-       lappend action_bar "<a href=bookmark-edit?viewed_user_id=@viewed_user_id@&bookmark_id=@bookmark.bookmark_id@&return_url=@return_url_urlenc@>$edit_anchor</a>"
+       lappend action_bar "<a href="bookmark-edit?viewed_user_id=@viewed_user_id@&amp;bookmark_id=@bookmark.bookmark_id@&amp;return_url=@return_url_urlenc@">$edit_anchor</a>"
     }
     if { "@bookmark.delete_p@" ne "0" } {
-       lappend action_bar "<a href=\"bookmark-delete?bookmark_id=@bookmark.bookmark_id@&return_url=@return_url_urlenc@&viewed_user_id=@viewed_user_id@\">$delete_anchor</a>"
+       lappend action_bar "<a href="\"bookmark-delete?bookmark_id=@bookmark.bookmark_id@&amp;return_url=@return_url_urlenc@&amp;viewed_user_id=@viewed_user_id@\"">$delete_anchor</a>"
     } 
 
     if {@bookmark.folder_p@ == "f"} {
 	set url "bookmark-access?bookmark_id=@bookmark.bookmark_id@&url=[ad_urlencode @bookmark.complete_url;noquote@]"
 	set bgcolor $bookmark_bgcolor
 	set image_url "pics/ftv2doc.gif"
-	lappend action_bar "<a href=\"bookmark-view?bookmark_id=@bookmark.bookmark_id@\"><font size=-1>Details</font></a>"
+	lappend action_bar "<a href="\"bookmark-view?bookmark_id=@bookmark.bookmark_id@\""><font size=-1>Details</font></a>"
     } else {
 	set bgcolor $folder_bgcolor
-	set url "toggle-open-close?bookmark_id=@bookmark.bookmark_id@&viewed_user_id=@viewed_user_id@&sort_by=@sort_by@&browsing_user_id=@browsing_user_id@"
+	set url "toggle-open-close?bookmark_id=@bookmark.bookmark_id@&amp;viewed_user_id=@viewed_user_id@&amp;sort_by=@sort_by@&amp;browsing_user_id=@browsing_user_id@"
 
 	# different image_urls for whether or not the folder is open
 	if {@bookmark.closed_p@ == "t"} {
@@ -90,11 +90,11 @@
 
     %>
 
-    <table bgcolor=@bgcolor@ cellpadding=0 cellspacing=0 border=0 width="100%">
+    <table bgcolor=@bgcolor@ cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
-    <td valign=top><img src="pics/spacer.gif" alt=""  width=<%=[expr {[expr @bookmark.indentation@ - 1] * 24}]%> height=1></td>
+    <td valign="top"><img src="pics/spacer.gif" alt=""  width=<%=[expr {[expr @bookmark.indentation@ - 1] * 24}]%> height=1></td>
 
-    <td><a href="@url@"><img width=24 height=22 border=0 src="<%= $image_url %>" align=top></a></td>
+    <td><a href="@url@"><img width=24 height=22 border="0" src="<%= $image_url %>" align=top></a></td>
     <td width="100%"><a href="@url@">@decoration_open;noquote@@bookmark.bookmark_title;noquote@@decoration_close;noquote@</a> @action_bar;noquote@ @private_text;noquote@</td>
     </tr>
     </table>
Index: openacs-4/packages/bookmarks/www/most-popular.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/most-popular.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/most-popular.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/most-popular.adp	23 Jun 2015 16:24:15 -0000	1.2
@@ -12,7 +12,7 @@
 
 <multiple name="popular_urls">
 
-<li>@popular_urls.n_bookmarks@: <a href=@popular_urls.complete_url@>@popular_urls.local_title@</a></li>
+<li>@popular_urls.n_bookmarks@: <a href="@popular_urls.complete_url@">@popular_urls.local_title@</a></li>
 
 </multiple>
 
Index: openacs-4/packages/bookmarks/www/permissions-reset-all.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/permissions-reset-all.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/permissions-reset-all.adp	22 May 2003 14:21:47 -0000	1.3
+++ openacs-4/packages/bookmarks/www/permissions-reset-all.adp	23 Jun 2015 16:24:15 -0000	1.4
@@ -12,9 +12,9 @@
 </ul>
 
 <form method=post action=permissions-reset-all-2.tcl>
-<input type=hidden name="root_folder_id" value="@root_folder_id@">
-<input type=hidden name="viewed_user_id" value="@viewed_user_id@">
+<input type="hidden" name="root_folder_id" value="@root_folder_id@">
+<input type="hidden" name="viewed_user_id" value="@viewed_user_id@">
 <center>
-<input type=submit value="Yes, Proceed">
+<input type="submit" value="Yes, Proceed">
 </center>
 </form>