[LON-CAPA-cvs] cvs: loncom(GCI_3) /interface createaccount.pm

[raeburn]

raeburn		Thu Dec  2 02:15:11 2010 EDT

  Modified files:              (Branch: GCI_3)
    /loncom/interface	createaccount.pm 
  Log:
  - Customization for GCI_3
    - Line feeds to improve readability of URL to complete account creation it email.
    - Fix quotes in links to log-in and reset pages.
  
  
Index: loncom/interface/createaccount.pm
diff -u loncom/interface/createaccount.pm:1.37.2.4 loncom/interface/createaccount.pm:1.37.2.5
--- loncom/interface/createaccount.pm:1.37.2.4	Wed Dec  1 22:56:12 2010
+++ loncom/interface/createaccount.pm	Thu Dec  2 02:15:11 2010
@@ -3,7 +3,7 @@
 # institutional log-in ID (institutional authentication required - localauth
 #  or kerberos) or an e-mail address.
 #
-# $Id: createaccount.pm,v 1.37.2.4 2010/12/01 22:56:12 raeburn Exp $
+# $Id: createaccount.pm,v 1.37.2.5 2010/12/02 02:15:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -597,9 +597,9 @@
     if ($token !~ /^error/ && $token ne 'no_such_host') {
         my $esc_token = &escape($token);
         my $showtime = localtime(time);
-        my $mailmsg = &mt('A request was submitted on [_1] for creation of a GCI WebCenter account.',$showtime).' '.
+        my $mailmsg = &mt('A request was submitted on [_1] for creation of a GCI WebCenter account.',$showtime)." \n".
              &mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',
-                 &Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token);
+                 "\n\n".&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token);
         my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name,
                                                  $contact_email);
         if ($result eq 'ok') {
@@ -1135,9 +1135,10 @@
         $msg .= &mt('The e-mail address you provided does not appear to be a valid address.');
     } elsif ($error eq 'existinguser') {
         my $uname = &HTML::Entities::encode($useremail);
-        $msg .= &mt('The e-mail address you provided is already in use as a username in LON-CAPA at this institution.').'<br />'.&mt('You can either:').'<ul>'.
-                '<li>'.&mt(Return to the [_1]log-in page[_2] and enter your password.','<a href="/adm/login?username="'.$uname.'">','</a>').'</li>'.
-                '<li>'.&mt('or, if you do not remember your password, visit the "[_1]Forgot your password?[_2]" page.','<a href="/adm/resetpw?uname="'.$uname.'&useremail='.$uname.'&referrer=createaccount">','</a>');
+        $msg .= &mt('The e-mail address you provided is already in use as a username in LON-CAPA at this institution.').'</span><br /><br /><span class="LC_warning">'.&mt('You can either:').'<ul>'.
+                '<li>'.&mt('Return to the [_1]log-in page[_2] and enter your password.','<a href="/adm/login?username='.$uname.'">','</a>').'</li>'.
+                '<li>'.&mt('or, if you do not remember your password, visit the "[_1]Forgot your password?[_2]" page.','<a href="/adm/resetpw?uname='.$uname.'&useremail='.$uname.'&referrer=createaccount">','</a>').
+                '</li></ul>';
     } elsif ($error eq 'userrules') {
         $msg .= &mt('Username rules at this institution do not allow the e-mail address you provided to be used as a username.');
     } elsif ($error eq 'userformat') {