--- loncom/interface/lonhelper.pm 2004/04/21 19:03:02 1.73
+++ loncom/interface/lonhelper.pm 2004/08/12 07:45:03 1.86
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# .helper XML handler to implement the LON-CAPA helper
#
-# $Id: lonhelper.pm,v 1.73 2004/04/21 19:03:02 albertel Exp $
+# $Id: lonhelper.pm,v 1.86 2004/08/12 07:45:03 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -585,30 +585,6 @@ sub display {
$result .= <<HEADER;
<html>
-<script type="text/javascript" language="Javascript" >
- var editbrowser;
- function openbrowser(formname,elementname,only,omit) {
- var url = '/res/?';
- if (editbrowser == null) {
- url += 'launch=1&';
- }
- url += 'catalogmode=interactive&';
- url += 'mode=parmset&';
- url += 'form=' + formname + '&';
- if (only != null) {
- url += 'only=' + only + '&';
- }
- if (omit != null) {
- url += 'omit=' + omit + '&';
- }
- url += 'element=' + elementname + '';
- var title = 'Browser';
- var options = 'scrollbars=1,resizable=1,menubar=0';
- options += ',width=700,height=600';
- editbrowser = open(url,title,options,'1');
- editbrowser.focus();
- }
-</script>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>$loncapaHelper: $helperTitle</title>
@@ -1295,7 +1271,6 @@ BUTTONS
$choiceLabel = eval($choiceLabel);
$choiceLabel = &$choiceLabel($helper, $self);
}
- &Apache::lonnet::logthis("TITLE TRANSLATION >$choiceLabel<");
$result .= "/></td><td> " . &mtn($choiceLabel) . "</td></tr>\n";
}
$result .= "</table>\n\n\n";
@@ -2114,7 +2089,9 @@ sub render {
for (i=0; i<document.forms.helpform.elements.length; i++) {
comp = document.forms.helpform.elements.chksec.value;
if (document.forms.helpform.elements[i].value.indexOf(':'+comp+':') != -1) {
- document.forms.helpform.elements[i].checked=value;
+ if (document.forms.helpform.elements[i].value.indexOf(':Active') != -1) {
+ document.forms.helpform.elements[i].checked=value;
+ }
}
}
}
@@ -2122,7 +2099,14 @@ sub render {
for (i=0; i<document.forms.helpform.elements.length; i++) {
if (document.forms.helpform.elements[i].value.indexOf(':Active') != -1) {
document.forms.helpform.elements[i].checked=true;
- }
+ }
+ }
+ }
+ function uncheckexpired() {
+ for (i=0; i<document.forms.helpform.elements.length; i++) {
+ if (document.forms.helpform.elements[i].value.indexOf(':Expired') != -1) {
+ document.forms.helpform.elements[i].checked=false;
+ }
}
}
</script>
@@ -2130,16 +2114,18 @@ SCRIPT
my %lt=&Apache::lonlocal::texthash(
'ocs' => "Select Only Current Students",
+ 'ues' => "Unselect Expired Students",
'sas' => "Select All Students",
'uas' => "Unselect All Students",
- 'sfsg' => "Select for Section/Group",
+ 'sfsg' => "Select Current Students for Section/Group",
'ufsg' => "Unselect for Section/Group");
$buttons = <<BUTTONS;
<br />
<input type="button" onclick="checkactive()" value="$lt{'ocs'}" />
+<input type="button" onclick="uncheckexpired()" value="$lt{'ues'}" /><br />
<input type="button" onclick="checkall(true, '$var')" value="$lt{'sas'}" />
-<input type="button" onclick="checkall(false, '$var')" value="$lt{'uas'}" />
+<input type="button" onclick="checkall(false, '$var')" value="$lt{'uas'}" /><br />
<input type="button" onclick="checksec(true)" value="$lt{'sfsg'}">
<input type="text" size="5" name="chksec">
<input type="button" onclick="checksec(false)" value="$lt{'ufsg'}">
@@ -2202,7 +2188,6 @@ BUTTONS
}
my $name = $self->{'coursepersonnel'} ? &mt('Name') : &mt('Student Name');
- &Apache::lonnet::logthis("THE NAME IS >$name<");
my $type = 'radio';
if ($self->{'multichoice'}) { $type = 'checkbox'; }
$result .= "<table cellspacing='2' cellpadding='2' border='0'>\n";
@@ -2476,7 +2461,7 @@ BUTTONS
}
# Sort the fileList into order
- @fileList = sort @fileList;
+ @fileList = sort {lc($a) cmp lc($b)} @fileList;
$result .= $buttons;
@@ -2563,10 +2548,14 @@ sub fileState {
my $constructionSpaceDir = shift;
my $file = shift;
+ my ($uname,$udom)=($ENV{'user.name'},$ENV{'user.domain'});
+ if ($ENV{'request.role'}=~/^ca\./) {
+ (undef,$udom,$uname)=split(/\//,$ENV{'request.role'});
+ }
my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
my $subdirpart = $constructionSpaceDir;
- $subdirpart =~ s/^\/home\/$ENV{'user.name'}\/public_html//;
- my $resdir = $docroot . '/res/' . $ENV{'user.domain'} . '/' . $ENV{'user.name'} .
+ $subdirpart =~ s/^\/home\/$uname\/public_html//;
+ my $resdir = $docroot . '/res/' . $udom . '/' . $uname .
$subdirpart;
my @constructionSpaceFileStat = stat($constructionSpaceDir . '/' . $file);
@@ -2695,6 +2684,7 @@ string honors the validation function, i
no strict;
@ISA = ("Apache::lonhelper::element");
use strict;
+use Apache::lonlocal;
BEGIN {
&Apache::lonhelper::register('Apache::lonhelper::string',
@@ -2813,6 +2803,8 @@ be able to call methods on it.
=cut
+use Apache::lonlocal;
+
BEGIN {
&Apache::lonhelper::register('Apache::lonhelper::general',
'exec', 'condition', 'clause',
@@ -3126,7 +3118,7 @@ sub render {
# Print the granularity, depending on the action
if ($vars->{GRANULARITY} eq 'whole_course') {
- $resourceString .= '<li>'.&mt('for').' <b>'.&mt('all resources in the course').'</b></li>';
+ $resourceString .= '<li>'.&mt('for <b>all resources in the course</b>').'</li>';
$level = 9; # general course, see lonparmset.pm perldoc
$affectedResourceId = "0.0";
$symb = 'a';
@@ -3137,7 +3129,7 @@ sub render {
my $title = $res->compTitle();
$symb = $res->symb();
$navmap->untieHashes();
- $resourceString .= "<li>for the map named <b>$title</b></li>";
+ $resourceString .= '<li>'.&mt('for the map named [_1]',"<b>$title</b>").'</li>';
$level = 8;
$affectedResourceId = $vars->{RESOURCE_ID};
$paramlevel = 'map';
@@ -3147,7 +3139,7 @@ sub render {
$symb = $res->symb();
my $title = $res->compTitle();
$navmap->untieHashes();
- $resourceString .= "<li>for the resource named <b>$title</b></li>";
+ $resourceString .= '<li>'.&mt('for the resource named [_1]',"<b>$title</b>").'</li>';
$level = 7;
$affectedResourceId = $vars->{RESOURCE_ID};
$paramlevel = 'full';
@@ -3165,7 +3157,7 @@ sub render {
$extra = $vars->{WEIGHT};
}
$result .= "<li>";
- my $what = &mt($dateTypeHash{$vars->{ACTION_TYPE}})
+ my $what = &mt($dateTypeHash{$vars->{ACTION_TYPE}});
if ($extra) {
$result .= &mt('Setting the [_1] to [_2]',"<b>$what</b>",$extra);
} else {
@@ -3200,10 +3192,10 @@ sub render {
# Print targets
if ($vars->{TARGETS} eq 'course') {
- $result .= '<li>'.&mt('for').' <b>'.&mt('all students in course').'</b></li>';
+ $result .= '<li>'.&mt('for <b>all students in course</b>').'</li>';
} elsif ($vars->{TARGETS} eq 'section') {
my $section = $vars->{SECTION_NAME};
- $result .= "<li>".&mt('for section')." <b>$section</b></li>";
+ $result .= '<li>'.&mt('for section [_1]',"<b>$section</b>").'</li>';
$level -= 3;
$result .= "<input type='hidden' name='csec' value='" .
HTML::Entities::encode($section,'<>&"') . "' />\n";
@@ -3214,7 +3206,7 @@ sub render {
# Chop off everything after the last colon (section)
$username = substr($username, 0, rindex($username, ':'));
my $name = $classlist->{$username}->[6];
- $result .= "<li>".&mt('for')." <b>$name</b></li>";
+ $result .= '<li>'.&mt('for [_1]',"<b>$name</b>").'</li>';
$level -= 6;
my ($uname, $udom) = split /:/, $vars->{USER_NAME};
$result .= "<input type='hidden' name='uname' value='".
@@ -3225,9 +3217,7 @@ sub render {
# Print value
if ($vars->{ACTION_TYPE} ne 'tries' && $vars->{ACTION_TYPE} ne 'weight') {
- $result .= "<li>".&mt('to')." <b>" . ctime($vars->{PARM_DATE}) . "</b> (" .
- Apache::lonnavmaps::timeToHumanString($vars->{PARM_DATE})
- . ")</li>\n";
+ $result .= '<li>'.&mt('to [_1] ([_2])',"<b>".ctime($vars->{PARM_DATE})."</b>",Apache::lonnavmaps::timeToHumanString($vars->{PARM_DATE}))."</li>\n";
}
# print pres_marker