[LON-CAPA-cvs] cvs: loncom /html/adm/help/tex Wishlist.tex /interface lonwishlist.pm

[wenzelju]

wenzelju		Tue Aug 17 12:32:59 2010 EDT

  Modified files:              
    /loncom/html/adm/help/tex	Wishlist.tex 
    /loncom/interface	lonwishlist.pm 
  Log:
  lonwishlist.pm:
  - Only submit "move" if a destination-folder was selected.
  Wishlist.tex
  - Corrected some little typos in user-help.
  
  
Index: loncom/html/adm/help/tex/Wishlist.tex
diff -u loncom/html/adm/help/tex/Wishlist.tex:1.1 loncom/html/adm/help/tex/Wishlist.tex:1.2
--- loncom/html/adm/help/tex/Wishlist.tex:1.1	Mon Aug 16 15:14:28 2010
+++ loncom/html/adm/help/tex/Wishlist.tex	Tue Aug 17 12:32:52 2010
@@ -3,14 +3,14 @@
 
 \begin{enumerate}
 \item When viewing a resource, an icon is offered to automatically set a link for this resource to the wishlist. 
-\item A link can be manually set by inserting the required informations.
+\item A link can be manually set by inserting the required information.
 \end{enumerate}
 
-Folders, named by a title, can be used to structure the list. Both links and folder can also be added a note, for example to describe the content. The wishlist offers some functions for a dynamical structure. Therefor it is differentiated between a "'view"'(\includegraphics[width=0.03\paperwidth]{view})- and an "'edit"'(\includegraphics[width=0.03\paperwidth]{edit})-mode. The "'view"'-mode contains the following functions:
+Folders, named by a title, can be used to structure the list. Both links and folder can also be added a note, for example to describe the content. The wishlist offers some functions for a dynamical structure. Therefore it is differentiated between a "'view"'(\includegraphics[width=0.03\paperwidth]{view})- and an "'edit"'(\includegraphics[width=0.03\paperwidth]{edit})-mode. The "'view"'-mode contains the following functions:
 
 \begin{enumerate}
-\item Add a new link (\includegraphics[width=0.03\paperwidth]{add_link}) to the wishlist by manually inserting a title, a path and a optional note. 
-\item Add a new folder (\includegraphics[width=0.03\paperwidth]{add_folder}) to the wishlist by inserting a title and a optional note. 
+\item Add a new link (\includegraphics[width=0.03\paperwidth]{add_link}) to the wishlist by manually inserting a title, a path and an optional note. 
+\item Add a new folder (\includegraphics[width=0.03\paperwidth]{add_folder}) to the wishlist by inserting a title and an optional note. 
 \item View and edit notes (\includegraphics[width=0.03\paperwidth]{note}).
 \item Select links and folders via checkboxes to move them to another folder (\includegraphics[width=0.03\paperwidth]{move}). Moving a folder means moving all content within this folder.
 \item Select links and folders via checkboxes to delete them (\includegraphics[width=0.03\paperwidth]{delete}). Deleting a folder means deleting all content within this folder.
@@ -20,8 +20,8 @@
 The "'edit"'-mode offers the functions:
 
 \begin{enumerate}
-\item Add a new link (\includegraphics[width=0.03\paperwidth]{add_link}) to the wishlist by manually inserting a title, a path and a optional note. 
-\item Add a new folder (\includegraphics[width=0.03\paperwidth]{add_folder}) to the wishlist by inserting a title and a optional note. 
+\item Add a new link (\includegraphics[width=0.03\paperwidth]{add_link}) to the wishlist by manually inserting a title, a path and an optional note. 
+\item Add a new folder (\includegraphics[width=0.03\paperwidth]{add_folder}) to the wishlist by inserting a title and an optional note. 
 \item Edit the titles (and paths) of links and folders via textfields.
 \item View and edit notes (\includegraphics[width=0.03\paperwidth]{note}).
 \item Sorting links and folders within a directory-level using the select-boxes before the title.
Index: loncom/interface/lonwishlist.pm
diff -u loncom/interface/lonwishlist.pm:1.4 loncom/interface/lonwishlist.pm:1.5
--- loncom/interface/lonwishlist.pm:1.4	Mon Aug 16 15:14:37 2010
+++ loncom/interface/lonwishlist.pm	Tue Aug 17 12:32:58 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the wishlist
 #
-# $Id: lonwishlist.pm,v 1.4 2010/08/16 15:14:37 wenzelju Exp $
+# $Id: lonwishlist.pm,v 1.5 2010/08/17 12:32:58 wenzelju Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -637,6 +637,9 @@
         else if (action == 'saveOK') {
             r = linksOK();
         }
+        else if (action == 'move') {
+            r = selectDestinationFolder();
+        }
         document.getElementsByName('list')[0].setAttribute("action", "/adm/wishlist?mode="+mode); 
         if (r) {
             document.getElementsByName('list')[0].submit(); 
@@ -1545,7 +1548,7 @@
                                                    'Now choose the new destination folder.').'</span></p>';
             &wishlistMove(\@childrenRt, $marked);
             $inner .= '<table class="LC_data_table LC_tableOfContent">'.$wishlistHTMLmove.'</table><br/><br/>';
-            $inner .= '<input type="button" value="'.&mt('Move').'" onclick="setFormAction('."'','view'".'); selectDestinationFolder()"/>'.
+            $inner .= '<input type="button" value="'.&mt('Move').'" onclick="setFormAction('."'move','view'".');"/>'.
                       '<input type="button" value="'.&mt('Cancel').'" onclick="go('."'/adm/wishlist'".')"/>';
 
             $wishlistHTMLmove ='<tr id="root" class="LC_odd_row"><td><input type="radio" name="mark" id="radioRoot" value="root" /></td>'.