--- doc/loncapafiles/loncapafiles.lpml	2012/05/25 18:22:10	1.797.2.7
+++ doc/loncapafiles/loncapafiles.lpml	2012/06/07 12:13:10	1.797.2.12
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.797.2.7 2012/05/25 18:22:10 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.797.2.12 2012/06/07 12:13:10 raeburn Exp $ -->
 
 <!--
 
@@ -907,13 +907,6 @@ are viewable over the world-wide web</de
 </directory>
 <directory dist='default'>
   <protectionlevel>modest_delete</protectionlevel>
-  <targetdir dist='default'>home/httpd/html/res/adm/pages/bookmarkmenu
-  </targetdir>
-  <categoryname>server readonly</categoryname>
-  <description>bookmark user interface code</description>
-</directory>
-<directory dist='default'>
-  <protectionlevel>modest_delete</protectionlevel>
   <targetdir dist='default'>home/httpd/html/res/adm/pages/annotations
   </targetdir>
   <categoryname>server readonly</categoryname>
@@ -2836,6 +2829,8 @@ uploadscores.gif;
 uplusr.gif;
 vbkm.gif;
 verify.gif;
+wishlist.gif;
+wishlist-link.gif;
 iclicker.gif;
 interwrite1.gif;
 interwrite2.gif;
@@ -2982,6 +2977,8 @@ uploadscores.eps;
 uplusr.eps;
 vbkm.eps;
 verify.eps;
+wishlist.eps;
+wishlist-link.eps;
 iclicker.eps;
 interwrite1.eps;
 interwrite2.eps;
@@ -3057,7 +3054,6 @@ Author_Manual_Title_Page.tex;
 Author_Numerical_and_Formula.tex;
 Author_Remote_Control.tex;
 Batch_Creation.tex;
-Bookmarks.tex;
 BridgeTask_About.tex;
 BridgeTask_Conditions.tex;
 BridgeTask_Create.tex;
@@ -3478,6 +3474,7 @@ View_Critical_Messages.tex;
 View_recent_activity.tex;
 What_Is_LON-CAPA.tex;
 Why_LON-CAPA.tex;
+Wishlist.tex;
 </filenames>
 </fileglob>
 <fileglob>
@@ -5376,16 +5373,6 @@ This will take annotations and then plug
 <status>works/unverified</status>
 </file>
 <file>
-<source>loncom/html/res/adm/pages/bookmarkmenu/admbookmarks.pm</source>
-<target dist='default'>home/httpd/lib/perl/Apache/admbookmarks.pm</target>
-<categoryname>handler</categoryname>
-<description>
-This will take bookmarks and get/write/display them for the LON-CAPA user
-interface.
-</description>
-<status>works/unverified</status>
-</file>
-<file>
 <source>rat/lonratsrv.pm</source>
 <target dist='default'>home/httpd/lib/perl/Apache/lonratsrv.pm</target>
 <categoryname>handler</categoryname>
@@ -7525,6 +7512,7 @@ role_hotlist.png;
 self_enroll.png;
 survey_rep.png;
 subdocs.png;
+tolastloc.png;
 uplusr.png;
 </filenames>
 </fileglob>
@@ -7552,6 +7540,7 @@ dump.png;
 edit-copy.png;
 edit-find-replace.png;
 edit-find.png;
+edit-mode-22x22.png;
 edit-redo.png;
 edit-select-all.png;
 edit-undo.png;
@@ -7560,6 +7549,7 @@ emblem-readonly.png;
 emblem-system.png;
 extres.png;
 folder-new.png;
+folder-new-22x22.png;
 format-justify-fill.png;
 fromfile.png;
 groupportfolio.png;
@@ -7569,6 +7559,7 @@ grp_settings.png;
 grp_tools.png;
 ims.png;
 imsexport.png;
+link-new-22x22.png;
 list-add.png;
 log.png;
 mail-message-new.png;
@@ -7588,6 +7579,7 @@ preferences-system-windows.png;
 recover.png;
 remotecontrol.png;
 resversion.png;
+save-22x22.png;
 scoreupfrm.png;
 selfenrl-queue.png;
 sequence.png;
