--- loncom/interface/groupsort.pm	2007/07/25 23:10:23	1.60
+++ loncom/interface/groupsort.pm	2009/03/13 15:39:43	1.65
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.60 2007/07/25 23:10:23 banghart Exp $
+# $Id: groupsort.pm,v 1.65 2009/03/13 15:39:43 bisitz Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,7 @@ use GDBM_File;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonnet;
-use LONCAPA();
+use LONCAPA;
 
 my $iconpath; # variable to be accessible to multiple subroutines
 my %hash; # variable to tie to user specific database
@@ -206,9 +206,6 @@ sub handler {
  
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 			     ['acts','mode','readfile','recover','bookmarks']);
-    # color scheme
-    my $fileclr = '#ffffe6';
-    my $titleclr = '#ddffff';
 
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
@@ -229,9 +226,9 @@ function finish_import() {
     for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
 	$begincondition
 	opener.document.forms.simpleedit.importdetail.value+='&'+
-              escape(eval("document.forms.groupsort.title"+num+".value"))+'='+
-	      escape(eval("document.forms.groupsort.filelink"+num+".value"))+'='+
-	      escape(eval("document.forms.groupsort.id"+num+".value"));
+              eval("document.forms.groupsort.title"+num+".value")+'='+
+	      eval("document.forms.groupsort.filelink"+num+".value")+'='+
+	      eval("document.forms.groupsort.id"+num+".value");
 	$endcondition
     }
     opener.document.forms.simpleedit.submit();
@@ -317,14 +314,23 @@ END
 		'cs' => 'Continue Search',
 		'fi' => 'Finish Import',
 		're' => 'Recover Checked',
+		'ip' => 'Import Checked',
 		'ca' => 'Cancel',
 		'co' => 'Change Order',
 		'ti' => 'Title',
 		'pa' => 'Path',
                 'in' => 'Include'
 		);
-	my $title = ($env{'form.recover'}) ? 'Recover Removed Resources'
-                                           : 'Sort Imported Resources';
+        my $title = '';
+        if ($env{'form.recover'}) {
+            $title = 'Recover Removed Resources';
+        } else {
+            $title = 'Sort Imported Resources';
+        }
+        if ($env{'form.bookmarks'}) {
+            $title = 'Import Resources from Bookmarks';
+        }
+
 	$r->print(&Apache::loncommon::start_page($title, $js));
 
 	$r->print(<<END);
@@ -341,10 +347,14 @@ END
 
         $r->print(&Apache::loncommon::inhibit_menu_check('input'));
         # ---
