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

[bisitz]

bisitz		Sat May 30 21:52:30 2009 EDT

  Modified files:              
    /loncom/interface	lonparmset.pm lontemplate.pm lonaboutme.pm 
  Log:
  Optimized padding for ContentBoxSpecial:
  - Added padding to LC_ContentBoxSpecial, since padding is needed in all occurrences
  - Adjusted margins for headlines in LC_ContentBoxSpecial boxes
  - Removed now unnecessary LC_BoxPadding
  Note: These changes increase the padding for menu boxes
  
  lonaboutme.pm: Corrected unbalanced tags (removed </p>)
  
  
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.451 loncom/interface/lonparmset.pm:1.452
--- loncom/interface/lonparmset.pm:1.451	Wed May 27 13:36:46 2009
+++ loncom/interface/lonparmset.pm	Sat May 30 21:52:30 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.451 2009/05/27 13:36:46 bisitz Exp $
+# $Id: lonparmset.pm,v 1.452 2009/05/30 21:52:30 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2790,7 +2790,7 @@
     #           <tr><td class="LC_parm_overview_level_menu">');
     $r->print('<div class="LC_ContentBoxSpecial">');
     #$r->print('<h2 class="LC_hcell">Step 1</h2>');
-    $r->print('<div class="LC_BoxPadding">' );
+    $r->print('<div>');
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     &levelmenu($r,\%alllevs,$parmlev);
     if ($parmlev ne 'general') {
@@ -2807,7 +2807,7 @@
     #$r->print('<table id="LC_parm_overview_controls">
     #           <tr><td class="LC_parm_overview_parm_selectors">');
     $r->print('<div class="LC_ContentBoxSpecial">');
-    $r->print('<div class="LC_BoxPadding">' );
+    $r->print('<div>');
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     &parmmenu($r,\%allparms,\@pscat,\%keyorder);
     $r->print(&Apache::lonhtmlcommon::row_closure());
@@ -2829,7 +2829,7 @@
     $r->print('</div></div>');
 
     $r->print('<div class="LC_ContentBoxSpecial">');
-    $r->print('<div class="LC_BoxPadding">' );
+    $r->print('<div>');
     my $sortorder=$env{'form.sortorder'};
     unless ($sortorder) { $sortorder='realmstudent'; }
     &sortmenu($r,$sortorder);
Index: loncom/interface/lontemplate.pm
diff -u loncom/interface/lontemplate.pm:1.34 loncom/interface/lontemplate.pm:1.35
--- loncom/interface/lontemplate.pm:1.34	Sat May 30 20:41:34 2009
+++ loncom/interface/lontemplate.pm	Sat May 30 21:52:30 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "Template" Functions to generate html output
 #
-# $Id: lontemplate.pm,v 1.34 2009/05/30 20:41:34 bisitz Exp $
+# $Id: lontemplate.pm,v 1.35 2009/05/30 21:52:30 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -104,32 +104,26 @@
 	return $s;
 }
 
-sub print_template
-{
+sub print_template {
 	my ($r,$topic,$content, $allowed,$boxclass) = @_;
 	$r->print('<div class="'.$boxclass.'">');
 	$r->print('<h4 class="LC_hcell">'.$topic.'</h4>');
-	$r->print('<div class="LC_BoxPadding">' .$content . '</div>');
+	$r->print($content);
 	$r->print('</div>');
 }
 
-sub print_start_template
-{
+sub print_start_template {
 	my ($r,$topic,$boxclass) = @_;
 	$r->print('<div class="'.$boxclass.'">');
 	$r->print('<h4 class="LC_hcell">'.$topic.'</h4>');
-	$r->print('<div class="LC_BoxPadding">' );
 }
 
-sub print_end_template
-{
+sub print_end_template {
 	my ($r) = @_;
 	$r->print('</div>');
-	$r->print('</div>');
 }
 
-sub print_editbox_template
-{
+sub print_editbox_template {
 	my ($r,$content,$field) = @_;
 	$r->print('<textarea cols="81" rows="6" name="'.$field.'">'.
                            &HTML::Entities::encode($content,'"&<>').
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.135 loncom/interface/lonaboutme.pm:1.136
--- loncom/interface/lonaboutme.pm:1.135	Sat May 30 20:41:34 2009
+++ loncom/interface/lonaboutme.pm	Sat May 30 21:52:30 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Personal Information Page
 #
-# $Id: lonaboutme.pm,v 1.135 2009/05/30 20:41:34 bisitz Exp $
+# $Id: lonaboutme.pm,v 1.136 2009/05/30 21:52:30 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -281,7 +281,6 @@
      if ($target ne 'tex') {
         $r->print('<div class="LC_ContentBoxSpecial">');
         $r->print('<h2 class="LC_hcell">'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
-        $r->print('<div class="LC_BoxPadding">' );
          if ($courseenv{'nickname'}) {
                $r->print('<h2>&quot;'.$courseenv{'nickname'}.'&quot;</h2>');
         }
@@ -413,7 +412,6 @@
     }
     if ($target ne 'tex') {
         $r->print('</div>');
-        $r->print('</div>');
         if ($env{'form.popup'}) {
             $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a>');
         }
@@ -478,7 +476,7 @@
     );
     if ($filecounts->{'both'} > 0) {
         $output = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">';
-        $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4><div class="LC_BoxPadding">';
+        $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
 
        #$output = '<h4>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
         $output .= '<a href="/adm/'.$cdom.'/'.$cnum.'/aboutme/portfolio'.
@@ -504,8 +502,7 @@
             $output .= '<li>'.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'</li>';
         }
         $output .= '</ul>';
-        $output .='</p>';
-        $output .='</div></div>';
+        $output .= '</div>';
     }
     $r->print($output);
     return;