--- rat/lonratedt.pm 2005/06/08 18:49:38 1.71
+++ rat/lonratedt.pm 2006/05/30 17:15:10 1.78
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.71 2005/06/08 18:49:38 www Exp $
+# $Id: lonratedt.pm,v 1.78 2006/05/30 17:15:10 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -172,6 +172,9 @@ use Apache::lonsequence;
use Apache::loncommon;
use Apache::lonlocal;
use File::Copy;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
use vars qw(@order @resources @resparms @zombies);
@@ -405,25 +408,31 @@ 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">';
+ my %layout = ('border' => "0");
+ if ($env{'environment.remote'} eq 'off') {
+ $layout{'rows'} = "1,250,*";
+ } else {
+ $layout{'rows'} = "1,70,*";
}
- $r->print(<<ENDDOCUMENT);
-
-<html>
-<head>
-<script language="JavaScript">
+ my $js ='
+<script type="text/javascript">
var flag=0;
-</script>
-</head>
-$frameset
-<frame name=server src="$url/loadonly/ratserver" noresize noscroll>
-<frame name=code src="$url/loadonly/adveditmenu">
-<frame name=mapout src="/adm/rat/map.html">
-</frameset>
-</html>
+</script>';
+
+ my $start_page =
+ &Apache::loncommon::start_page('Edit Sequence',$js,
+ {'frameset' => 1,
+ 'add_entries' => \%layout});
+ my $end_page =
+ &Apache::loncommon::end_page({'frameset' => 1});
+ $r->print(<<ENDDOCUMENT);
+$start_page
+<frame name="server" src="$url/loadonly/ratserver" noresize="noresize"
+ noscroll="noscroll" />
+<frame name="code" src="$url/loadonly/adveditmenu" />
+<frame name="mapout" src="/adm/rat/map.html" />
+$end_page
ENDDOCUMENT
}
@@ -467,7 +476,10 @@ sub getresidx {
sub makezombie {
my $idx=shift;
my ($name,$url,$ext)=split(/\:/,$resources[$idx]);
- $zombies[$idx]=$name.':'.$url.':'.$ext.':zombie';
+ my $now=time;
+ $zombies[$idx]=$name.
+ ' [('.$now.','.$env{'user.name'}.','.$env{'user.domain'}.')]:'.
+ $url.':'.$ext.':zombie';
}
# ----------------------------------------------------------- Paste into target
@@ -479,8 +491,8 @@ sub pastetarget {
foreach (@which) {
if (defined($_)) {
my ($name,$url)=split(/\=/,$_);
- $name=&Apache::lonnet::unescape($name);
- $url=&Apache::lonnet::unescape($url);
+ $name=&unescape($name);
+ $url=&unescape($url);
if ($url) {
my $idx=&getresidx($url);
$insertorder[$#insertorder+1]=$idx;
@@ -686,6 +698,14 @@ function idxopen(mode) {
idx.focus();
}
+// ------------------------------------------------------ Open groupsort window
+function groupopen(url,recover) {
+ var options="scrollbars=1,resizable=1,menubar=0";
+ idxflag=1;
+ idx=open("/adm/groupsort?mode=$mode&recover="+recover+"&readfile="+url,"idxout",options);
+ idx.focus();
+}
+
// --------------------------------------------------------- Open search window
function srchopen(mode) {
var options="scrollbars=1,resizable=1,menubar=0";
@@ -702,6 +722,7 @@ function groupsearch() {
function groupimport() {
idxcheck('groupimport');
}
+
// ------------------------------------------------------- Do srch status check
function srchcheck(mode) {
if (!srch || srch.closed || srchmode!=mode) {
@@ -853,8 +874,8 @@ sub smpedt {
&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
my ($name,$url)=split(/\:/,$_);
if ($url) {
- $importdetail.='&'.&Apache::lonnet::escape($name).'='.
- &Apache::lonnet::escape($url);
+ $importdetail.='&'.&escape($name).'='.
+ &escape($url);
}
}
@@ -900,8 +921,8 @@ sub smpedt {
foreach (@targetselect) {
my ($name,$url)=split(/\:/,$resources[$order[$_-1]]);
if ($url) {
- $importdetail.='&'.&Apache::lonnet::escape($name).'='.
- &Apache::lonnet::escape($url);
+ $importdetail.='&'.&escape($name).'='.
+ &escape($url);
}
}
@@ -988,7 +1009,7 @@ sub smpedt {
my ($name,$url)=split(/\=/,$_);
unless ($name) { $name=(split(/\//,$url))[-1]; }
unless ($name) { $name='EMPTY'; }
- '<option value="'.$idx.'">'.&Apache::lonnet::unescape($name).
+ '<option value="'.$idx.'">'.&unescape($name).
'</option>';
}
} split(/\&/,$importdetail));
@@ -1001,8 +1022,8 @@ sub smpedt {
my ($name,$url)=split(/\:/,$resources[$_]);
unless ($name) { $name=(split(/\//,$url))[-1]; }
unless ($name) { $name='EMPTY'; }
- $targetdetail.='&'.&Apache::lonnet::escape($name).'='.
- &Apache::lonnet::escape($url);
+ $targetdetail.='&'.&escape($name).'='.
+ &escape($url);
$idx++;
$name=~s/\:/\:/g;
'<option value="'.$idx.'">'.$name.'</option>';
@@ -1010,9 +1031,7 @@ sub smpedt {
# ----------------------------------------------------- Start simple RAT screen
my $editscript=&editscript('simple');
- 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',
@@ -1032,11 +1051,10 @@ sub smpedt {
'cs' => 'Cut selected',
'ps' => 'Copy selected',
'pas' => 'Paste after selected',
+ 'reco' => 'Recover Deleted'
);
- $r->print(<<ENDSMPHEAD);
-<html>
-<head>
-<script>
+ my $js=<<ENDJS;
+<script type="text/javascript">
$editscript
@@ -1079,8 +1097,17 @@ sub smpedt {
}
</script>
-</head>
-$bodytag
+ENDJS
+
+ my $start_page = &Apache::loncommon::start_page(undef,$js).
+ &Apache::loncommon::help_open_menu('',
+ 'Sequence_Simple_Editor_Creation',
+ 'Sequence_Simple_Editor_Creation',
+ '',6,'RAT');
+ my $end_page = &Apache::loncommon::end_page();
+
+ $r->print(<<ENDSMPHEAD);
+$start_page
$buttons
<font color=red>$errtext</font>
<form name=simpleedit method=post>
@@ -1111,6 +1138,8 @@ 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'}">
+<input type=button onClick=
+"javascript:impfortarget.value=1;javascript:groupopen('$url',1);" value="$lt{'reco'}">
$lt{'as'}
<hr>
<input type=submit name="moveup" value="$lt{'mu'}">
@@ -1145,29 +1174,27 @@ $targetwindow
<input type=hidden name=targetdetail value="$targetdetail">
<input type=hidden name=impfortarget value="0">
</form>
-</body></html>
+$end_page
ENDSMPHEAD
}
# ----------------------------------------------------------------- No such dir
sub nodir {
my ($r,$dir)=@_;
- $dir=~s/^\/home\/\w+\/public\_html//;
- $r->print(<<ENDNODIR);
-<html>
-<body bgcolor='#FFFFFF'>
-<h1>No such directory: $dir</h1>
-</body>
-</html>
-ENDNODIR
+ $dir=~s{^/home/\w+/public_html}{};
+ $r->print(&Apache::loncommon::start_page(undef,undef,
+ {'only_body' => 1,
+ 'bgcolor' => '#FFFFFF',}).
+ "<h1>No such directory: $dir</h1>".
+ &Apache::loncommon::end_page());
}
# ---------------------------------------------------------------- View Handler
sub viewmap {
my ($r,$url,$adv,$errtext)=@_;
- $r->print('<html>'.
- &Apache::loncommon::bodytag('Edit Content of a Map').
+ $r->print(
+ &Apache::loncommon::start_page('Edit Content of a Map').
&Apache::loncommon::help_open_menu('','','','',6,'RAT').
&buttons($adv));
if ($errtext) {
@@ -1220,7 +1247,7 @@ sub viewmap {
}
}
$r->print('</table>');
- $r->print('</body></html>');
+ $r->print(&Apache::loncommon::end_page());
}
# ================================================================ Main Handler