--- loncom/interface/groupsort.pm	2003/10/08 20:33:34	1.21.2.1
+++ loncom/interface/groupsort.pm	2004/07/12 20:42:31	1.29
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.21.2.1 2003/10/08 20:33:34 albertel Exp $
+# $Id: groupsort.pm,v 1.29 2004/07/12 20:42:31 matthew Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,8 @@ use strict;
 use Apache::Constants qw(:common);
 use GDBM_File;
 use Apache::loncommon;
+use Apache::lonlocal;
+use Apache::lonnet;
 
 my %hash; # variable to tie to user specific database
 my $iconpath; # variable to be accessible to multiple subroutines
@@ -61,7 +63,7 @@ sub handler {
     my $fileclr = '#ffffe6';
     my $titleclr = '#ddffff';
 
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
 
@@ -139,7 +141,6 @@ function orderchange(val,newval) {
 </script>
 </head>
 END
-    $r->print(&Apache::loncommon::bodytag('Sort Imported Resources'));
     # read pertinent machine configuration
     my $domain  = $r->dir_config('lonDefDomain');
     $iconpath = $r->dir_config('lonIconsURL') . "/";
@@ -234,7 +235,11 @@ END
 		my $key = $_;
 		$key =~ s/^store_//;
 		$shash{$key} = $hash{'storectr_'.$key};
-		$thash{$key} = $hash{'store_'.$key};
+		if (&Apache::lonnet::gettitle($key) eq '') {
+		    $thash{$key} = $hash{'store_'.$key};
+		} else {
+		    $thash{$key} = &Apache::lonnet::gettitle($key);
+		}
 	    }
 	}
 	if ($ENV{'form.oldval'}) {
@@ -290,8 +295,20 @@ END
     untie %hash;
     my $ctr = 0;
     my $clen = scalar(keys %shash);
-   $r->print(<<END);
-<b><font color="#888888">Finalize order of resources</font></b>
+    if ($clen > 1) {
+	my %lt=&Apache::lonlocal::texthash(
+		'fin'=> 'Finalize order of resources',
+		'gb' => 'Go Back',
+		'ns' => 'New Search',
+		'fi' => 'Finish Import',
+		'ca' => 'Cancel',
+		'co' => 'Change Order',
+		'ti' => 'Title',
+		'pa' => 'Path'
+		);
+	$r->print(&Apache::loncommon::bodytag('Sort Imported Resources'));
+	$r->print(<<END);
+<b><font color="#888888">$lt{'fin'}</font></b>
 <form method='post' action='/adm/groupsort' name='groupsort'
       enctype='application/x-www-form-urlencoded'>
 <input type="hidden" name="fnum" value="$clen" />
@@ -300,58 +317,76 @@ END
 <input type="hidden" name="mode" value="$ENV{'form.mode'}" />
 END
 
-# --- Expand here if "GO BACK" button desired
-    if ($ENV{'form.catalogmode'} eq 'groupimport') {
-	$r->print(<<END);
-<input type="button" name="alter" value="GO BACK"
- onClick="window.location='/res/?catalogmode=groupimport'" />&nbsp;
+        # --- Expand here if "GO BACK" button desired
+        if ($ENV{'form.catalogmode'} eq 'groupimport') {
+            my $resurl = &Apache::loncommon::lastresurl();
+	    $r->print(<<END);
+<input type="button" name="alter" value="$lt{'gb'}"
+ onClick="window.location='$resurl?catalogmode=groupimport'" />&nbsp;
 END
-    }
-    if ($ENV{'form.catalogmode'} eq 'groupsearch') {
-	$r->print(<<END);
-<input type="button" name="alter" value="New Search"
+        }
+	if ($ENV{'form.catalogmode'} eq 'groupsearch') {
+	    $r->print(<<END);
+<input type="button" name="alter" value="$lt{'ns'}"
  onClick="window.location='/adm/searchcat?catalogmode=groupsearch&cleargroupsort=1'" />&nbsp;
 END
-    }
-# ---
+        }
+        # ---
 
-    $r->print(<<END);
-<input type="button" name="alter" value="FINISH IMPORT"
+	$r->print(<<END);
+<input type="button" name="alter" value="$lt{'fi'}"
  onClick="finish_import()" />&nbsp;
-<input type="button" name="alter" value="CANCEL" onClick="self.close()" />
+<input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
 END
-    $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
-    $r->print("<table border=0><tr>\n");
-    $r->print("<td colspan='2' bgcolor='$titleclr'><b>Change order</b></td>".
-	      "\n");
-    $r->print("<td colspan='2' bgcolor='$titleclr'><b>Title</b></td>\n");
-    $r->print("<td bgcolor='$titleclr'><b>Path</b></td></tr>\n");
+        $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
+	$r->print("<table border=0><tr>\n");
+	$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");
+    } else {
+	$r->print(<<END);
+<body>
+<form method='post' action='/adm/groupsort' name='groupsort'
+      enctype='application/x-www-form-urlencoded'>
+<input type="hidden" name="fnum" value="$clen" />
+<input type="hidden" name="oldval" value="" />
+<input type="hidden" name="newval" value="" />
+<input type="hidden" name="mode" value="$ENV{'form.mode'}" />
+END
+    }
     foreach (sort {$shash{$a}<=>$shash{$b}} (keys %shash)) {
 	my $key=$_;
 	$ctr++;
-	my @file_ext = split(/\./,$key);
-	my $curfext = $file_ext[scalar(@file_ext)-1];
-	my $iconname="unknown.gif";
-	my $embstyle = &Apache::loncommon::fileembstyle($curfext);
-	# The unless conditional that follows is a bit of overkill
-	$iconname = $curfext.".gif" unless
-	    (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn');
-	$r->print("<tr><td bgcolor='$fileclr'>");
-	$r->print(&movers($clen,$ctr));
+	my $iconname=&Apache::loncommon::icon($key);
+	if ($clen > 1) {
+	    $r->print("<tr><td bgcolor='$fileclr'>");
+	    $r->print(&movers($clen,$ctr));
+	}
 	$r->print(&hidden($ctr-1,$thash{$key},$key));
-	$r->print("</td><td bgcolor='$fileclr'>");
-	$r->print(&select_box($clen,$ctr));
-	$r->print("</td><td bgcolor='$fileclr'>");
-	$r->print("<img src='$iconpath$iconname'>");
-	$r->print("</td><td bgcolor='$fileclr'>");
-	$r->print("$thash{$key}</td><td bgcolor='$fileclr'>\n");
-	$r->print("$key</td></tr>\n");
-    } 
-    $r->print("</table></td></tr></table></form>");
+	if ($clen > 1) {
+	    $r->print("</td><td bgcolor='$fileclr'>");
+	    $r->print(&select_box($clen,$ctr));
+	    $r->print("</td><td bgcolor='$fileclr'>");
+	    $r->print("<img src='$iconname' />");
+	    $r->print("</td><td bgcolor='$fileclr'>");
+	    $r->print("$thash{$key}</td><td bgcolor='$fileclr'>\n");
+	    $r->print("$key</td></tr>\n");
+	} 
+    }
+    if ($clen > 1) {
+	$r->print("</table></td></tr></table></form>");
+    } else {
+	$r->print(<<END);
+<script type="text/javascript">
+    finish_import();
+</script>
+END
+    }
     $r->print(<<END);
 </body>
 </html>
 END
+
     return OK;
 }