Index: openacs-4/packages/bookmarks/www/folder-selection.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/folder-selection.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/folder-selection.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/folder-selection.adp	3 Oct 2003 10:52:32 -0000	1.2
@@ -16,8 +16,8 @@
     </multiple>
 
     <% 
-       if {@folders:rowcount@ > 8} { 
-	  set size_count 8
+       if {@folders:rowcount@ > 20} { 
+	  set size_count 20
        } else {
 	  set size_count [expr @folders:rowcount@ + 1]
        }
Index: openacs-4/packages/bookmarks/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/bookmarks/www/index.adp	22 Sep 2003 16:21:36 -0000	1.8
+++ openacs-4/packages/bookmarks/www/index.adp	3 Oct 2003 10:52:32 -0000	1.9
@@ -40,6 +40,13 @@
 
 </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>
+</form>
+
 <p>
 
 <table bgcolor=$folder_bgcolor cellpadding=0 cellspacing=0 border=0 width="100%">
@@ -119,13 +126,6 @@
     </else>
 </if>
 
-<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>
-</form>
-
 <p>
 Key to bookmark display:
 <table>
Index: openacs-4/packages/bookmarks/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/search.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bookmarks/www/search.adp	22 Sep 2003 12:07:35 -0000	1.5
+++ openacs-4/packages/bookmarks/www/search.adp	3 Oct 2003 10:52:32 -0000	1.6
@@ -26,7 +26,7 @@
 <p>
 <multiple name="others_list">
 
-@img_html;noquote@ <a target=target_frame href="@others_list.complete_url@">@others_list.title@</a> <if @admin_p@ eq "t"> &nbsp; &nbsp; <a href=bookmark-edit?bookmark_id=@others_list.bookmark_id@&viewed_user_id=@viewed_user_id@>@edit_tag@</a></if> <br>
+@img_html;noquote@ <a target=target_frame href="@others_list.complete_url@">@others_list.title@</a> <if @admin_p@ eq "t"> &nbsp; &nbsp; <a href=bookmark-edit?bookmark_id=@others_list.bookmark_id@&viewed_user_id=@viewed_user_id@&return_url=index>@edit_tag@</a></if> <br>
 
 </multiple>
 </if>
@@ -41,8 +41,3 @@
 Search bookmarks for: <input name=search_text type=text size=20 value="@search_text@">
 	<input type=submit value=Search>
 </form>
-
-
-
-
-