--- loncom/interface/lonevaluate.pm	2006/03/19 22:22:49	1.19
+++ loncom/interface/lonevaluate.pm	2007/11/28 01:41:49	1.23
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Evaluate
 #
-# $Id: lonevaluate.pm,v 1.19 2006/03/19 22:22:49 albertel Exp $
+# $Id: lonevaluate.pm,v 1.23 2007/11/28 01:41:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,8 @@ use Apache::lonnet;
 use Apache::Constants qw(:common);
 use Apache::loncommon();
 use Apache::lonenc();
+use Apache::lonlocal; # must not have ()
+use LONCAPA();
 
 sub handler {
     my $r = shift;
@@ -53,7 +55,7 @@ sub handler {
     my $title=&Apache::lonnet::gettitle($feedurl);
     my $showurl=&Apache::lonenc::check_encrypt($feedurl);
 
-    my ($rdomain,$rauth)=($feedurl=~/^(\w+)\/(\w+)\//);
+    my ($rdomain,$rauth)=($feedurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\//);
 
     my $prefix=$env{'user.name'}.'@'.$env{'user.domain'}.'___'.
 	$feedurl.'___';
@@ -102,7 +104,7 @@ ENDJS
 $start_page
 <h1>Thank you for your input!</h1>
 ENDHEADER
-       $r->print('Storing feedback: '.
+       $r->print('Saving feedback: '.
            &Apache::lonnet::put('nohist_resevaldata',\%currenteval,$rdomain,$rauth));
            unless ($already) {
 	       $r->print('<br />Logging first evaluation');
@@ -133,55 +135,72 @@ ENDHEADER
        }       
     }
 # ------------------------------------------------------- Print out eval screen
-    my $standardoptions=(<<ENDOPTIONS);
+    my %lt=&Apache::lonlocal::texthash('a' => 'Strongly Disagree',
+				       'b' => 'Disagree',
+				       'c' => 'Neutral',
+				       'd' => 'Agree',
+				       'e' => 'Strongly Agree',);
+    my $standardoptions='';
+    $standardoptions = (<<ENDOPTIONS);
 <option value="0">-</option>
-<option value="1">Strongly Disagree</option>
-<option value="2">Disagree</option>
-<option value="3">Neutral</option>
-<option value="4">Agree</option>
-<option value="5">Strongly Agree</option>
+<option value="1">$lt{'a'}</option>
+<option value="2">$lt{'b'}</option>
+<option value="3">$lt{'c'}</option>
+<option value="4">$lt{'d'}</option>
+<option value="5">$lt{'e'}</option>
 ENDOPTIONS
-    
+
     my $start_page = &Apache::loncommon::start_page('Evaluate Resource');
     my $end_page   = &Apache::loncommon::end_page();
+
+     %lt=&Apache::lonlocal::texthash(
+       'pleaserank' => 'Please rank the following criteria:',
+       'correct'    => 'The material appears to be correct',
+       'helpful'    => 'The material is helpful',
+       'depth'      => 'The material is covered with sufficient depth',
+       'clear'      => 'The material is presented in a clear way',
+       'technical'  => 'The resource is technically correct (loads fast enough, does not produce errors, links work, etc)',
+       'comments'   => 'Any comments?',
+       'submit'     => 'Submit Evaluation',
+    );
     $r->print(<<ENDDOCUMENT);
 $start_page
-<tt>$title</tt><br /><br />
+<h2><tt>$title</tt></h2><br /><br />
 <h3><font color="red">$warning</font></h3>
-Please rank the following criteria:
+$lt{'pleaserank'}<br />
 <form method="post" name="evaluation" action="/adm/evaluate">
 <input type="hidden" name="submiteval" value="true" />
 <input type="hidden" name="postdata" value="$showurl" />
-The material appears to be correct
+<hr />
+$lt{'correct'}
 <br /><select name="correct">
 $standardoptions
 </select>
 <hr />
-The material is helpful
+$lt{'helpful'}
 <br /><select name="helpful">
 $standardoptions
 </select>
 <hr />
-The material is covered with sufficient depth
+$lt{'depth'}
 <br /><select name="depth">
 $standardoptions
 </select>
 <hr />
-The material is presented in a clear way
+$lt{'clear'}
 <br /><select name="clear">
 $standardoptions
 </select>
 <hr />
-The resource is technically correct 
-(loads fast enough, does not produce errors, links work, etc) 
+$lt{'technical'}
 <br /><select name="technical">
 $standardoptions
 </select>
 <hr />
-Any comments?
+$lt{'comments'}
 <br /><textarea name="comments" cols="40" rows="5">$oldcomments</textarea>
 <script type="text/javascript">$dialold</script>
-<br /><input type="submit" value="Submit Evaluation" />
+<br /><input type="submit" value="$lt{'submit'}" />
 </form>
 $end_page
 ENDDOCUMENT