--- loncom/interface/lonrss.pm	2008/12/15 16:09:12	1.41
+++ loncom/interface/lonrss.pm	2009/04/20 15:20:23	1.47
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # RSS Feeder
 #
-# $Id: lonrss.pm,v 1.41 2008/12/15 16:09:12 raeburn Exp $
+# $Id: lonrss.pm,v 1.47 2009/04/20 15:20:23 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -306,8 +306,10 @@ sub handler {
     my ($blocked,$blocktext,$disabled,$disabletext);
     if (!&Apache::lonnet::is_course($udom,$uname)) {
         ($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname);
-        $disabled = &Apache::lonnet::usertools_access($uname,$udom,'blog');
-        if ($disabled) {
+        if (&Apache::lonnet::usertools_access($uname,$udom,'blog')) {
+            $disabled = 0;
+        } else {
+            $disabled = 1;
             if ($html) {
                 $disabletext = '<h2>'.&mt('No user blog available') .'</h2>'.
                                &mt('This is a result of one of the following:').'<ul>'.
@@ -320,15 +322,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"}];
+	my $brcrumb = [{href=>$rss_link,text=>"Available RSS Feeds and Blogs"}];
 	$r->print(&Apache::loncommon::start_page($title,$rss_link,
-						 {'bread_crumbs' => @brcrumb,
-						  '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 +390,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 +510,7 @@ sub handler {
 							   'private' => 'private',
 							   'hidden' => 'hidden',
 							   'delete' => 'delete',
-							   'store' => 'Save changes',
+							   'store' => 'Select',
 							   'title' => 'Title',
 							   'link' => 'Link',
 							   'description' => 'Description',
@@ -588,7 +590,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').'" />'));
 		}