[LON-CAPA-cvs] cvs: loncom /interface lonaboutme.pm loncommon.pm londocs.pm lonhtmlcommon.pm lonmenu.pm lonparmset.pm lonsimplepage.pm lonsyllabus.pm lontemplate.pm
bisitz
bisitz@source.lon-capa.org
Mon, 08 Jun 2009 18:04:46 -0000
This is a MIME encoded message
--bisitz1244484286
Content-Type: text/plain
bisitz Mon Jun 8 18:04:46 2009 EDT
Modified files:
/loncom/interface lonaboutme.pm loncommon.pm londocs.pm
lonhtmlcommon.pm lonmenu.pm lonparmset.pm
lonsimplepage.pm lonsyllabus.pm lontemplate.pm
Log:
Just "LC_Box" instead of "LC_ContentBoxSpecial"
- Much shorter
- Always contains some kind of content
- Nothing special (LC_ContentBox doesn't exist besides id for Javascript in londocs.pm)
--bisitz1244484286
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20090608180446.txt"
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.136 loncom/interface/lonaboutme.pm:1.137
--- loncom/interface/lonaboutme.pm:1.136 Sat May 30 21:52:30 2009
+++ loncom/interface/lonaboutme.pm Mon Jun 8 18:04:45 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Personal Information Page
#
-# $Id: lonaboutme.pm,v 1.136 2009/05/30 21:52:30 bisitz Exp $
+# $Id: lonaboutme.pm,v 1.137 2009/06/08 18:04:45 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -279,7 +279,7 @@
}
#------Print Headtitle
if ($target ne 'tex') {
- $r->print('<div class="LC_ContentBoxSpecial">');
+ $r->print('<div class="LC_Box">');
$r->print('<h2 class="LC_hcell">'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
if ($courseenv{'nickname'}) {
$r->print('<h2>"'.$courseenv{'nickname'}.'"</h2>');
@@ -372,7 +372,7 @@
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_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial');
+ &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');
$r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom));
&Apache::lontemplate::print_end_template($r);
}
@@ -397,7 +397,7 @@
&& &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'),'LC_ContentBoxSpecial');
+ &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_Box');
$r->print('<span class="LC_info">');
$r->print(&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"));
$r->print('</span> <p>');
@@ -475,7 +475,7 @@
'difl' => 'Display file listing',
);
if ($filecounts->{'both'} > 0) {
- $output = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">';
+ $output = '<div class="LC_Box"><h4 class="LC_hcell">';
$output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
#$output = '<h4>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.839 loncom/interface/loncommon.pm:1.840
--- loncom/interface/loncommon.pm:1.839 Sun Jun 7 20:17:15 2009
+++ loncom/interface/loncommon.pm Mon Jun 8 18:04:45 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.839 2009/06/07 20:17:15 droeschl Exp $
+# $Id: loncommon.pm,v 1.840 2009/06/08 18:04:45 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -5819,7 +5819,7 @@
border-bottom:solid 1px $lg_border_color;
}
-.LC_ContentBoxSpecial > .LC_hcell {
+.LC_Box > .LC_hcell {
margin: 0 -10px 10px -10px;
}
@@ -6013,7 +6013,7 @@
font-weight:bold;
}
-.LC_ContentBoxSpecial {
+.LC_Box {
border: solid 1px $lg_border_color;
padding: 0 10px 10px 10px;
}
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.369 loncom/interface/londocs.pm:1.370
--- loncom/interface/londocs.pm:1.369 Fri Jun 5 10:51:13 2009
+++ loncom/interface/londocs.pm Mon Jun 8 18:04:45 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.369 2009/06/05 10:51:13 bisitz Exp $
+# $Id: londocs.pm,v 1.370 2009/06/08 18:04:45 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2931,7 +2931,7 @@
}
}
$r->print('<li '.$active.'onclick="javascript:showPage(this,\'Supplemental Course Documents\',\'mainnav\',\'maincoursedoc\');">'.&mt('Supplemental Course Documents').'</li>');
- $r->print('</ul><div class="LC_ContentBoxSpecial" style="margin:0 0;padding:0 0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;">');
+ $r->print('</ul><div class="LC_Box" style="margin:0 0;padding:0 0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;">');
# --------------------------------------------------------- Standard documents
my $savefolderpath;
my $active = 'style="display: none;"';
@@ -3348,7 +3348,7 @@
my %orderhash = %{$orderhash_ref};
my $form;
- $form = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">'.&mt($varcd).'</h4>';
+ $form = '<div class="LC_Box"><h4 class="LC_hcell">'.&mt($varcd).'</h4>';
$form .= '<ul id="navigation'.$tid.'" class="LC_TabContent">';
foreach my $name (sort(keys(%orderhash))){
if($name eq 'zz'){
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.221 loncom/interface/lonhtmlcommon.pm:1.222
--- loncom/interface/lonhtmlcommon.pm:1.221 Thu Jun 4 16:47:25 2009
+++ loncom/interface/lonhtmlcommon.pm Mon Jun 8 18:04:45 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.221 2009/06/04 16:47:25 bisitz Exp $
+# $Id: lonhtmlcommon.pm,v 1.222 2009/06/08 18:04:45 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2214,7 +2214,7 @@
push @categories,
$div->($h3->(mt($$category{categorytitle}), {class=>"LC_hcell"}).
$ul->(join('' ,@links), {class =>"LC_ListStyleNormal" }),
- {class=>"LC_ContentBoxSpecial LC_400Box"}) if scalar(@links);
+ {class=>"LC_Box LC_400Box"}) if scalar(@links);
}
# wrap the joined @categories in another <div> (column layout)
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.269 loncom/interface/lonmenu.pm:1.270
--- loncom/interface/lonmenu.pm:1.269 Tue Jun 2 17:25:03 2009
+++ loncom/interface/lonmenu.pm Mon Jun 8 18:04:45 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.269 2009/06/02 17:25:03 droeschl Exp $
+# $Id: lonmenu.pm,v 1.270 2009/06/08 18:04:45 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1073,7 +1073,7 @@
foreach my $cat (keys(%category_members)) {
if ($category_positions{$cat} ne "$col,$row") { next; }
#$output.='<table><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>';
- $output.='<div class="LC_ContentBoxSpecial">';
+ $output.='<div class="LC_Box">';
$output.='<h4 class="LC_hcell">'.&mt($category_names{$cat}).'</h4>';
$output.='<table>';
my %active=();
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.455 loncom/interface/lonparmset.pm:1.456
--- loncom/interface/lonparmset.pm:1.455 Fri Jun 5 12:49:50 2009
+++ loncom/interface/lonparmset.pm Mon Jun 8 18:04:45 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.455 2009/06/05 12:49:50 bisitz Exp $
+# $Id: lonparmset.pm,v 1.456 2009/06/08 18:04:45 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2875,7 +2875,7 @@
#$r->print('<table id="LC_parm_overview_scope">
# <tr><td class="LC_parm_overview_level_menu">');
- $r->print('<div class="LC_ContentBoxSpecial">');
+ $r->print('<div class="LC_Box">');
#$r->print('<h2 class="LC_hcell">Step 1</h2>');
$r->print('<div>');
$r->print(&Apache::lonhtmlcommon::start_pick_box());
@@ -2893,7 +2893,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_Box">');
$r->print('<div>');
$r->print(&Apache::lonhtmlcommon::start_pick_box());
&parmmenu($r,\%allparms,\@pscat,\%keyorder);
@@ -2916,7 +2916,7 @@
$r->print(&Apache::lonhtmlcommon::end_pick_box());
$r->print('</div></div>');
- $r->print('<div class="LC_ContentBoxSpecial">');
+ $r->print('<div class="LC_Box">');
$r->print('<div>');
my $sortorder=$env{'form.sortorder'};
unless ($sortorder) { $sortorder='realmstudent'; }
Index: loncom/interface/lonsimplepage.pm
diff -u loncom/interface/lonsimplepage.pm:1.82 loncom/interface/lonsimplepage.pm:1.83
--- loncom/interface/lonsimplepage.pm:1.82 Tue May 19 09:59:48 2009
+++ loncom/interface/lonsimplepage.pm Mon Jun 8 18:04:45 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Page Editor
#
-# $Id: lonsimplepage.pm,v 1.82 2009/05/19 09:59:48 amueller Exp $
+# $Id: lonsimplepage.pm,v 1.83 2009/06/08 18:04:45 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -350,7 +350,7 @@
}
if ($allowed) {
if ($env{'form.grade_target'} ne 'tex') {
- &Apache::lontemplate::print_template($r, &mt('Title'), $message, $allowed, 'LC_ContentBoxSpecial');
+ &Apache::lontemplate::print_template($r, &mt('Title'), $message, $allowed, 'LC_Box');
&Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field);
$r->print('</p>');
} else {
@@ -364,7 +364,7 @@
if ($allowed) {
$r->print('<p>');
}
- &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial');
+ &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box');
} else {
my $safeinit;
$r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$syllabusfields{$field}.'</h3>'));
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.91 loncom/interface/lonsyllabus.pm:1.92
--- loncom/interface/lonsyllabus.pm:1.91 Tue May 19 10:07:54 2009
+++ loncom/interface/lonsyllabus.pm Mon Jun 8 18:04:46 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.91 2009/05/19 10:07:54 amueller Exp $
+# $Id: lonsyllabus.pm,v 1.92 2009/06/08 18:04:46 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -344,13 +344,13 @@
&Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
if ($target ne 'tex') {
if ($allowed) {
- &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial');
+ &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');
$r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';
$r->print( '<a href="'.$editurl.'">'.&mt('New RSS Feed or Blog').'</a>');
&Apache::lontemplate::print_end_template($r);
} elsif (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') {
- &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial');
+ &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');
$r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
&Apache::lontemplate::print_end_template($r);
}
@@ -407,7 +407,7 @@
if ($allowed) {
$r->print('<p>');
}
- &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_ContentBoxSpecial');
+ &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_Box');
} else {
$r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
&Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
Index: loncom/interface/lontemplate.pm
diff -u loncom/interface/lontemplate.pm:1.35 loncom/interface/lontemplate.pm:1.36
--- loncom/interface/lontemplate.pm:1.35 Sat May 30 21:52:30 2009
+++ loncom/interface/lontemplate.pm Mon Jun 8 18:04:46 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# "Template" Functions to generate html output
#
-# $Id: lontemplate.pm,v 1.35 2009/05/30 21:52:30 bisitz Exp $
+# $Id: lontemplate.pm,v 1.36 2009/06/08 18:04:46 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -76,9 +76,9 @@
if($field eq 'aaa_contactinfo') {
$r->print('<div class="LC_Clear_AboutMe_Image" > </div>');
- &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial');
+ &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box');
} else {
- &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial');
+ &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box');
}
} else {
--bisitz1244484286--