[LON-CAPA-cvs] cvs: loncom /interface lonfeedback.pm

[bisitz]

bisitz		Fri Jan 18 13:22:26 2013 EDT

  Modified files:              
    /loncom/interface	lonfeedback.pm 
  Log:
  Improved and corrected screen layout for feedback about discussion setting changes:
  - Corrected screen layout: No overlapping elements anymore
  - Consistent layout: confirmwrapper and actionbox
  
  
  
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.363 loncom/interface/lonfeedback.pm:1.364
--- loncom/interface/lonfeedback.pm:1.363	Thu Jan  3 20:51:23 2013
+++ loncom/interface/lonfeedback.pm	Fri Jan 18 13:22:26 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.363 2013/01/03 20:51:23 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.364 2013/01/18 13:22:26 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4423,6 +4423,7 @@
                                                 $cdom,$cnum);
           $contrib{'deleted'} =~ s/^\.//;
           $contrib{'deleted'} =~ s/\.$//;
+          my $confirm_msg = '';
           if ($contrib{'deleted'} ne '') {
               if (&Apache::lonnet::store({'deleted' => ''},$symb,$env{'request.course.id'},
                                           $cdom,$cnum) eq 'ok') {
@@ -4450,14 +4451,19 @@
                                             $uname,$udom,$env{'request.course.id'},
                                             'undelete');
                   }
-                  $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("Undeleted all entries")));
+                  $confirm_msg .= &Apache::lonhtmlcommon::confirm_success(&mt("Undeleted all entries"));
               } else {
-                  $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("Failed to undelete entries"),1));
+                  $confirm_msg .= &Apache::lonhtmlcommon::confirm_success(&mt("Failed to undelete entries"),1);
               }
           } else {
-              $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("No entries to undelete"),1));
+              $confirm_msg .= &Apache::lonhtmlcommon::confirm_success(&mt("No entries to undelete"),1);
           }
-          $r->print("<br /><a href='$feedurl'>".&mt("Return and reload")."</a>");
+          $r->print(
+              '<br />'
+             .&Apache::loncommon::confirmwrapper($confirm_msg)
+             .&Apache::lonhtmlcommon::actionbox(
+                  ["<a href='$feedurl'>".&mt("Return and reload")."</a>"])
+          );
       }
       $r->print(&Apache::loncommon::end_page());
       return OK;