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

[ehlerst]

ehlerst		Tue Dec  2 09:41:07 2008 EDT

  Modified files:              
    /loncom/interface	lonaboutme.pm loncommon.pm 
  Log:
  changed styles for templates in loncommon.pm. implemented function from lontemplate.pm in lonaboutme.pm for content output.
  
  
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.74 loncom/interface/lonaboutme.pm:1.75
--- loncom/interface/lonaboutme.pm:1.74	Thu Nov 20 13:11:36 2008
+++ loncom/interface/lonaboutme.pm	Tue Dec  2 09:41:07 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.74 2008/11/20 13:11:36 jms Exp $
+# $Id: lonaboutme.pm,v 1.75 2008/12/02 09:41:07 ehlerst Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -269,33 +269,7 @@
 	 '</form><form method="post">');
 
        }
-
-	
-       foreach my $field (sort(keys(%syllabusfields))) {
-          if (($syllabus{$field}) || ($allowed)) {
-              my $message=$syllabus{$field};
-	      &Apache::lonfeedback::newline_to_br(\$message);
-              $message
-             =~s/(http\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
-	      if ($allowed) {
-		  $message=&Apache::lonspeller::markeduptext($message);
-	      }
-	      $message=&Apache::lontexconvert::msgtexconverted($message);
-	      if ($target ne 'tex') {
-				
-		Apache::lontemplate::print_template($r,$syllabusfields{$field},$message);
-				
-				
-				
-	      } else {
-		     $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
-			       &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
-	      }
-              if ($allowed) {
-		Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field);
-	      }
-	  }
-       }
+	&Apache::lontemplate::print_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus);
        if($target ne 'tex')
        {
 		
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.699 loncom/interface/loncommon.pm:1.700
--- loncom/interface/loncommon.pm:1.699	Mon Dec  1 15:03:40 2008
+++ loncom/interface/loncommon.pm	Tue Dec  2 09:41:07 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.699 2008/12/01 15:03:40 raeburn Exp $
+# $Id: loncommon.pm,v 1.700 2008/12/02 09:41:07 ehlerst Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5486,8 +5486,8 @@
 .hcell{
         padding:3px 15px 3px 15px;
         margin:0px;
-        background: $pgbg;
-        border-bottom:solid 1px $lg_border_color;       
+	background: $tabbg;
+        border-bottom:solid 1px #000000;       
 }
 .right {
 	text-align: right;
@@ -5611,9 +5611,11 @@
 
 .ContentBoxSpecial
 {
-	border: solid 1px $lg_border_color;
+	border: solid 1px #000000;
+	width: 90%;
 }
 .ContentBox {
+	width: 50%;
 	padding:10px;
 }
 .PopUp