--- rat/lonratedt.pm 2010/08/20 08:13:38 1.100
+++ rat/lonratedt.pm 2013/06/05 14:50:15 1.105.2.5
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.100 2010/08/20 08:13:38 wenzelju Exp $
+# $Id: lonratedt.pm,v 1.105.2.5 2013/06/05 14:50:15 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -43,8 +43,12 @@ use HTML::Entities();
# --------------------------------------------------------- Build up RAT screen
sub ratedt {
my ($r,$url)=@_;
- my %layout = ('border' => "0",
- 'rows' => "1,250,*");
+ my %layout = ('border' => "0");
+ if ($env{'environment.remote'} eq 'off') {
+ $layout{'rows'} = "1,250,*";
+ } else {
+ $layout{'rows'} = "1,70,*";
+ }
my $js ='
<script type="text/javascript">
var flag=0;
@@ -72,7 +76,7 @@ ENDDOCUMENT
sub buttons {
my $adv=shift;
- my $output='<form method="post">';
+ my $output='<form method="post" action="">';
if ($adv==1) {
$output.=
'<input type="submit" name="forceadv"'
@@ -151,10 +155,10 @@ function idxopen(mode) {
}
// ------------------------------------------------------ Open groupsort window
-function groupopen(url,recover,bookmarks) {
+function groupopen(url,recover) {
var options="scrollbars=1,resizable=1,menubar=0";
idxflag=1;
- idx=open("/adm/groupsort?inhibitmenu=yes&mode=$mode&recover="+recover+"&readfile="+url+"&bookmarks="+bookmarks,"idxout",options);
+ idx=open("/adm/groupsort?inhibitmenu=yes&mode=$mode&recover="+recover+"&readfile="+url,"idxout",options);
idx.focus();
}
@@ -491,8 +495,7 @@ sub smpedt {
'nt' => 'New Title',
'se' => 'Search',
'im' => 'Import',
- 'bk' => 'Import Bookmarks',
- 'wl' => 'Import from Wishlist',
+ 'wl' => 'Import from Stored Links',
'vi' => 'View',
'lm' => 'Load Map',
'ds' => 'Discard Selected',
@@ -549,8 +552,8 @@ ENDJS
&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb({
- text => 'Construction Space',
- href => &Apache::loncommon::authorspace(),
+ text => 'Authoring Space',
+ href => &Apache::loncommon::authorspace($url),
faq => 6,
bug => 'RAT',
help => 'Sequence_Simple_Editor_Creation',});
@@ -564,7 +567,7 @@ ENDJS
href => '',});
# Breadcrumbs are included by &start_page
- my $start_page = &Apache::loncommon::start_page('Construction Space',$js)
+ my $start_page = &Apache::loncommon::start_page('Authoring Space',$js)
.&Apache::loncommon::head_subbox(
&Apache::loncommon::CSTR_pageheader()
.&buttons(2));
@@ -573,7 +576,7 @@ ENDJS
$r->print(<<ENDSMPHEAD);
$start_page
<span class="LC_error">$errtext</span>
-<form name="simpleedit" method="post">
+<form name="simpleedit" method="post" action="">
<input type="hidden" name="forcesmp" value="1" />
<input type="hidden" name="renameres" value="0" />
<input type="hidden" name="renametitle" value="" />
@@ -583,39 +586,37 @@ $start_page
<th> </th>
<th width="40%">File: $url</th></tr>
<tr><td bgcolor="#FFFFCC">
-<input type="button" onClick="javascript:groupsearch()" value="$lt{'se'}" />
-<input type="button" onClick="javascript:groupimport();" value="$lt{'im'}" />
+<input type="button" onclick="javascript:groupsearch()" value="$lt{'se'}" />
+<input type="button" onclick="javascript:groupimport();" value="$lt{'im'}" />
$lt{'as'}
<hr />
<input type="text" size="20" name="importmap" />
<input type="button"
-onClick="javascript:openbrowser('simpleedit','importmap','sequence,page','')"
+onclick="javascript:openbrowser('simpleedit','importmap','sequence,page','')"
value="Select Map" /><input type="submit" name="loadmap" value="$lt{'lm'}" /><hr />
<input type="submit" name="discard" value="$lt{'ds'}" />
<input type="submit" name="clear" value="$lt{'ca'}" />
-<input type="button" onClick="javascript:viewimport()" value="$lt{'vi'}" />
+<input type="button" onclick="javascript:viewimport()" value="$lt{'vi'}" />
</td><td> </td><td bgcolor="#FFFFCC">
-<input type="button" onClick=
+<input type="button" onclick=
"javascript:impfortarget.value=1;groupsearch()" value="$lt{'se'}" />
-<input type="button" onClick=
+<input type="button" onclick=
"javascript:impfortarget.value=1;groupimport();" value="$lt{'im'}" />
-<input type="button" onClick=
-"javascript:impfortarget.value=1;groupopen(0,1,1);" value="$lt{'bk'}" />
-<input type="button" onClick=
-"javascript:impfortarget.value=1;open_Wishlist_Import('simple');" value="$lt{'wl'}" />
-<input type="button" onClick=
-"javascript:impfortarget.value=1;groupopen('$url',1,0);" value="$lt{'reco'}" />
+<input type="button" onclick=
+"javascript:impfortarget.value=1;open_StoredLinks_Import('simple');" value="$lt{'wl'}" />
+<input type="button" onclick=
+"javascript:impfortarget.value=1;groupopen('$url',1);" value="$lt{'reco'}" />
$lt{'as'}
<hr />
<input type="submit" name="moveup" value="$lt{'mu'}" />
<input type="submit" name="movedown" value="$lt{'md'}" />
-<input type="button" onClick="javascript:renametarget()" value="$lt{'re'}" />
+<input type="button" onclick="javascript:renametarget()" value="$lt{'re'}" />
<hr />$targetmsg
<input type="submit" name="revert" value="$lt{'rv'}" />
<input type="submit" name="save" value="$lt{'sa'}" />
-<input type="button" onClick="javascript:viewtarget()" value="$lt{'vi'}" />
+<input type="button" onclick="javascript:viewtarget()" value="$lt{'vi'}" />
</td></tr>
<tr><td bgcolor="#FFFFCC"><select name="importsel" size="10" multiple="multiple">
@@ -648,12 +649,14 @@ ENDSMPHEAD
# ----------------------------------------------------------------- No such dir
sub nodir {
my ($r,$dir)=@_;
- $dir=~s{^/home/$LONCAPA::username_re/public_html}{};
- my $brcrum = [{'href' => &Apache::loncommon::authorspace(),
- 'text' => 'Construction Space'}];
+ my $londocroot = $r->dir_config('lonDocRoot');
+ my ($path) = ($dir =~ m{^\Q$londocroot\E?(/priv/[^/]+/[^/]+/)});
+ $dir=~s{^\Q$londocroot/priv/\E[^/]+/[^/]+}{};
+ my $brcrum = [{'href' => &Apache::loncommon::authorspace($path),
+ 'text' => 'Authoring Space'}];
# {'href' => '',
# 'text' => 'No such directory'}];
- $r->print(&Apache::loncommon::start_page('Construction Space',
+ $r->print(&Apache::loncommon::start_page('Authoring Space',
undef,
{'bread_crumbs' => $brcrum,})
.&Apache::loncommon::head_subbox(
@@ -672,8 +675,8 @@ sub viewmap {
&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb({
- text => 'Construction Space',
- href => &Apache::loncommon::authorspace(),
+ text => 'Authoring Space',
+ href => &Apache::loncommon::authorspace($url),
faq => 6,
bug => 'RAT',
help => 'Sequence_Simple_Editor_Creation',});
@@ -709,7 +712,7 @@ sub viewmap {
.'<th>'.&mt('Title in map').'</th>'
.'<th>'.&mt('Filename of resource').'</th>'
.'<th>'.&mt('Link to published resource').'</th>'
- .'<th>'.&mt('Link to resource in Construction Space').'</th>'
+ .'<th>'.&mt('Link to resource in Authoring Space').'</th>'
.&Apache::loncommon::end_data_table_header_row()
);
foreach (&LONCAPA::map::attemptread(&Apache::lonnet::filelocation('',$url))) {
@@ -728,10 +731,10 @@ sub viewmap {
$filename = $1;
}
my $cstrurl = $resurl;
- $cstrurl =~ s#^/res/[^/]+/([^/]+)/#/priv/$1/#;
+ $cstrurl =~ s{^/res/}{/priv/};
$r->print(&Apache::loncommon::start_data_table_row()
.'<td>'
- .'<img src="'.&Apache::loncommon::icon($resfilepath).'" />'
+ .'<img src="'.&Apache::loncommon::icon($resfilepath).'" alt="" />'
.'</td>'
.'<td>'
.&HTML::Entities::encode(&LONCAPA::map::qtescape($title))
@@ -747,7 +750,7 @@ sub viewmap {
$r->print('</td><td>');
if ($url) {
$r->print('<a href="'.$cstrurl.'">'.
- &mt('Construction space').'</a>');
+ &mt('Authoring space').'</a>');
} else {
$r->print(' ');
}