[LON-CAPA-cvs] cvs: loncom /interface lonmsgdisplay.pm mydesk.tab

raeburn raeburn@source.lon-capa.org
Wed, 04 Nov 2009 18:30:17 -0000


This is a MIME encoded message

--raeburn1257359417
Content-Type: text/plain

raeburn		Wed Nov  4 18:30:17 2009 EDT

  Modified files:              
    /loncom/interface	lonmsgdisplay.pm mydesk.tab 
  Log:
  - Bug 6078 - wording change
  - Accommodate Communities
  
  
--raeburn1257359417
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20091104183017.txt"

Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.137 loncom/interface/lonmsgdisplay.pm:1.138
--- loncom/interface/lonmsgdisplay.pm:1.137	Tue Oct 13 16:37:57 2009
+++ loncom/interface/lonmsgdisplay.pm	Wed Nov  4 18:30:17 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.137 2009/10/13 16:37:57 amueller Exp $
+# $Id: lonmsgdisplay.pm,v 1.138 2009/11/04 18:30:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -509,6 +509,7 @@
 sub discourse {
     my ($statushash) = @_;
     my ($result,$active,$previous,$future);
+    my $crstype = &Apache::loncommon::course_type();
     my ($course_personnel,
 	$current_members,
 	$expired_members,
@@ -524,8 +525,14 @@
                                                                \%defaultUsers,
                                                                1,"selectedusers",1,'email')
        ) {
+       my $bcc_curr_hdr;
+       if ($crstype eq 'Community') {
+           $bcc_curr_hdr = &mt('Bcc: community participants with current access');
+       } else {
+           $bcc_curr_hdr = &mt('Bcc: course members with current access');
+       }
        $result .= '<fieldset id="LC_activeusers"><legend>'
-                 .&mt('Bcc: course members with current access')
+                 .$bcc_curr_hdr
                  .'</legend>'
                  .'<form name="activeusers">';
        $result .= $tmptext.'</form></fieldset><br />';
@@ -539,8 +546,14 @@
                                                                \%defaultUsers,
                                                                1, "selectedusers",0,'email')
        ) {
+       my $bcc_prev_hdr;
+       if ($crstype eq 'Community') {
+           $bcc_prev_hdr = &mt('Bcc: community participants with expired access');
+       } else {
+           $bcc_prev_hdr = &mt('Bcc: course members with expired access');
+       }
        $result .= '<fieldset id="LC_previoususers"><legend>'
-                 .&mt('Bcc: course members with expired access')
+                 .$bcc_prev_hdr
                  .'</legend>'
                  .'<form name="previoususers">';
        $result .= $tmptext.'</form></fieldset><br />';
@@ -555,8 +568,15 @@
                                                                \%defaultUsers,
                                                                1, "selectedusers",0,'email')
        ) {
+       my $bcc_future_hdr;
+       if ($crstype eq 'Community') {
+           $bcc_future_hdr = &mt('Bcc: community participants with future access');
+       } else {
+           $bcc_future_hdr = &mt('Bcc: course members with future access');
+       }
+
        $result .= '<fieldset id="LC_futureusers"><legend>'
-                 .&mt('Bcc: course members with future access')
+                 .$bcc_future_hdr
                  .'</legend>'
                  .'<form name="futureusers">';
        $result .= $tmptext.'</form></fieldset>';
@@ -730,10 +750,16 @@
     }
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     if ($refarg) {
+        my $brtitle;
+        if (&Apache::loncommon::course_type() eq 'Community') {
+            $brtitle = 'View community groups';  
+        } else {
+            $brtitle = 'View course groups';
+        }  
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>"/adm/coursegroups",
               text=>"Groups",
-              title=>"View course groups"});
+              title=>$brtitle});
     }
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg",
@@ -1315,22 +1341,36 @@
     if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
 	|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
 				    '/'.$env{'request.course.sec'})) {
+         my $crstype = &Apache::loncommon::course_type();
 	 my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
+         my $rsstxt;
+         if (&Apache::loncommon::course_type() eq 'Community') {
+             $rsstxt = &mt('Include in community RSS newsfeed');
+         } else {
+             $rsstxt = &mt('Include in course RSS newsfeed');
+         }
          $dispcrit=
  '<span class="LC_nobreak"><label><input type="checkbox" name="critmsg" /> '.&mt('Send as critical message').'.</label>'.$crithelp.'&nbsp;&nbsp;'.&mt('Require return receipt?').'<label><input type="radio" name="sendbck" value="1" />'.&mt('Yes').'</label>&nbsp;&nbsp;<label><input type="radio" name="sendbck" value="" checked="checked" />'.&mt('No').'</label></span><br />'.
  '<label><input type="checkbox" name="permanent" /> '.
 &mt('Send copy to permanent e-mail address (if known)').'</label><br />'.
 '<label><input type="checkbox" name="rsspost" /> '.
-		  &mt('Include in course RSS newsfeed').'</label><br />';
+		  $rsstxt.'</label><br />';
     }
     if ($broadcast ne 'group') {
         if (&Apache::lonnet::allowed('dff',$env{'request.course.id'}) ||
             &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
                                      '/'.$env{'request.course.sec'})) {
 
+            my $rectxt;
+            if (&Apache::loncommon::course_type() eq 'Community') {
+                $rectxt = &mt("Include in community's 'User records' for recipient(s)");
+            } else {
+                $rectxt = &mt("Include in course's 'User records' for recipient(s)");
+            }
+
             $dispcrit.='<label>'.
                        '<input type="checkbox" name="courserecord" value="1" /> '.
-                       &mt("Include in course's 'User records' for recipient(s)").
+                       $rectxt.
                        '</label><br />';
         }
     }
