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

[bisitz]

bisitz		Wed Jan 15 18:47:56 2014 EDT

  Modified files:              
    /loncom/interface	loncreateuser.pm lonmodifycourse.pm 
  Log:
  Improved and consistent navigation and layout by using actionbox
  
  
  
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.385 loncom/interface/loncreateuser.pm:1.386
--- loncom/interface/loncreateuser.pm:1.385	Wed Jan  8 17:18:11 2014
+++ loncom/interface/loncreateuser.pm	Wed Jan 15 18:47:56 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.385 2014/01/08 17:18:11 bisitz Exp $
+# $Id: loncreateuser.pm,v 1.386 2014/01/15 18:47:56 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3116,13 +3116,14 @@
     if ($env{'form.action'} eq 'singlestudent') {
         &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context,
                                $crstype,$showcredits,$defaultcredits);
-        $r->print('<p><a href="javascript:backPage(document.userupdate)">');
-        if ($crstype eq 'Community') {
-            $r->print(&mt('Enroll Another Member'));
-        } else {
-            $r->print(&mt('Enroll Another Student'));
-        }
-        $r->print('</a></p>');
+        my $linktext = ($crstype eq 'Community' ?
+            &mt('Enroll Another Member') : &mt('Enroll Another Student'));
+        $r->print(
+            &Apache::lonhtmlcommon::actionbox([
+                '<a href="javascript:backPage(document.userupdate)">'
+               .($crstype eq 'Community' ? 
+                    &mt('Enroll Another Member') : &mt('Enroll Another Student'))
+               .'</a>']));
     } else {
         my @rolechanges = &update_roles($r,$context,$showcredits);
         if (keys(%namechanged) > 0) {
@@ -3944,7 +3945,7 @@
         }
         $r->print('.<br />'.$showstart.'; '.$showend);
         if ($startdate <= $now && !$newuser) {
-            $r->print('<p> ');
+            $r->print('<p class="LC_info">');
             if ($crstype eq 'Community') {
                 $r->print(&mt('If the member is currently logged-in to LON-CAPA, the new role will be available when the member next logs in.'));
             } else {
Index: loncom/interface/lonmodifycourse.pm
diff -u loncom/interface/lonmodifycourse.pm:1.65 loncom/interface/lonmodifycourse.pm:1.66
--- loncom/interface/lonmodifycourse.pm:1.65	Tue Dec 24 19:15:11 2013
+++ loncom/interface/lonmodifycourse.pm	Wed Jan 15 18:47:56 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # handler for DC-only modifiable course settings
 #
-# $Id: lonmodifycourse.pm,v 1.65 2013/12/24 19:15:11 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.66 2014/01/15 18:47:56 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -996,18 +996,19 @@
     $reply = '<h3>'.$mainheader.' <span class="LC_nobreak">'.$cdesc.'</span></h3>'."\n".
              '<p>'.$reply.'</p>'."\n".
              '<form action="/adm/modifycourse" method="post" name="processparms">'.
-             &hidden_form_elements().
-             '<a href="javascript:changePage(document.processparms,'."'menu'".')">'.
-             &mt('Pick another action').'</a>';
+             &hidden_form_elements();
+    my @actions =
+        ('<a href="javascript:changePage(document.processparms,'."'menu'".')">'.
+                 &mt('Pick another action').'</a>');
     if ($numwarnings) {
         my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
         my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
                                              '=1&destinationurl=/adm/populate','&<>"');
 
-        $reply .= '<br /><a href="'.$escuri.'">'.
-                  &mt('Go to Automated Enrollment Manager for course').'</a>';
+        push(@actions, '<a href="'.$escuri.'">'.
+                  &mt('Go to Automated Enrollment Manager for course').'</a>');
     }
-    $reply .= '</form>';
+    $reply .= &Apache::lonhtmlcommon::actionbox(\@actions).'</form>';
     $r->print($reply);
     return;
 }