[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm londropadd.pm lonhtmlcommon.pm lonpreferences.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Mon, 26 Jul 2004 21:57:28 -0000
albertel Mon Jul 26 17:57:28 2004 EDT
Modified files:
/loncom/interface lonhtmlcommon.pm loncommon.pm londropadd.pm
lonpreferences.pm
Log:
- fixing BUG#3218 as per gerd's desire
- also updating preferences and dropadd use of bread crumbs to make better use of the existing help
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.83 loncom/interface/lonhtmlcommon.pm:1.84
--- loncom/interface/lonhtmlcommon.pm:1.83 Mon Jul 19 17:14:15 2004
+++ loncom/interface/lonhtmlcommon.pm Mon Jul 26 17:57:27 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.83 2004/07/19 21:14:15 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.84 2004/07/26 21:57:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1068,10 +1068,6 @@
# if ($bug ne '') {
# $icons .= &Apache::loncommon::help_open_bug($bug);
# }
- if (defined($component_help)) {
- $icons .=
- &Apache::loncommon::help_open_topic($component_help);
- }
$icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug);
if ($icons ne '') {
$Str .= $icons.' ';
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.202 loncom/interface/loncommon.pm:1.203
--- loncom/interface/loncommon.pm:1.202 Wed Jul 21 16:23:34 2004
+++ loncom/interface/loncommon.pm Mon Jul 26 17:57:27 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.202 2004/07/21 20:23:34 albertel Exp $
+# $Id: loncommon.pm,v 1.203 2004/07/26 21:57:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -690,6 +690,19 @@
</script>
<a href="$link" title="$title"><image src="/adm/lonMisc/smallFAQ.gif" border="0" alt="(Help Menu)" /></a>
ENDTEMPLATE
+ if ($component_help) {
+ if (!$text) {
+ $template=&help_open_topic($component_help,undef,$stayOnPage,
+ $width,$height).' '.$template;
+ } else {
+ my $help_text;
+ $help_text=&Apache::lonnet::unescape($topic);
+ $template='<table><tr><td>'.
+ &help_open_topic($component_help,$help_text,$stayOnPage,
+ $width,$height).'</td><td>'.$template.
+ '</td></tr></table>';
+ }
+ }
if ($text ne '') { $template.='</td></tr></table>' };
return $template;
}
Index: loncom/interface/londropadd.pm
diff -u loncom/interface/londropadd.pm:1.116 loncom/interface/londropadd.pm:1.117
--- loncom/interface/londropadd.pm:1.116 Mon Jul 19 13:58:10 2004
+++ loncom/interface/londropadd.pm Mon Jul 26 17:57:27 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.116 2004/07/19 17:58:10 albertel Exp $
+# $Id: londropadd.pm,v 1.117 2004/07/26 21:57:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2291,7 +2291,7 @@
({href=>'/adm/dropadd?action=upload&state=',
text=>"Upload Classlist"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs
- (undef,'Upload Classlist'));
+ (undef,'Upload Classlist','Course_Create_Class_List'));
if (! exists($ENV{'form.state'})) {
&print_first_courselist_upload_form($r);
} elsif ($ENV{'form.state'} eq 'got_file') {
@@ -2310,7 +2310,7 @@
({href=>'/adm/dropadd?action=drop',
text=>"Drop Students"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs
- (undef,'Drop Students'));
+ (undef,'Drop Students','Course_Drop_Student'));
if (! exists($ENV{'form.state'})) {
&print_drop_menu($r);
} elsif ($ENV{'form.state'} eq 'done') {
@@ -2323,7 +2323,7 @@
({href=>'/adm/dropadd?action=enrollstudent',
text=>"Enroll Student"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs
- (undef,'Enroll Student'));
+ (undef,'Enroll Student','Course_Add_Student'));
if (! exists($ENV{'form.state'})) {
&get_student_username_domain_form($r);
} elsif ($ENV{'form.state'} eq 'gotusername') {
@@ -2338,7 +2338,7 @@
({href=>'/adm/dropadd?action=classlist',
text=>"View Classlist"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs
- (undef,'View Classlist'));
+ (undef,'View Classlist','Course_View_Class_List'));
if (! exists($ENV{'form.state'})) {
&print_html_classlist($r,undef);
} elsif ($ENV{'form.state'} eq 'csv') {
@@ -2353,7 +2353,7 @@
({href=>'/adm/dropadd?action=modifystudent',
text=>"Modify Student Data"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs
- (undef,'Modify Student Data'));
+ (undef,'Modify Student Data','Course_Modify_Student_Data'));
if (! exists($ENV{'form.state'})) {
&print_html_classlist($r);
} elsif ($ENV{'form.state'} eq 'selected') {
Index: loncom/interface/lonpreferences.pm
diff -u loncom/interface/lonpreferences.pm:1.47 loncom/interface/lonpreferences.pm:1.48
--- loncom/interface/lonpreferences.pm:1.47 Wed Jul 21 15:51:30 2004
+++ loncom/interface/lonpreferences.pm Mon Jul 26 17:57:27 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.47 2004/07/21 19:51:30 albertel Exp $
+# $Id: lonpreferences.pm,v 1.48 2004/07/26 21:57:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -967,6 +967,7 @@
</head>
ENDHEADER
my $call = undef;
+ my $help = undef;
my $printmenu = 'yes';
foreach my $option (@Options) {
if ($option->{'action'} eq $ENV{'form.action'}) {
@@ -976,11 +977,12 @@
&Apache::lonhtmlcommon::add_breadcrumb
($option->{'breadcrumb'});
}
+ $help=$option->{'help'};
}
}
$r->print(&Apache::loncommon::bodytag('Change Preferences'));
$r->print(&Apache::lonhtmlcommon::breadcrumbs
- (undef,'Change Preferences'));
+ (undef,'Change Preferences',$help));
if (defined($call)) {
$call->($r);
}