--- loncom/interface/lonhelper.pm 2004/03/08 17:31:37 1.65
+++ loncom/interface/lonhelper.pm 2004/04/20 15:08:26 1.69
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# .helper XML handler to implement the LON-CAPA helper
#
-# $Id: lonhelper.pm,v 1.65 2004/03/08 17:31:37 www Exp $
+# $Id: lonhelper.pm,v 1.69 2004/04/20 15:08:26 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -263,21 +263,8 @@ sub real_handler {
# Send header, don't cache this page
- if ($r->header_only) {
- if ($ENV{'browser.mathml'}) {
- $r->content_type('text/xml; charset=UTF-8');
- } else {
- $r->content_type('text/html; charset=UTF-8');
- }
- $r->send_http_header;
- return OK;
- }
- if ($ENV{'browser.mathml'}) {
- $r->content_type('text/xml');
- } else {
- $r->content_type('text/html');
- }
- $r->send_http_header;
+
+ if (&Apache::lonhomework::setupheader($r)) { return OK; }
$r->rflush();
# Discard result, we just want the objects that get created by the
@@ -462,11 +449,11 @@ sub _saveVars {
my $self = shift;
my $result = "";
$result .= '<input type="hidden" name="CURRENT_STATE" value="' .
- HTML::Entities::encode($self->{STATE}) . "\" />\n";
+ HTML::Entities::encode($self->{STATE},'<>&"') . "\" />\n";
$result .= '<input type="hidden" name="TOKEN" value="' .
$self->{TOKEN} . "\" />\n";
$result .= '<input type="hidden" name="RETURN_PAGE" value="' .
- HTML::Entities::encode($self->{RETURN_PAGE}) . "\" />\n";
+ HTML::Entities::encode($self->{RETURN_PAGE},'<>&"') . "\" />\n";
return $result;
}
@@ -583,7 +570,7 @@ sub display {
}
# Phase 4: Display.
- my $stateTitle = &mt($state->title());
+ my $stateTitle=&mt($state->title());
my $helperTitle = &mt($self->{TITLE});
my $bodytag = &Apache::loncommon::bodytag($helperTitle,'','');
my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"');
@@ -593,6 +580,30 @@ 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>
@@ -998,8 +1009,8 @@ sub start_message {
return '';
}
- $paramHash->{MESSAGE_TEXT} = &Apache::lonxml::get_all_text('/message',
- $parser);
+ $paramHash->{MESSAGE_TEXT} = &mtn(&Apache::lonxml::get_all_text('/message',
+ $parser));
if (defined($token->[2]{'nextstate'})) {
$paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
@@ -1169,8 +1180,8 @@ sub start_choice {
}
my $computer = $token->[2]{'computer'};
- my $human = &Apache::lonxml::get_all_text('/choice',
- $parser);
+ my $human = &mt(&Apache::lonxml::get_all_text('/choice',
+ $parser));
my $nextstate = $token->[2]{'nextstate'};
my $evalFlag = $token->[2]{'eval'};
push @{$paramHash->{CHOICES}}, [$human, $computer, $nextstate,
@@ -1206,10 +1217,13 @@ SCRIPT
# Only print "select all" and "unselect all" if there are five or
# more choices; fewer then that and it looks silly.
if ($self->{'multichoice'} && scalar(@{$self->{CHOICES}}) > 4) {
+ my %lt=&Apache::lonlocal::texthash(
+ 'sa' => "Select All",
+ 'ua' => "Unselect All");
$buttons = <<BUTTONS;
<br />
-<input type="button" onclick="checkall(true, '$var')" value="Select All" />
-<input type="button" onclick="checkall(false, '$var')" value="Unselect All" />
+<input type="button" onclick="checkall(true, '$var')" value="$lt{'sa'}" />
+<input type="button" onclick="checkall(false, '$var')" value="$lt{'ua'}" />
<br />
BUTTONS
}
@@ -1264,7 +1278,7 @@ BUTTONS
$result .= "<tr>\n<td width='20'> </td>\n";
$result .= "<td valign='top'><input type='$type' name='$var.forminput'"
. "' value='" .
- HTML::Entities::encode($choice->[1])
+ HTML::Entities::encode($choice->[1],'<>&"')
. "'";
if ($checkedChoices{$choice->[1]}) {
$result .= " checked ";
@@ -1276,6 +1290,7 @@ 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";
@@ -1419,7 +1434,7 @@ sub render {
$result .= "<select name='${var}.forminput'>\n";
foreach my $choice (@{$self->{CHOICES}}) {
$result .= "<option value='" .
- HTML::Entities::encode($choice->[1])
+ HTML::Entities::encode($choice->[1],'<>&"')
. "'";
if ($checkedChoices{$choice->[1]}) {
$result .= " selected";
@@ -1777,6 +1792,7 @@ sub start_resource {
$paramHash->{'suppressEmptySequences'} = $token->[2]{'suppressEmptySequences'};
$paramHash->{'toponly'} = $token->[2]{'toponly'};
$paramHash->{'addstatus'} = $token->[2]{'addstatus'};
+ $paramHash->{'closeallpages'} = $token->[2]{'closeallpages'};
return '';
}
@@ -1892,10 +1908,14 @@ sub render {
}
</script>
SCRIPT
+ my %lt=&Apache::lonlocal::texthash(
+ 'sar' => "Select All Resources",
+ 'uar' => "Unselect All Resources");
+
$buttons = <<BUTTONS;
<br />
-<input type="button" onclick="checkall(true, '$var')" value="Select All Resources" />
-<input type="button" onclick="checkall(false, '$var')" value="Unselect All Resources" />
+<input type="button" onclick="checkall(true, '$var')" value="$lt{'sar'}" />
+<input type="button" onclick="checkall(false, '$var')" value="$lt{'uar'}" />
<br />
BUTTONS
}
@@ -1945,7 +1965,7 @@ BUTTONS
$checked = 1;
}
$col .= "value='" .
- HTML::Entities::encode(&$valueFunc($resource))
+ HTML::Entities::encode(&$valueFunc($resource),'<>&"')
. "' /></td>";
return $col;
}
@@ -1962,6 +1982,7 @@ BUTTONS
'showParts' => 0,
'filterFunc' => $filterFunc,
'resource_no_folder_link' => 1,
+ 'closeAllPages' => $self->{'closeallpages'},
'suppressEmptySequences' => $self->{'suppressEmptySequences'},
'iterator_map' => $mapUrl }
);
@@ -2102,16 +2123,21 @@ sub render {
</script>
SCRIPT
- my $selectAllStudents = &mt('Select All Students');
- my $unselectAllStudents = &mt('Unselect All Students');
+ my %lt=&Apache::lonlocal::texthash(
+ 'ocs' => "Select Only Current Students",
+ 'sas' => "Select All Students",
+ 'uas' => "Unselect All Students",
+ 'sfsg' => "Select for Section/Group",
+ 'ufsg' => "Unselect for Section/Group");
+
$buttons = <<BUTTONS;
<br />
-<input type="button" onclick="checkactive()" value="Select Only Current Students" />
-<input type="button" onclick="checkall(true, '$var')" value="$selectAllStudents" />
-<input type="button" onclick="checkall(false, '$var')" value="$unselectAllStudents" />
-<input type="button" onclick="checksec(true)" value="Select for Section/Group">
+<input type="button" onclick="checkactive()" value="$lt{'ocs'}" />
+<input type="button" onclick="checkall(true, '$var')" value="$lt{'sas'}" />
+<input type="button" onclick="checkall(false, '$var')" value="$lt{'uas'}" />
+<input type="button" onclick="checksec(true)" value="$lt{'sfsg'}">
<input type="text" size="5" name="chksec">
-<input type="button" onclick="checksec(false)" value="Unselect for Section/Group">
+<input type="button" onclick="checksec(false)" value="$lt{'ufsg'}">
<br />
BUTTONS
}
@@ -2170,15 +2196,16 @@ BUTTONS
}
}
- my $name = &mt($self->{'coursepersonnel'} ? 'Name' : 'Student Name');
+ 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";
$result .= "<tr><td></td><td align='center'><b>$name</b></td>".
"<td align='center'><b>" . &mt('Section') . "</b></td>" .
- "<td align='center'><b>Status</b></td>" .
- "<td align='center'><b>" . &mt("Role") . "</b></td></tr>" .
- "<td align='center'><b>Username:Domain</b></td></tr>";
+ "<td align='center'><b>".&mt('Status')."</b></td>" .
+ "<td align='center'><b>" . &mt("Role") . "</b></td>" .
+ "<td align='center'><b>".&mt('Username').":".&mt('Domain')."</b></td></tr>";
my $checked = 0;
for my $choice (@$choices) {
@@ -2190,17 +2217,17 @@ BUTTONS
$checked = 1;
}
$result .=
- " value='" . HTML::Entities::encode($choice->[0] . ':' . $choice->[2] . ':' . $choice->[1] . ':' . $choice->[3])
+ " value='" . HTML::Entities::encode($choice->[0] . ':' . $choice->[2] . ':' . $choice->[1] . ':' . $choice->[3],'<>&"')
. "' /></td><td>"
- . HTML::Entities::encode($choice->[1])
+ . HTML::Entities::encode($choice->[1],'<>&"')
. "</td><td align='center'>"
- . HTML::Entities::encode($choice->[2])
+ . HTML::Entities::encode($choice->[2],'<>&"')
. "</td>\n<td>"
- . HTML::Entities::encode($choice->[3])
+ . HTML::Entities::encode($choice->[3],'<>&"')
. "</td>\n<td>"
- . HTML::Entities::encode($choice->[4])
+ . HTML::Entities::encode($choice->[4],'<>&"')
. "</td>\n<td>"
- . HTML::Entities::encode($choice->[0])
+ . HTML::Entities::encode($choice->[0],'<>&"')
. "</td></tr>\n";
}
@@ -2401,20 +2428,22 @@ sub render {
}
</script>
SCRIPT
- my $selectAllFiles = &mt("Select All Files");
- my $unselectAllFiles = &mt("Unselect All Files");
- $buttons = <<BUTTONS;
+ my %lt=&Apache::lonlocal::texthash(
+ 'saf' => "Select All Files",
+ 'uaf' => "Unselect All Files");
+ $buttons = <<BUTTONS;
<br />
-<input type="button" onclick="checkall(true, '$var')" value="$selectAllFiles" />
-<input type="button" onclick="checkall(false, '$var')" value="$unselectAllFiles" />
+<input type="button" onclick="checkall(true, '$var')" value="$lt{'saf'}" />
+<input type="button" onclick="checkall(false, '$var')" value="$lt{'uaf'}" />
BUTTONS
- my $selectAllPublished = &mt("Select All Published");
- my $unselectAllPublished= &mt("UnselectAllPublished");
+ %lt=&Apache::lonlocal::texthash(
+ 'sap' => "Select All Published",
+ 'uap' => "Unselect All Published");
if ($helper->{VARS}->{'construction'}) {
- $buttons .= <<BUTTONS;
-<input type="button" onclick="checkallclass(true, 'Published')" value="$selectAllPublished" />
-<input type="button" onclick="checkallclass(false, 'Published')" value="$unselectAllPublished" />
+ $buttons .= <<BUTTONS;
+<input type="button" onclick="checkallclass(true, 'Published')" value="$lt{'sap'}" />
+<input type="button" onclick="checkallclass(false, 'Published')" value="$lt{'uap'}" />
<br />
BUTTONS
}
@@ -2496,7 +2525,7 @@ BUTTONS
}
$result .= '<tr><td align="right"' . " bgcolor='$color'>" .
"<input $onclick type='$type' name='" . $var
- . ".forminput' value='" . HTML::Entities::encode($fileName) .
+ . ".forminput' value='" . HTML::Entities::encode($fileName,'<>&"').
"'";
if (!$self->{'multichoice'} && $choices == 0) {
$result .= ' checked';
@@ -3040,6 +3069,7 @@ package Apache::lonhelper::parmwizfinal;
no strict;
@ISA = ('Apache::lonhelper::element');
use strict;
+use Apache::lonlocal;
BEGIN {
&Apache::lonhelper::register('Apache::lonhelper::parmwizfinal',
@@ -3119,7 +3149,7 @@ sub render {
}
my $result = "<form name='helpform' method='get' action='/adm/parmset#$affectedResourceId&$parm_name&$level'>\n";
- $result .= '<p>Confirm that this information is correct, then click "Finish Helper" to complete setting the parameter.<ul>';
+ $result .= '<p>'.&mt('Confirm that this information is correct, then click "Finish Helper" to complete setting the parameter.').'<ul>';
# Print the type of manipulation:
$result .= '<li>Setting the <b>' . $dateTypeHash{$vars->{ACTION_TYPE}} . '</b>';
@@ -3164,7 +3194,7 @@ sub render {
$result .= "<li>for section <b>$section</b></li>";
$level -= 3;
$result .= "<input type='hidden' name='csec' value='" .
- HTML::Entities::encode($section) . "' />\n";
+ HTML::Entities::encode($section,'<>&"') . "' />\n";
} else {
# FIXME: This is probably wasteful! Store the name!
my $classlist = Apache::loncoursedata::get_classlist();
@@ -3176,9 +3206,9 @@ sub render {
$level -= 6;
my ($uname, $udom) = split /:/, $vars->{USER_NAME};
$result .= "<input type='hidden' name='uname' value='".
- HTML::Entities::encode($uname) . "' />\n";
+ HTML::Entities::encode($uname,'<>&"') . "' />\n";
$result .= "<input type='hidden' name='udom' value='".
- HTML::Entities::encode($udom) . "' />\n";
+ HTML::Entities::encode($udom,'<>&"') . "' />\n";
}
# Print value