--- loncom/interface/lonrss.pm 2008/12/15 16:09:12 1.41
+++ loncom/interface/lonrss.pm 2010/01/03 21:21:25 1.47.8.1
@@ -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.8.1 2010/01/03 21:21:25 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -60,6 +60,9 @@ sub displayfeedname {
# no, construct a name
my $name=$filterfilename;
if ($name=~/^CourseBlog/) {
+ if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') {
+ $name = &mt('Community Blog');
+ }
$name=&mt('Course Blog');
if ($env{'course.'.$env{'request.course.id'}.'.description'}) {
$name.=' '.$env{'course.'.$env{'request.course.id'}.'.description'};
@@ -306,8 +309,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 = '
'.&mt('No user blog available') .'
'.
&mt('This is a result of one of the following:').''.
@@ -320,15 +325,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 +393,10 @@ sub handler {
}
# Add a new feed
if (($html) && ($edit)) {
+ $r->print('' . &mt('New RSS Feed or Blog'). '
');
$r->print('
');
}
if ($displayfeedname) { # this is an existing feed
@@ -508,7 +513,7 @@ sub handler {
'private' => 'private',
'hidden' => 'hidden',
'delete' => 'delete',
- 'store' => 'Save changes',
+ 'store' => 'Select',
'title' => 'Title',
'link' => 'Link',
'description' => 'Description',
@@ -588,7 +593,7 @@ ENDEDIT
if ($html) {
$r->print('');
if ($edit) {
- $r->print(''.
+ $r->print(''.
($displayoption eq 'hidden'?'':
''));
}