-    
-        if ($env{'form.recover'}) {
+
+        my $buttontext = $lt{'re'};
+        if ($env{'form.bookmarks'}) {
+            $buttontext = $lt{'ip'}
+        }
+        if ($env{'form.recover'} || $env{'form.bookmarks'}) {
 	    $r->print(<<END);
-<input type="button" name="alter" value="$lt{'re'}"
+<input type="button" name="alter" value="$buttontext"
  onClick="finish_import()" />&nbsp;
 <input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
 END
@@ -353,7 +363,8 @@ END
 	    my $resurl = 
 		&Apache::loncommon::escape_single(&Apache::loncommon::lastresurl());
 	    $r->print(<<END);
-<b><font color="#888888">$lt{'fin'}</font></b>
+<h2>$lt{'fin'}</h2>
+<div>
 <input type="button" name="alter" value="$lt{'ci'}"
  onClick="window.location='$resurl?inhibitmenu=yes&amp;catalogmode=import'" />&nbsp;
 <input type="button" name="altersearch" value="$lt{'cs'}"
@@ -361,17 +372,30 @@ END
 <input type="button" name="alter" value="$lt{'fi'}"
  onClick="finish_import()" />&nbsp;
 <input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
+</div>
+<br />
 END
         }
-        $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
-	$r->print("<table border=0><tr>\n");
-	if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { 
-	    $r->print("<td bgcolor='$titleclr'><b>$lt{'in'}</b></td>\n");
-	} else { 
-	    $r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'co'}</b></td>\n"); 
-	}
-	$r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'ti'}</b></td>\n");
-	$r->print("<td bgcolor='$titleclr'><b>$lt{'pa'}</b></td></tr>\n");
+
+        # Only display header if content exists
+        if ($clen > 0) {
+            $r->print(&Apache::loncommon::start_data_table()
+                     .&Apache::loncommon::start_data_table_header_row());
+            if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { 
+                $r->print("<th>$lt{'in'}</th>\n");
+            } else { 
+                $r->print('<th colspan="2">'.$lt{'co'}.'</th>'."\n"); 
+            }
+            $r->print('<th colspan="2">'.$lt{'ti'}.'</th>'."\n");
+            $r->print("<th>$lt{'pa'}</th>");
+            $r->print(&Apache::loncommon::end_data_table_header_row()."\n");
+        } else {
+            $r->print('<p class="LC_info">');
+            if ($env{'form.bookmarks'}) {
+                $r->print(&mt('There are no resources in your bookmarks to import.'));
+            }
+            $r->print('</p>');
+        }
     } else {
 	$r->print(&Apache::loncommon::start_page(undef,$js,
 						 {'only_body' => 1}));
@@ -390,7 +414,8 @@ END
 	$ctr++;
 	my $iconname=&Apache::loncommon::icon($resource->{'url'});
 	if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
-	    $r->print("<tr><td bgcolor='$fileclr'>");
+	    $r->print(&Apache::loncommon::start_data_table_row()
+                     ."<td>");
             if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
 		$r->print(&checkbox($ctr-1));
 	    } else {
@@ -402,19 +427,24 @@ END
 	if (($clen > 1)  || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
 	    $r->print("</td>");
             unless (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
-		$r->print("<td bgcolor='$fileclr'>".
+		$r->print("<td>".
 			  &select_box($clen,$ctr).
 			  "</td>");
 	    }
-	    $r->print("<td bgcolor='$fileclr'>");
+	    $r->print("<td>");
 	    $r->print("<img src='$iconname' />");
-	    $r->print("</td><td bgcolor='$fileclr'>");
-	    $r->print($resource->{'title'}.$resource->{'notes'}."</td><td bgcolor='$fileclr'>\n");
-	    $r->print($resource->{'url'}."</td></tr>\n");
+	    $r->print("</td><td>");
+	    $r->print($resource->{'title'}.$resource->{'notes'}."</td><td>\n");
+	    $r->print($resource->{'url'}."</td>"
+                     .&Apache::loncommon::end_data_table_row()
+                     ."\n");
 	} 
     }
     if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
-	$r->print("</table></td></tr></table></form>");
+        if ($clen > 0) {
+            $r->print(&Apache::loncommon::end_data_table());
+        }
+        $r->print('</form>');
     } else {
 	$r->print(<<END);
 <script type="text/javascript">
@@ -431,12 +461,12 @@ END
 # --------------------------------------- Hidden values (returns scalar string)
 sub hidden {
     my ($sel,$title,$filelink,$id) = @_;
-    my $string = '<input type="hidden" name="title'.$sel.'" value="'.$title.
-	'" />';
+    my $string = '<input type="hidden" name="title'.$sel.'" value="'.
+	&escape($title).'" />';
     $filelink=~s|^/ext/|http://|;
     $string .= '<input type="hidden" name="filelink'.$sel.'" value="'.
-	$filelink.'" />';
-    $string .= '<input type="hidden" name="id'.$sel.'" value="'.$id.'" />';
+	&escape($filelink).'" />';
+    $string .= '<input type="hidden" name="id'.$sel.'" value="'.&escape($id).'" />';
     return $string;
 }
 
@@ -489,3 +519,30 @@ sub checkbox {
 1;
 
 __END__
+
+=pod
+
+=head1 NAME
+
+Apache::groupsort.pm
+
+=head1 SYNOPSIS
+
+Implements a second phase of importing
+multiple resources into the RAT. Allows for
+reordering the sequence of resources
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=head1 NOTABLE SUBROUTINES
+
+=over
+
+=item 
+
+=back
+
+=cut
+