[LON-CAPA-cvs] cvs: loncom /interface lonaboutme.pm lonsyllabus.pm lontemplate.pm

[neumanie]

neumanie		Sat Mar  7 15:07:09 2009 EDT

  Modified files:              
    /loncom/interface	lonaboutme.pm lonsyllabus.pm lontemplate.pm 
  Log:
  Delete </p> in RSS feeds output in lonaboutme lonsylabus.
  Delete <a name.../> for "User Notes,Records,....", because that is not a link.
  
  
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.108 loncom/interface/lonaboutme.pm:1.109
--- loncom/interface/lonaboutme.pm:1.108	Mon Mar  2 22:32:19 2009
+++ loncom/interface/lonaboutme.pm	Sat Mar  7 15:07:09 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Personal Information Page
 #
-# $Id: lonaboutme.pm,v 1.108 2009/03/02 22:32:19 schualex Exp $
+# $Id: lonaboutme.pm,v 1.109 2009/03/07 15:07:09 neumanie Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -361,8 +361,10 @@
        if($target ne 'tex')#Begin Print RSS and portfiles
        {			
 		&print_portfiles_link($r,$is_course);
-		if(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){			
-			&Apache::lontemplate::print_template($r,'RSS Feeds and Blogs',&Apache::lonrss::advertisefeeds($cnum,$cdom),1,'LC_ContentBoxSpecial');
+		if(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){
+			&Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial');
+			$r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom));		
+			&Apache::lontemplate::print_end_template($r);		
 		}		
 		
        } #End  Print RSS and portfiles
@@ -388,9 +390,8 @@
     if ($env{'request.course.id'}
 	&& &Apache::lonnet::allowed('srm',$env{'request.course.id'})
 	&& &in_course($cdom,$cnum)) {
-	if ($target ne 'tex') {
-	    $r->print('<a name="coursecomment" />');
-	   &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"),'LC_ContentBoxSpecial');
+	if ($target ne 'tex') {	   
+	   &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').' '.&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"),'LC_ContentBoxSpecial');
 	   &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
 	   &Apache::lontemplate::print_end_template($r);
 	    
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.81 loncom/interface/lonsyllabus.pm:1.82
--- loncom/interface/lonsyllabus.pm:1.81	Sun Mar  1 13:23:12 2009
+++ loncom/interface/lonsyllabus.pm	Sat Mar  7 15:07:09 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.81 2009/03/01 13:23:12 neumanie Exp $
+# $Id: lonsyllabus.pm,v 1.82 2009/03/07 15:07:09 neumanie Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -328,11 +328,15 @@
     my $day = &Apache::lonannounce::showday(time,2,
 			 &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
     if ($target ne 'tex') {
-	if($allowed){	
-		&Apache::lontemplate::print_template($r,'RSS Feeds and Blogs',&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit),1,'LC_ContentBoxSpecial');
+	if($allowed){
+		&Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial');
+		$r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));			
+		&Apache::lontemplate::print_end_template($r);
 	}
-	elsif(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){
-		&Apache::lontemplate::print_template($r,'RSS Feeds and Blogs',&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit),1,'LC_ContentBoxSpecial');
+	elsif(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){		
+		&Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial');
+		$r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));		
+		&Apache::lontemplate::print_end_template($r);
 	}
 	
     } else {
Index: loncom/interface/lontemplate.pm
diff -u loncom/interface/lontemplate.pm:1.22 loncom/interface/lontemplate.pm:1.23
--- loncom/interface/lontemplate.pm:1.22	Mon Mar  2 16:38:35 2009
+++ loncom/interface/lontemplate.pm	Sat Mar  7 15:07:09 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "Template" Functions to generate html output
 #
-# $Id: lontemplate.pm,v 1.22 2009/03/02 16:38:35 amueller Exp $
+# $Id: lontemplate.pm,v 1.23 2009/03/07 15:07:09 neumanie Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -116,12 +116,12 @@
 	my $s;
 	my $image = qq{<img name="Send message" src="/res/adm/pages/com.png" border="none" />};	
 	$s=&Apache::loncommon::messagewrapper($image,$cnum,$cdom).' '.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom);	
-	return $s;
+	return $s;	
 }
 
 sub print_template
 {	
-	my ($r,$topic,$content, $allowed,$boxclass) = @_;	
+	my ($r,$topic,$content, $allowed,$boxclass) = @_;		
 	$r->print('<div class="'.$boxclass.'">');	
 	$r->print('<h4 class="LC_hcell">'.$topic.'</h4>');
 	$r->print('<p>' .$content . '</p>');
@@ -149,13 +149,12 @@
 sub print_start_page_functions
 {
 	my($r)=@_;	
-	$r->print('<fieldset><legend>'. &mt('Functions') . '</legend>');
+	$r->print('<fieldset><legend>'. &mt('Functions') . '</legend>');	
 }
 sub print_functions_content
 {
 	my($r,$content) = @_;
-	$r->print('<span class="LC_nobreak">&bull;&nbsp;'.$content.'&nbsp;</span>');
-	
+	$r->print('<span class="LC_nobreak">&bull;&nbsp;'.$content.'&nbsp;</span>');	
 }
 sub print_end_page_functions
 {