@@ -7599,9 +7591,14 @@ syllabus.png;
 symbs.png;
 system-lock-screen.png;
 system-users.png;
+timer.png;
 uplcrs.png;
 uploadscores.png;
 verify.png;
+view-mode-22x22.png;
+wishlist.png;
+wishlist-link.png;
+wishlist-link-lighter.png;
 </filenames>
 </fileglob>
 <file>
@@ -7738,56 +7735,6 @@ world2.gif
 </filenames>
 </fileglob>
 <fileglob>
-<glob>*.gif</glob>
-<sourcedir>loncom/html/res/adm/pages/bookmarkmenu/</sourcedir>
-<targetdir dist='default'>home/httpd/html/res/adm/pages/bookmarkmenu/
-</targetdir>
-<categoryname>graphic file</categoryname>
-<description>
-icons used for the bookmark portion of the LON-CAPA user interface
-</description>
-<filenames>
-folder_anim.gif;
-folder_close.gif;
-folder_drag.gif;
-folder_new.gif;
-folder_open.gif;
-folder_pointer_closed.gif;
-folder_pointer_opened.gif;
-folder_static.gif;
-folder_trash.gif;
-folder_trash_hover.gif;
-left_bar.gif;
-link.gif;
-link_anim.gif;
-link_drag.gif;
-ll_corner.gif;
-lower_bar.gif;
-lr_corner.gif;
-pix.gif;
-right_bar.gif;
-toolbar_bg.gif;
-ul_corner.gif;
-upper_bar.gif;
-ur_corner.gif
-</filenames>
-</fileglob>
-<fileglob>
-<glob>*.html</glob>
-<sourcedir>loncom/html/res/adm/pages/bookmarkmenu/</sourcedir>
-<targetdir dist='default'>home/httpd/html/res/adm/pages/bookmarkmenu/
-</targetdir>
-<categoryname>interface file</categoryname>
-<description>
-associated with the scheme of displaying bookmarks
-</description>
-<filenames>
-bookmarkmenu_toolbar.html;
-blank.html;
-closechildren.html
-</filenames>
-</fileglob>
-<fileglob>
 <glob>*.*</glob>
 <sourcedir>loncom/html/res/adm/pages/reactionresponse/</sourcedir>
 <targetdir dist='default'>home/httpd/html/res/adm/pages/reactionresponse/</targetdir>
@@ -7804,15 +7751,6 @@ reaction_window.html
 </filenames>
 </fileglob>
 <file>
-<source>loncom/html/res/adm/pages/bookmarkmenu/bookmarklib.js</source>
-<target dist='default'>
-home/httpd/html/res/adm/pages/bookmarkmenu/bookmarklib.js</target>
-<categoryname>interface file</categoryname>
-<description>
-javascript for handling client-side interactions with bookmark interface
-</description>
-</file>
-<file>
 <source dist='default'>loncom/build/CHECKRPMS</source>
 <target dist='default'>usr/local/loncapa/bin/CHECKRPMS</target>
 <categoryname>system script</categoryname>
@@ -8215,6 +8153,24 @@ resources for the duration of an exam.
   </description>
 </file>
 <file>
+<source>loncom/interface/lonwishlist.pm</source>
+<target dist='default'>home/httpd/lib/perl/Apache/lonwishlist.pm</target>
+<categoryname>handler</categoryname>
+<description>
+Utilities to modify the wishlist (add new links and folders,
+edit, move, sort or delete existing links and folders).
+Links from the wishlist can be imported into courses.</description>
+<status>works/unverified</status>
+</file>
+<file>
+<source>loncom/interface/lonwishlistdisplay.pm</source>
+<target dist='default'>home/httpd/lib/perl/Apache/lonwishlistdisplay.pm</target>
+<categoryname>handler</categoryname>
+<description>
+Module for displaying the wishlist.</description>
+<status>works/unverified</status>
+</file>
+<file>
   <source>loncom/automation/Autocreate.pl</source>Autocreate.pl
   <target dist='default'>home/httpd/perl/Autocreate.pl</target>
   <categoryname>script</categoryname>