--- rat/lonratedt.pm 2012/12/16 16:02:15 1.105.2.3
+++ rat/lonratedt.pm 2014/02/26 18:52:37 1.105.2.6
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.105.2.3 2012/12/16 16:02:15 raeburn Exp $
+# $Id: lonratedt.pm,v 1.105.2.6 2014/02/26 18:52:37 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -158,7 +158,7 @@ function idxopen(mode) {
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,"idxout",options);
+ idx=open("/adm/groupsort?inhibitmenu=yes&mode=$mode&recover="+recover+"&readfile="+url,"idxout",options);
idx.focus();
}
@@ -233,22 +233,27 @@ sub smpedt {
my ($errtext,$fatal)=
&LONCAPA::map::mapread(&Apache::lonnet::filelocation('',$url),'');
unless ($fatal) {
- $targetmsg='<b>'.&mt('Saved.').'</b><br />';
+ $targetmsg=&Apache::lonhtmlcommon::confirm_success(&mt('Saved'));
} else {
- $targetmsg='<b>'.&mt('An error occurred while saving.').'</b><br />';
+ $targetmsg=&Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred while saving.'),1);
}
}
if ($env{'form.revert'}) {
- $targetmsg='<b>'.&mt('Reverted.').'</b><br />';
+ $targetmsg=&Apache::lonhtmlcommon::confirm_success(&mt('Reverted'));
unlink($tmpfn);
my ($errtext,$fatal)=
&LONCAPA::map::mapread(&Apache::lonnet::filelocation('',$url),'');
}
+ $targetmsg = &Apache::loncommon::confirmwrapper($targetmsg) if ($targetmsg);
if (-e $tmpfn) {
- $targetmsg=
- '<span class="LC_warning">'.&mt('You are working with an unsaved version of your map.').'</span><br />';
- my ($errtext,$fatal)=&LONCAPA::map::mapread($tmpfn,'');
+ $targetmsg=
+ '<p class="LC_warning">'
+ .&mt('You are working with an unsaved version of your map.')
+ .'</p>';
+ my ($errtext,$fatal)=&LONCAPA::map::mapread($tmpfn,'');
}
+ $errtext = '<p class="LC_error">'.$errtext.'</p>' if ($errtext);
# ---------------------------------------------------------- Process form input
my @importselect=&Apache::loncommon::get_env_multiple('form.importsel');
@@ -491,6 +496,7 @@ sub smpedt {
my $editscript=&editscript('simple');
my %lt=&Apache::lonlocal::texthash(
+ 'sm' => 'Select Map',
'sa' => 'Save',
'nt' => 'New Title',
'se' => 'Search',
@@ -512,9 +518,7 @@ sub smpedt {
'pas' => 'Paste after selected',
'reco' => 'Recover Deleted'
);
- my $js=<<ENDJS;
-<script type="text/javascript">
-
+ my $js=&Apache::lonhtmlcommon::scripttag("
$editscript
function openview(entry) {
@@ -546,13 +550,11 @@ sub smpedt {
document.forms.simpleedit.submit();
}
}
-
-</script>
-ENDJS
+");
&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb({
- text => 'Construction Space',
+ text => 'Authoring Space',
href => &Apache::loncommon::authorspace($url),
faq => 6,
bug => 'RAT',
@@ -567,15 +569,17 @@ 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));
my $end_page = &Apache::loncommon::end_page();
+ my $filetext = &mt('File: [_1]','<span class="LC_filename">'.$url.'</span>');
$r->print(<<ENDSMPHEAD);
$start_page
-<span class="LC_error">$errtext</span>
+$targetmsg
+$errtext
<form name="simpleedit" method="post" action="">
<input type="hidden" name="forcesmp" value="1" />
<input type="hidden" name="renameres" value="0" />
@@ -584,7 +588,7 @@ $start_page
<table>
<tr><th width="40%">$lt{'ta'}</th>
<th> </th>
-<th width="40%">File: $url</th></tr>
+<th width="40%">$filetext</th></tr>
<tr><td bgcolor="#FFFFCC">
<input type="button" onclick="javascript:groupsearch()" value="$lt{'se'}" />
<input type="button" onclick="javascript:groupimport();" value="$lt{'im'}" />
@@ -593,7 +597,7 @@ $lt{'as'}
<input type="text" size="20" name="importmap" />
<input type="button"
onclick="javascript:openbrowser('simpleedit','importmap','sequence,page','')"
-value="Select Map" /><input type="submit" name="loadmap" value="$lt{'lm'}" /><hr />
+value="$lt{'sm'}" /><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'}" />
@@ -613,7 +617,7 @@ $lt{'as'}
<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'}" />
-<hr />$targetmsg
+<hr />
<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'}" />
@@ -625,17 +629,18 @@ $importwindow
</td>
<td bgcolor="#FFFFAA" align="center">
$lt{'cs'}<br />
-<input type="submit" name="cut" value="<<<" /><p>
+<input type="submit" name="cut" value="<<<" /><p>
<hr />
$lt{'ps'}<br />
-<input type="submit" name="copy" value="<--" /><p>
+<input type="submit" name="copy" value="<--" /><p>
<h /r>
$lt{'pas'}<br />
-<input type="submit" name="paste" value="-->" />
+<input type="submit" name="paste" value="-->" />
</td>
<td bgcolor="#FFFFCC"><select name="target" size="10" multiple="multiple">
$targetwindow
</select>
+</td></tr>
</table>
<input type="hidden" name="importdetail" value="" />
<input type="hidden" name="curimpdetail" value="$importdetail" />
@@ -653,10 +658,10 @@ sub nodir {
my ($path) = ($dir =~ m{^\Q$londocroot\E?(/priv/[^/]+/[^/]+/)});
$dir=~s{^\Q$londocroot/priv/\E[^/]+/[^/]+}{};
my $brcrum = [{'href' => &Apache::loncommon::authorspace($path),
- 'text' => 'Construction Space'}];
+ '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(
@@ -675,7 +680,7 @@ sub viewmap {
&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb({
- text => 'Construction Space',
+ text => 'Authoring Space',
href => &Apache::loncommon::authorspace($url),
faq => 6,
bug => 'RAT',
@@ -712,7 +717,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))) {
@@ -750,7 +755,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(' ');
}