--- rat/lonpage.pm	2012/11/30 20:48:20	1.99
+++ rat/lonpage.pm	2014/03/08 18:27:39	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.99 2012/11/30 20:48:20 raeburn Exp $
+# $Id: lonpage.pm,v 1.104 2014/03/08 18:27:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,7 @@ use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonnet;
 use Apache::loncommon();
+use Apache::lonhtmlcommon;
 use Apache::lonxml();
 use Apache::lonlocal;
 use Apache::lonmenu;
@@ -264,6 +265,7 @@ ENDEXT
 			      my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
 			      
 			      my $prefix=$_.'_';
+                              my $idprefix= join('_',($mapid,$resid,''));
                               my %posthash=('request.prefix' => $prefix,
 					    'LONCAPA_INTERNAL_no_discussion' => 'true',
 					    'symb' => $symb);
@@ -369,6 +371,8 @@ ENDEXT
                                   }
                                   $output=~
 				      s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;
+                                  $output=~
+                                      s/\<((?:input|select|button|textarea)[^\>]+)id\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 id="$idprefix$2" $3\>/gsi;
                                   if ($nuploads) {
                                       $output=~
                                           s/\<(input[^\>]+name=\"\Q$prefix\EHWFILE[^\>]+)\s*id\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\)]*)\>/\<$1 id="$prefix$2" $3\>/gsi;
@@ -431,6 +435,12 @@ ENDEXT
                           if (($nforms) && ($nuploads)) {
                               $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps);
                           }
+                          if (($nforms) && (&Apache::lonhtmlcommon::htmlareabrowser())) {
+                              my %textarea_args = (
+                                  dragmath => 'math',
+                              );
+                              $allscript .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
+                          }
 # ------------------------------------------------------------------ Start body
 			  $r->print(&Apache::loncommon::start_page(undef,$allscript,
 								   {'force_register' => 1,
@@ -480,7 +490,6 @@ ENDEXT
                           my $avespan=$lcm/($#colcont+1);
                           for ($j=0;$j<=$#colcont;$j++) {
                               my $rid=$colcont[$j];
-
 			      my $metainfo =&get_buttons(\%hash,$rid).'<br />';
 			    unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				$r->print('<td colspan="'.$avespan.'"');
@@ -528,9 +537,15 @@ ENDEXT
                                   $r->print('>'.$metainfo.'<embed src="'.
                                     $hash{'src_'.$rid}.'"></embed>');
                               } elsif (&Apache::lonnet::declutter($hash{'src_'.$rid}) !~/\.(sequence|page)$/) {
-                                  $r->print($metainfo.'<b>'.$hash{'title_'.$rid}.'</b><br />'.
-                                  &mt('It is recommended that you use an up-to-date virus scanner before handling this file.').'</p><p><table>'.
-                                  &Apache::londocs::entryline(0,&mt("Click to download or use your browser's Save Link function"),'/'.&Apache::lonnet::declutter($hash{'src_'.$rid})).'</table></p><br />');
+                                  $r->print($metainfo.'<b>'.$hash{'title_'.$rid}.'</b><br />');
+                                  unless ($cellemb{$rid} eq 'wrp') {
+                                      $r->print(&mt('It is recommended that you use an up-to-date virus scanner before handling this file.'));
+                                  }
+                                  $r->print('</p><p><table>'.
+                                            &Apache::londocs::entryline(0,
+                                                                        &mt("Click to download or use your browser's Save Link function"),
+                                                                        '/'.&Apache::lonnet::declutter($hash{'src_'.$rid})).
+                                                                        '</table></p><br />');
                               }
 			      unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				  $r->print('</td>');
@@ -555,7 +570,7 @@ ENDEXT
 # ---------------------------------------------------------------- Submit, etc.
                       if ($nforms) {
                           $r->print(
-	                  '<input name="all_submit" value="Submit All" type="'.
+	                  '<input name="all_submit" value="'.&mt('Submit All').'" type="'.
 			  (($nforms>1)?'submit':'hidden').'"></input></form>');
                       }
 		      unless (($target eq 'tex') || ($target eq 'tex_answer')) {
@@ -612,7 +627,9 @@ sub get_buttons {
 	    || !$hash->{'encrypted_'.$rid})) { 
 	$metainfo .='<a name="'.&escape($symb).'" />'.
 	    '<a href="'.$hash->{'src_'.$rid}.'.meta'.'" target="LONcatInfo">'.
-	    '<img src="/adm/lonMisc/cat_button.png" class="LC_icon" />'.
+            '<img src="/res/adm/pages/catalog.png" class="LC_icon"'.
+            ' alt="'.&mt('Show Metadata').'"'.
+            ' title="'.&mt('Show Metadata').'" />'.
 	    '</a>';
     }
     if (($hash->{'src_'.$rid} !~ m{^/uploaded/}) &&
@@ -620,7 +637,9 @@ sub get_buttons {
         $metainfo .= '<a href="/adm/evaluate?postdata='.
 	    &escape($esrc).
 	    '" target="LONcatInfo">'.
-	    '<img src="/adm/lonMisc/eval_button.png" class="LC_icon" />'.
+            '<img src="/res/adm/pages/eval.png" class="LC_icon"'.
+            ' alt="'.&mt('Provide my evaluation of this resource').'"'.
+            ' title="'.&mt('Provide my evaluation of this resource').'" />'.
 	    '</a>';
     }
     if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) &&
@@ -631,12 +650,16 @@ sub get_buttons {
 		'<a href="/adm/grades?symb='.&escape($symb).
 #               '&command=submission" target="LONcatInfo">'.
 		'&command=submission">'.
-		'<img src="/adm/lonMisc/subm_button.png" class="LC_icon" />'.
+                '<img src="/adm/lonMisc/subm_button.png" class="LC_icon"'.
+                ' alt="'.&mt('View Submissions for a Student or a Group of Students').'"'.
+                ' title="'.&mt('View Submissions for a Student or a Group of Students').'" />'.
 		'</a>'.
 		'<a href="/adm/grades?symb='.&escape($symb).
 #               '&command=gradingmenu" target="LONcatInfo">'.
 		'&command=gradingmenu">'.
-		'<img src="/adm/lonMisc/pgrd_button.png" class="LC_icon" />'.
+                '<img src="/res/adm/pages/pgrd.png" class="LC_icon"'.
+                ' alt="'.&mt('Content Grades').'"'.
+                ' title="'.&mt('Content Grades').'" />'.
 		'</a>';
 	}
 	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
@@ -644,10 +667,32 @@ sub get_buttons {
 		'<a href="/adm/parmset?symb='.&escape($symb).
 #               '" target="LONcatInfo">'.
 		'" >'.
-		'<img src="/adm/lonMisc/pprm_button.png" class="LC_icon" />'.
+                '<img src="/adm/lonMisc/pprm_button.png" class="LC_icon"'.
+                ' alt="'.&mt('Content Settings').'"'.
+                ' title="'.&mt('Content Settings').'" />'.
 		'</a>';
 	}
     }
+    if (($env{'request.course.id'}) && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $file=&Apache::lonnet::declutter($hash->{'src_'.$rid});
+        my ($cfile,$home,$switchserver,$forceedit,$forceview) =
+            &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,$hash->{'src_'.$rid},$symb);
+        if ($cfile ne '') {
+            my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,
+                                                                 $forceedit,1,$symb,undef,
+                                                                 &escape($env{'form.title'}));
+            if ($jscall) {
+                my $icon = 'pcstr.png';
+                my $label = &mt('Edit');
+                my $title = &mt('Edit this resource');
+                my $pic = '<img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$icon).'"'.
+                          ' class="LC_icon" alt="'.$label.'" title="'.$title.'" />';
+                $metainfo .= '&nbsp;<a href="javascript:'.$jscall.';">'.$pic.'</a>';
+            }
+        }
+    }
     return $metainfo;
 }