--- rat/lonratedt.pm 2003/10/21 20:40:10 1.48
+++ rat/lonratedt.pm 2004/11/17 20:14:23 1.63
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.48 2003/10/21 20:40:10 albertel Exp $
+# $Id: lonratedt.pm,v 1.63 2004/11/17 20:14:23 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,10 +25,7 @@
#
# http://www.lon-capa.org/
#
-# (TeX Content Handler
-#
-# 05/29/00,05/30 Gerd Kortemeyer)
-# 7/1,6/30 Gerd Kortemeyer
+
package Apache::lonratedt;
@@ -176,7 +173,7 @@ use Apache::loncommon;
use Apache::lonlocal;
use File::Copy;
-use vars qw(@order @resources);
+use vars qw(@order @resources @resparms);
# Mapread read maps into global arrays @links and @resources, determines status
@@ -190,8 +187,10 @@ sub mapread {
undef @links;
undef @resources;
undef @order;
+ undef @resparms;
@resources=('');
@order=();
+ @resparms=();
my ($outtext,$errtext)=&Apache::lonratsrv::loadmap($fn,'');
if ($errtext) { return ($errtext,2); }
@@ -206,7 +205,11 @@ sub mapread {
$links[$number]=$content;
}
if ($command eq 'objparms') {
- return('Map has resource parameters. Use advanced editor.',1);
+ if ($resparms[$number]) {
+ $resparms[$number].='&&&'.$content;
+ } else {
+ $resparms[$number]=$content;
+ }
}
}
# ------------------------------------------------------- Is this a linear map?
@@ -220,13 +223,13 @@ sub mapread {
my ($start,$end,$cond)=split(/\:/,$_);
if ((defined($starters[$start])) || (defined($endings[$end]))) {
return
- ('Map has branchings. Use advanced editor.',1);
+ (&mt('Map has branchings. Use advanced editor.'),1);
}
$starters[$start]=1;
$endings[$end]=1;
if ($cond) {
return
- ('Map has conditions. Use advanced editor.',1);
+ (&mt('Map has conditions. Use advanced editor.'),1);
}
}
@@ -235,7 +238,7 @@ sub mapread {
if (defined($resources[$i])) {
unless (($starters[$i]) || ($endings[$i])) {
return
- ('Map has unconnected resources. Use advanced editor.',1);
+ (&mt('Map has unconnected resources. Use advanced editor.'),1);
}
}
}
@@ -390,6 +393,10 @@ sub attemptread {
# --------------------------------------------------------- Build up RAT screen
sub ratedt {
my ($r,$url)=@_;
+ my $frameset = '<frameset rows="1,70,*" border="0">';
+ if ($ENV{'environment.remote'} eq 'off') {
+ $frameset = '<frameset rows="1,250,*" border="0">';
+ }
$r->print(<<ENDDOCUMENT);
<html>
@@ -398,9 +405,9 @@ sub ratedt {
var flag=0;
</script>
</head>
-<frameset rows="1,50,*" border=0>
+$frameset
<frame name=server src="$url/loadonly/ratserver" noresize noscroll>
-<frame name=code src="/adm/rat/code.html">
+<frame name=code src="$url/loadonly/adveditmenu">
<frame name=mapout src="/adm/rat/map.html">
</frameset>
</html>
@@ -414,12 +421,15 @@ sub buttons {
my $adv=shift;
my $output='<form method=post>';
if ($adv==1) {
- $output.='<input type=submit name=forceadv value="Edit">';
+ $output.='<input type=submit name=forceadv value="'.&mt('Edit').'">'.
+ &Apache::loncommon::help_open_topic('Sequence_Advanced_Editor_Creation');;
} else {
unless ($adv==2) {
- $output.='<input type=submit name=forcesmp value="Simple Edit">';
+ $output.='<input type=submit name=forcesmp value="'.&mt('Simple Edit').'">'.
+ &Apache::loncommon::help_open_topic('Sequence_Simple_Editor_Creation');
}
- $output.='<input type=submit name=forceadv value="Advanced Edit">';
+ $output.='<input type=submit name=forceadv value="'.&mt('Advanced Edit').'">'.
+ &Apache::loncommon::help_open_topic('Sequence_Advanced_Editor_Creation');
}
return $output.'</form><hr>';
}
@@ -511,6 +521,13 @@ sub storemap {
if (defined($resources[$order[$i]])) {
$output.='<&>objcont<:>'.$order[$i].'<:>'.$resources[$order[$i]];
}
+ if (defined($resparms[$order[$i]])) {
+ foreach (split('&&&',$resparms[$order[$i]])) {
+ if ($_) {
+ $output.='<&>objparms<:>'.$order[$i].'<:>'.$_;
+ }
+ }
+ }
if (defined($order[$i+1])) {
if (defined($resources[$order[$i+1]])) {
$output.='<&>objlinks<:>'.$k.'<:>'.
@@ -525,8 +542,61 @@ sub storemap {
&Apache::lonratsrv::loadmap($fn,&Apache::lonratsrv::savemap($fn,''));
}
+# ------------------------------------------ Store and get parameters in global
+
+sub storeparameter {
+ my ($to,$name,$value,$ptype)=@_;
+ my $newentry='';
+ my $nametype='';
+ foreach (split('&&&',$resparms[$to])) {
+ my ($thistype,$thisname,$thisvalue)=split('___',$_);
+ if ($thisname) {
+ unless ($thisname eq $name) {
+ $newentry.=$_.'&&&';
+ } else {
+ $nametype=$thistype;
+ }
+ }
+ }
+ unless ($ptype) { $ptype=$nametype; }
+ unless ($ptype) { $ptype='string'; }
+ $newentry.=$ptype.'___'.$name.'___'.$value;
+ $resparms[$to]=$newentry;
+}
+
+sub delparameter {
+ my ($to,$name)=@_;
+ my $newentry='';
+ my $nametype='';
+ foreach (split('&&&',$resparms[$to])) {
+ my ($thistype,$thisname,$thisvalue)=split('___',$_);
+ if ($thisname) {
+ unless ($thisname eq $name) {
+ $newentry.=$_.'&&&';
+ }
+ }
+ }
+ $resparms[$to]=$newentry;
+}
+
+sub getparameter {
+ my ($to,$name)=@_;
+ my $value=undef;
+ my $ptype=undef;
+ foreach (split('&&&',$resparms[$to])) {
+ my ($thistype,$thisname,$thisvalue)=split('___',$_);
+ if ($thisname eq $name) {
+ $value=$thisvalue;
+ $ptype=$thistype;
+ }
+ }
+ return ($value,$ptype);
+}
+
+# ----------------------------------------------------------------- Edit script
sub editscript {
my $mode=shift;
+ my $resurl=&Apache::loncommon::lastresurl();
return(<<ENDSCRIPT);
var srch;
var srchflag=-1; // 1 means currently open
@@ -571,7 +641,7 @@ function idxopen(mode) {
var options="scrollbars=1,resizable=1,menubar=0";
idxmode=mode;
idxflag=1;
- idx=open("/res/?launch=1&mode=$mode&catalogmode="+mode,"idxout",options);
+ idx=open("$resurl/?launch=1&mode=$mode&catalogmode="+mode,"idxout",options);
idx.focus();
}
@@ -610,7 +680,7 @@ function idxcheck(mode) {
var editbrowser;
function openbrowser(formname,elementname,only,omit) {
- var url = '/res/?';
+ var url = '$resurl/?';
if (editbrowser == null) {
url += 'launch=1&';
}
@@ -640,21 +710,25 @@ sub smpedt {
my $tmpfn=&Apache::lonnet::filelocation('',$url).'.tmp';
my $targetmsg='';
if ($ENV{'form.save'}) {
- $targetmsg='<b>Saving ...</b><br>';
copy($tmpfn,&Apache::lonnet::filelocation('',$url));
unlink($tmpfn);
my ($errtext,$fatal)=
&mapread(&Apache::lonnet::filelocation('',$url),'');
+ unless ($fatal) {
+ $targetmsg='<b>'.&mt('Saved.').'</b><br />';
+ } else {
+ $targetmsg='<b>'.&mt('An error occured while saving.').'</b><br />';
+ }
}
if ($ENV{'form.revert'}) {
- $targetmsg='<b>Reverting ...</b><br>';
+ $targetmsg='<b>'.&mt('Reverted.').'</b><br />';
unlink($tmpfn);
my ($errtext,$fatal)=
&mapread(&Apache::lonnet::filelocation('',$url),'');
}
if (-e $tmpfn) {
$targetmsg=
- '<b><font color="red">You are working with an unsaved version of your map.</font></b><br>';
+ '<b><font color="red">'.&mt('You are working with an unsaved version of your map.').'</font></b><br>';
my ($errtext,$fatal)=&mapread($tmpfn,'');
}
# ---------------------------------------------------------- Process form input
@@ -878,7 +952,7 @@ sub smpedt {
$importdetail='&'.$importdetail;
$importdetail=~s/^\&+/\&/;
my $importwindow=
- '<option value="-1"> ---- Import and Paste Area ---- </option>'.
+ '<option value="-1"> ---- '.&mt('Import and Paste Area').' ---- </option>'.
join("\n",map {
$idx++;
if ($_) {
@@ -893,7 +967,7 @@ sub smpedt {
$idx=0;
$targetdetail='';
my $targetwindow=
- '<option value="0"> ------- Target Edit Map ------- </option>'.
+ '<option value="0"> ------- '.&mt('Target Edit Map').' ------- </option>'.
join("\n",map {
my ($name,$url)=split(/\:/,$resources[$_]);
unless ($name) { $name=(split(/\//,$url))[-1]; }
@@ -907,7 +981,9 @@ sub smpedt {
# ----------------------------------------------------- Start simple RAT screen
my $editscript=&editscript('simple');
- my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
+ my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,
+ ($ENV{'environment.remote'} ne 'off')).
+ &Apache::loncommon::help_open_menu('','Sequence_Simple_Editor_Creation','Sequence_Simple_Editor_Creation','',6,'RAT');
my %lt=&Apache::lonlocal::texthash(
'sa' => 'Save',
'nt' => 'New Title',
@@ -923,6 +999,10 @@ sub smpedt {
'mu' => 'Move Up',
'md' => 'Move Down',
're' => 'Rename',
+ 'as' => 'after selected',
+ 'cs' => 'Cut selected',
+ 'ps' => 'Copy selected',
+ 'pas' => 'Paste after selected',
);
$r->print(<<ENDSMPHEAD);
<html>
@@ -986,7 +1066,7 @@ $buttons
<tr><td bgcolor="#FFFFCC">
<input type=button onClick="javascript:groupsearch()" value="$lt{'se'}">
<input type=button onClick="javascript:groupimport();" value="$lt{'im'}">
-after selected
+$lt{'as'}
<hr>
<input type=text size=20 name=importmap>
<input type=button
@@ -1002,7 +1082,7 @@ value="Select Map"><input type=submit na
"javascript:impfortarget.value=1;groupsearch()" value="$lt{'se'}">
<input type=button onClick=
"javascript:impfortarget.value=1;groupimport();" value="$lt{'im'}">
-after selected
+$lt{'as'}
<hr>
<input type=submit name="moveup" value="$lt{'mu'}">
<input type=submit name="movedown" value="$lt{'md'}">
@@ -1018,13 +1098,13 @@ $importwindow
</select>
</td>
<td bgcolor="#FFFFAA" align="center">
-Cut selected<br>
+$lt{'cs'}<br>
<input type=submit name=cut value='<<<'><p>
<hr>
-Copy selected<br>
+$lt{'ps'}<br>
<input type=submit name=copy value='<--'><p>
<hr>
-Paste after selected<br>
+$lt{'pas'}<br>
<input type=submit name=paste value='-->'>
</td>
<td bgcolor="#FFFFCC"><select name="target" size=10 multiple>
@@ -1059,9 +1139,10 @@ sub viewmap {
my ($r,$url,$adv,$errtext)=@_;
$r->print('<html>'.
&Apache::loncommon::bodytag('Edit Content of a Map').
- &buttons($adv));
+ &Apache::loncommon::help_open_menu('','','','',6,'RAT').
+ &buttons($adv));
if ($errtext) {
- $r->print($errtext.'<hr>');
+ $r->print($errtext.'<hr />');
}
my $idx=0;
$r->print('<h1>'.$url.'</h1>');
@@ -1071,7 +1152,8 @@ sub viewmap {
foreach (&attemptread(&Apache::lonnet::filelocation('',$url))) {
if (defined($_)) {
$idx++;
- my ($title,$url)=split(/\:/,$_);
+ my ($title,$url,$cond)=split(/\:/,$_);
+ if ($cond eq 'cond') { next; }
$title=~s/\&colon\;/\:/g;
$url=~s/\&colon\;/\:/g;
unless ($title) { $title=(split(/\//,$url))[-1] };
@@ -1081,7 +1163,7 @@ sub viewmap {
}
$r->print(&Apache::lonratsrv::qtescape($title));
if ($url) { $r->print('</a>'); }
- $r->print('<br>');
+ $r->print("<br />\n");
}
}
$r->print('</body></html>');