--- loncom/interface/lonrss.pm	2008/12/22 14:41:05	1.39.2.2
+++ loncom/interface/lonrss.pm	2012/07/03 15:18:54	1.50
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # RSS Feeder
 #
-# $Id: lonrss.pm,v 1.39.2.2 2008/12/22 14:41:05 raeburn Exp $
+# $Id: lonrss.pm,v 1.50 2012/07/03 15:18:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,6 +61,9 @@ sub displayfeedname {
     my $name=$filterfilename; 
     if ($name=~/^CourseBlog/) {
         $name=&mt('Course Blog');
+        if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') {
+            $name = &mt('Community Blog'); 
+        }
 	if ($env{'course.'.$env{'request.course.id'}.'.description'}) {
 	    $name.=' '.$env{'course.'.$env{'request.course.id'}.'.description'};
 	}
@@ -258,9 +261,11 @@ sub blocking_blogdisplay {
         if ($blockcause eq 'user') {
             $output .= &mt('This is because you are a student in one or more courses in which communication is being blocked.');
             if ($html) {
-                $output .= '<br />'.
-                       &Apache::loncommon::build_block_table($startblock,
-                                                        $endblock,\%setters);
+                #$output .= '<br />'.
+                       #&Apache::loncommon::build_block_table($startblock,
+                       #                                 $endblock,\%setters);
+                 my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs');
+                 $output .= '<br /><br />'.$blocktext;
             }
         } else {
             $output .= &mt('This is because the blog owner is a student in one or more courses in which communication is being blocked.');
@@ -283,7 +288,9 @@ sub handler {
 	$edit=1;
 	$html=1;
     }
-    if  (($mode eq 'adm') && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
+    if  (($mode eq 'adm') && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))
+        && ($uname eq $env{'course.'.$env{'request.course.id'}.'.num'} &&
+            $udom eq $env{'course.'.$env{'request.course.id'}.'.domain'})) {
 	$edit=1;
 	$html=1;
     }
@@ -322,13 +329,14 @@ sub handler {
         }
     }
     if ($html) {
-	my $title = $displayfeedname?$displayfeedname
-                                    :"Available RSS Feeds and Blogs";
+#	my $title = $displayfeedname?$displayfeedname:"Available RSS Feeds and Blogs";
+        my $title = "My Space";
 	my $rss_link = &Apache::lonrss::rss_link($uname,$udom);
+	my $brcrumb = [{href=>$rss_link,text=>"Available RSS Feeds and Blogs"}];
 	$r->print(&Apache::loncommon::start_page($title,$rss_link,
-						 {'domain'         => $udom,
-						  'force_register' =>
-						      $env{'form.register'}}).
+			 {'bread_crumbs'   => $brcrumb,
+			  'domain'         => $udom,
+			  'force_register' => $env{'form.register'}}).
 		  &changed_js());
     } else { # render RSS
         my $server = &Apache::lonnet::absolute_url();
@@ -389,9 +397,10 @@ sub handler {
 	}
 # Add a new feed
         if (($html) && ($edit)) {
+	    $r->print('<h4>' . &mt('New RSS Feed or Blog'). '</h4>');
 	    $r->print('<form method="post" name="makenewfeed">');
-            $r->print(&mt('Name for New Feed').": <input type='text' size='40' name='namenewblog' />");
-	    $r->print('<input type="submit" value="'.&mt('Start a New Feed').'" />');
+            $r->print(&mt('Name').": <input type='text' size='40' name='namenewblog' />");
+	    $r->print('<input type="submit" value="'.&mt('New Feed').'" />');
 	    $r->print('</form>');
 	}
         if ($displayfeedname) { # this is an existing feed
@@ -508,7 +517,7 @@ sub handler {
 							   'private' => 'private',
 							   'hidden' => 'hidden',
 							   'delete' => 'delete',
-							   'store' => 'Save changes',
+							   'store' => 'Select',
 							   'title' => 'Title',
 							   'link' => 'Link',
 							   'description' => 'Description',
@@ -588,7 +597,7 @@ ENDEDIT
 	    if ($html) {
 		$r->print('</ul>');
 		if ($edit) {
-		    $r->print('<input type="hidden" name="newid" value="'.$newid.'"/><input type="submit" value="'.&mt('Save Marked Changes').'" />'.
+		    $r->print('<input type="hidden" name="newid" value="'.$newid.'"/><input type="submit" value="'.&mt('Save Selected').'" />'.
 			      ($displayoption eq 'hidden'?'<input type="submit" name="advertisethisblog" value="'.&mt('Advertise this Feed').'" />':
 			       '<input type="submit" name="hidethisblog" value="'.&mt('Hide this Feed').'" />'));
 		}