@@ -1982,12 +2022,18 @@
 	$r->print('Not allowed');
 	return;
     }
-    my $usertype = (&Apache::loncommon::course_type() eq 'Community') ? 'members'
-	                                                              : 'students';
+    my $usertype;
+    my $crstype = &Apache::loncommon::course_type();
+    if ($crstype eq 'Community') {
+        $usertype = 'members';
+    } else {
+	$usertype = 'students';
+    }
+    my $lctype = lc($crstype);
     my %lt=&Apache::lonlocal::texthash(
             'comb' => 'Communication Blocking',
             'cbds' => 'Communication blocking during scheduled exams',
-            'desc' => "You can use communication blocking to prevent $usertype enrolled in this course from displaying LON-CAPA messages sent by other $usertype during an online exam. As blocking of communication could potentially interrupt legitimate communication between $usertype who are also both enrolled in a different LON-CAPA course, please be careful that you select the correct start and end times for your scheduled exam when setting or modifying these parameters.",
+            'desc' => "You can use communication blocking to prevent $usertype enrolled in this $lctype from displaying LON-CAPA messages sent by other $usertype during an online exam. As blocking of communication could potentially interrupt legitimate communication between $usertype who are also both enrolled in a different LON-CAPA course or community, please be careful that you select the correct start and end times for your scheduled exam when setting or modifying these parameters.",
              'mecb' => 'Modify existing communication blocking periods',
              'ncbc' => 'No communication blocks currently saved',
              'stor' => 'Save',
@@ -2839,10 +2885,10 @@
     if ($baseurl) {
 	$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
     }
-    $r->print(&Apache::loncommon::start_page('Communication',
+    $r->print(&Apache::loncommon::start_page('Messages',
  					$extra));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs
-     		(($title?$title:'Send and Receive Messages')));
+     		(($title?$title:'Send and display messages')));
 }
 
 # ---------------------------------------------------------------- Print header
@@ -3252,7 +3298,7 @@
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/communicate",
-          text=>"Communication/Messages",
+          text=>"Messages",
           faq=>12,bug=>'Communication Tools',});
 
 # ------------------------------------------------------------------ Get Folder
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.122 loncom/interface/mydesk.tab:1.123
--- loncom/interface/mydesk.tab:1.122	Sat Oct 31 23:36:50 2009
+++ loncom/interface/mydesk.tab	Wed Nov  4 18:30:17 2009
@@ -200,7 +200,7 @@
 10:1:any:any:anno.gif:calendar[_1]:announce[_1]:go('/adm/announcements');:Announcements and my calendar:com
 10:1:course:any:anno.gif:calendar[_1]:announce[_1]:go('/adm/announcements');:Course anouncements and my calendar:com
 10:1:community:any:anno.gif:calendar[_1]:announce[_1]:go('/adm/announcements');:Community announcements and my calendar:com
-10:2:any:any:com.gif:commu-[_1]:nication[_1]:go('/adm/communicate');:Send and receive messages:com
+10:2:any:any:com.gif:commu-[_1]:nication[_1]:go('/adm/communicate');:Send and display messages:com
 10:3:clear
 10:3:ppsa:$requested_domain:mail.gif:bulk[_1]:e-mail[_1]:go('/adm/notify');:Send and display broadcast e-mail:com
 10:3:course_plc:any:bchat.gif:course[_10]:chatroom[_1]:chat_win();:Enter the chat room for the course:com

--raeburn1257359417--