[LON-CAPA-cvs] cvs: loncom /homework bridgetask.pm inputtags.pm

[albertel]

albertel		Fri Sep  9 14:45:58 2005 EDT

  Modified files:              
    /loncom/homework	bridgetask.pm inputtags.pm 
  Log:
  - making the subit files box more noticable in BTs
  
  
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.45 loncom/homework/bridgetask.pm:1.46
--- loncom/homework/bridgetask.pm:1.45	Fri Sep  9 14:20:16 2005
+++ loncom/homework/bridgetask.pm	Fri Sep  9 14:45:56 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.45 2005/09/09 18:20:16 albertel Exp $
+# $Id: bridgetask.pm,v 1.46 2005/09/09 18:45:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -462,7 +462,10 @@
 		    $result.="\n".'<table border="1">'.
 			&Apache::inputtags::file_selector("$version.0",
 							  "bridgetask","*",
-							  'portfolioonly').
+							  'portfolioonly',
+							  '
+<h2>'.&mt('Submit Portfolio Files for Grading').'</h2>
+<p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').
 							  "</table>";
 		    $result.=&Apache::inputtags::gradestatus('0');
 		}
@@ -1172,7 +1175,6 @@
     my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
     my $name=&Apache::loncommon::plainname($user,$domain);
     
-    if ($env{'form.proctordomain'}) { $domain=$env{'form.proctordomain'}; }
     my $msg;
     if ($env{'form.proctorpassword'}) {
 	$msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")
@@ -1188,7 +1190,7 @@
 <table>
   <tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></td></tr>
   <tr><td>Password:</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
-  <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$domain" /></td></tr>
+  <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" /></td></tr>
 </table>
 <input type="submit" name="checkoutbutton" value="Validate"  /><br />
 <table border="1">
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.174 loncom/homework/inputtags.pm:1.175
--- loncom/homework/inputtags.pm:1.174	Tue Aug  2 14:15:27 2005
+++ loncom/homework/inputtags.pm	Fri Sep  9 14:45:56 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.174 2005/08/02 18:15:27 albertel Exp $
+# $Id: inputtags.pm,v 1.175 2005/09/09 18:45:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -306,9 +306,10 @@
 # $which -> 'uploadedonly'  -> only newly uploaded files
 #           'portfolioonly' -> only allow files from portfolio
 #           'both' -> allow files from either location
+# $extratext -> additional text to go between the link and the input box
 # returns a table row <tr> 
 sub file_selector {
-    my ($part,$id,$uploadedfiletypes,$which)=@_;
+    my ($part,$id,$uploadedfiletypes,$which,$extratext)=@_;
     if (!$uploadedfiletypes) { return ''; }
 
     my $jspart=$part;
@@ -343,7 +344,7 @@
 	$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
     }
     if ($which eq 'portfolioonly' || $which eq 'both') { 
-	$result.='<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname=HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
+	$result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname=HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
 	    &mt('Select Portfolio Files').'</a><br />'.
 	    '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
 	    '<br />';