--- loncom/interface/lonevaluate.pm	2009/09/04 16:12:09	1.29
+++ loncom/interface/lonevaluate.pm	2018/04/14 02:29:44	1.31
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Evaluate
 #
-# $Id: lonevaluate.pm,v 1.29 2009/09/04 16:12:09 bisitz Exp $
+# $Id: lonevaluate.pm,v 1.31 2018/04/14 02:29:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -76,6 +76,11 @@ sub handler {
 
     my $warning='';
 
+    my $windowname = 'loncapaclient';
+    if ($env{'request.lti.login'}) {
+        $windowname .= 'lti';
+    }
+
     if ($env{'form.submiteval'} eq 'true') {
 # ------------------------------------------------ User is submitting something
         my $complete=1;
@@ -90,7 +95,7 @@ sub handler {
 	    my $showurl=&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($feedurl));
             my $js = &Apache::lonhtmlcommon::scripttag(<<ENDJS);
     function goback() {
-        if ((window.name=='loncapaclient')) {
+        if ((window.name=='$windowname')) {
             window.location='$showurl';
         } else {
             self.close();
@@ -125,7 +130,7 @@ ENDJS
            );
            return OK;
         } else {
-            $warning=&mt('Please fill out all fields below.');
+            $warning=&mt('Please fill out all required fields below!');
         }
    
     }
@@ -173,6 +178,7 @@ ENDOPTIONS
 
     %lt=&Apache::lonlocal::texthash(
        'pleaserank' => 'Please rank the following criteria:',
+       'required'   => '(All fields marked with * are required.)',
        'correct'    => 'The material appears to be correct',
        'helpful'    => 'The material is helpful',
        'depth'      => 'The material is covered with sufficient depth',
@@ -183,22 +189,32 @@ ENDOPTIONS
     );
     $r->print(
         $start_page
-       .'<h2>'.$title.'</h2>'
-       .'<p class="LC_warning">'.$warning.'</p>'
-       .'<form method="post" name="evaluation" action="/adm/evaluate">'
+       .'<h2>'.$title.'</h2>');
+
+    if ($warning) {
+        $r->print(
+            &Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+            $warning,1)));
+    }
+    $r->print(
+        '<form method="post" name="evaluation" action="/adm/evaluate">'
        .'<input type="hidden" name="submiteval" value="true" />'
        .'<input type="hidden" name="postdata" value="'.$showurl.'" />'
     );
     $r->print(
         &Apache::lonhtmlcommon::start_pick_box()
        .&Apache::lonhtmlcommon::row_headline()
-       .$lt{'pleaserank'}
+       .$lt{'pleaserank'}.'<br />'
+       .'<span class="LC_info">'.$lt{'required'}.'</span>'
        .&Apache::lonhtmlcommon::row_closure()
     );
 
     foreach my $key ('correct', 'helpful', 'depth', 'clear', 'technical') {
         $r->print(
-            &Apache::lonhtmlcommon::row_title($lt{$key})
+            &Apache::lonhtmlcommon::row_title(
+                '<span title="'.&mt('required').'">'.$lt{$key}
+               .' <span class="LC_info">*</span></span>')
            .'<select name="'.$key.'">'
            .$standardoptions
            .'</select>'