Menu
▾
▴
[WWcvs] webwork-modperl: Modifications which replace SetsAssignedToUsers.pm by
|
From: Mike G. v. a. <we...@ma...> - 2005-12-26 22:10:05
|
Log Message:
-----------
Modifications which replace SetsAssignedToUsers.pm by UserDetail.pm
Added instructor help link to the links in the left margin.
There is no specific student help link.
Added some more configuration variables to Constants.pm
Modified Files:
--------------
webwork-modperl/lib/WeBWorK:
Constants.pm
ContentGenerator.pm
URLPath.pm
Revision Data
-------------
Index: ContentGenerator.pm
===================================================================
RCS file: /webwork/cvs/system/webwork-modperl/lib/WeBWorK/ContentGenerator.pm,v
retrieving revision 1.161
retrieving revision 1.162
diff -Llib/WeBWorK/ContentGenerator.pm -Llib/WeBWorK/ContentGenerator.pm -u -r1.161 -r1.162
--- lib/WeBWorK/ContentGenerator.pm
+++ lib/WeBWorK/ContentGenerator.pm
@@ -700,7 +700,7 @@
if ($authz->hasPermissions($userID, "manage_course_files")) {
print CGI::li(&$makelink("${pfx}Config", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
}
-
+ print CGI::li( $self->helpMacro('instructor_links','Help'),$self->help() );
print CGI::end_ul();
print CGI::end_li(); # end Instructor Tools
} # /* access_instructor_tools */
@@ -715,13 +715,16 @@
print CGI::end_li(); # end Courses
print CGI::end_ul();
+
+ print CGI::start_ul();
if (exists $ce->{webworkURLs}{bugReporter} and $ce->{webworkURLs}{bugReporter} ne ""
- and $authz->hasPermissions($userID, "report_bugs")) {
- print CGI::start_ul();
- print CGI::li(CGI::a({style=>"font-size:larger", href=>$ce->{webworkURLs}{bugReporter}}, "Report bugs"));
- print CGI::end_ul();
+ and $authz->hasPermissions($userID, "report_bugs")) {
+ print CGI::li(CGI::a({style=>'font-size:larger', href=>$ce->{webworkURLs}{bugReporter}}, "Report bugs"));
}
+ print CGI::end_ul();
+
+
return "";
}
@@ -1274,16 +1277,18 @@
sub helpMacro {
my $self = shift;
my $name = shift;
+ my $label = shift; #optional
my $ce = $self->r->ce;
my $basePath = $ce->{webworkDirs}->{local_help};
$name = 'no_help' unless -e "$basePath/$name.html";
my $path = "$basePath/$name.html";
my $url = $ce->{webworkURLs}->{local_help}."/$name.html";
my $imageURL = $ce->{webworkURLs}->{htdocs}."/images/question_mark.png";
+ $label = CGI::img({src=>$imageURL, alt=>" ? "}) unless defined $label;
return CGI::a({href => $url,
target => 'ww_help',
- onclick => "window.open(this.href,this.target,'width=550,height=350,scrollbars=yes,resizable=on')"},
- CGI::img({src=>$imageURL, alt=>" ? "}));
+ onclick => "window.open(this.href,this.target,'width=550,height=350,scrollbars=yes,resizable=yes')"},
+ $label);
}
=item optionsMacro(options_to_show => \@options_to_show, extra_params => \@extra_params)
Index: URLPath.pm
===================================================================
RCS file: /webwork/cvs/system/webwork-modperl/lib/WeBWorK/URLPath.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -Llib/WeBWorK/URLPath.pm -Llib/WeBWorK/URLPath.pm -u -r1.28 -r1.29
--- lib/WeBWorK/URLPath.pm
+++ lib/WeBWorK/URLPath.pm
@@ -262,7 +262,7 @@
display => 'WeBWorK::ContentGenerator::Instructor::UserList',
},
instructor_user_detail => {
- name => '$userID',
+ name => 'Sets assigned to $userID',
parent => 'instructor_user_list',
kids => [ qw/instructor_sets_assigned_to_user/ ],
match => qr|^([^/]+)/|,
Index: Constants.pm
===================================================================
RCS file: /webwork/cvs/system/webwork-modperl/lib/WeBWorK/Constants.pm,v
retrieving revision 1.35
retrieving revision 1.36
diff -Llib/WeBWorK/Constants.pm -Llib/WeBWorK/Constants.pm -u -r1.35 -r1.36
--- lib/WeBWorK/Constants.pm
+++ lib/WeBWorK/Constants.pm
@@ -31,7 +31,7 @@
# If true, WeBWorK::Debug will print debugging output.
#
-$WeBWorK::Debug::Enabled = 0;
+$WeBWorK::Debug::Enabled = 1;
# If non-empty, debugging output will be sent to the file named rather than STDERR.
#
@@ -51,7 +51,7 @@
# For example, this pattern allow only some function being worked on to log:
# $WeBWorK::Debug::AllowSubroutineOutput = qr/^WeBWorK::SomePkg::myFunc$/;
#
-$WeBWorK::Debug::AllowSubroutineOutput = undef;
+$WeBWorK::Debug::AllowSubroutineOutput = qr/^WeBWorK::ContentGenerator::Instructor::UserDetail::initialize$/;
################################################################################
# WeBWorK::ContentGenerator::Hardcopy
@@ -209,18 +209,28 @@
min => 1,
values => ["plainText", "formattedText", "images", "jsMath", "asciimath"],
type => 'checkboxlist'},
+
+ { var => 'pg{options}{displayMode} ',
+ doc => 'The default display mode',
+ doc2 => 'Enter one of the allowed display mode types above. See \'display modes entry\' for descriptions.',
+ min => 1,
+ type => 'text'},
+
{ var => 'pg{ansEvalDefaults}{useBaseTenLog}',
doc => 'Use log base 10 instead of base <i>e</i>',
doc2 => 'Set to true for log to mean base 10 log and false for log to mean natural logarithm',
type => 'boolean'},
+
{ var => 'pg{ansEvalDefaults}{useOldAnswerMacros}',
doc => 'Use older answer checkers',
doc2 => 'During summer 2005, a newer version of the answer checkers was implemented for answers which are functions and numbers. The newer checkers allow more functions in student answers, and behave better in certain cases. Some problems are specifically coded to use new (or old) answer checkers. However, for the bulk of the problems, you can choose what the default will be here. <p>Choosing <i>false</i> here means that the newer answer checkers will be used by default, and choosing <i>true</i> means that the old answer checkers will be used by default.',
type => 'boolean'},
+
{ var => 'pg{ansEvalDefaults}{defaultDisplayMatrixStyle}',
doc => 'Control string for displaying matricies',
doc2 => 'String of three characters for defining the defaults for displaying matricies. The first and last characters give the left and right delimiters of the matrix, so usually one of ([| for a left delimiter, and one of )]| for the right delimiter. It is also legal to specify "." for no delimiter. <p> The middle character indicates how to display vertical lines in a matrix (e.g., for an augmented matrix). This can be s for solid lines and d for dashed lines. While you can specify the defaults, individual problems may override these values.',
type => 'text'},
+
{ var => 'pg{ansEvalDefaults}{numRelPercentTolDefault}',
doc => 'Allowed error, as a percentage, for numerical comparisons',
doc2 => "When numerical answers are checked, most test if the student's answer
@@ -265,9 +275,14 @@
doc => 'E-mail addresses which can recieve e-mail from a pg problem',
doc2 => 'List of e-mail addresses to which e-mail can be sent by a problem. Professors need to be added to this list if questionaires are used, or other WeBWorK problems which send e-mail as part of their answer mechanism.',
type => 'list'},
+ { var => 'permissionLevels{receive_feedback}',
+ doc => 'E-mail feedback from students automatically sent to this permission level and higher:',
+ doc2 => 'Users with this permssion level or greater will automatically be sent feedback from students (generated when they use the "Contact instructor" button on any problem page). In addition the feedback message will be sent to addresses listed below. To send ONLY to addresses listed below set permission level to "nobody".',
+ type => 'permission'},
+
{ var => 'mail{allowedFeedback}',
- doc => 'Extra addresses for recieving feedback e-mail',
- doc2 => 'By default, feeback is sent to all users who have permission to receive feedback. If this list is non-empty, feedback is also sent to the addresses specified here.',
+ doc => 'Additional addresses for receiving feedback e-mail.',
+ doc2 => 'By default, feeback is sent to all users above who have permission to receive feedback. Feedback is also sent to any addresses specified in this blank. (Separate email address entries by commas.',
type => 'list'},
]
];
|
