--- rat/lonratedt.pm 2009/12/04 11:13:58 1.98 +++ 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.98 2009/12/04 11:13:58 bisitz Exp $ +# $Id: lonratedt.pm,v 1.105.2.6 2014/02/26 18:52:37 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,7 +44,7 @@ use HTML::Entities(); sub ratedt { my ($r,$url)=@_; my %layout = ('border' => "0"); - if ($env{'environment.remote'} eq 'off') { + if ($env{'environment.remote'} eq 'off') { $layout{'rows'} = "1,250,*"; } else { $layout{'rows'} = "1,70,*"; @@ -76,7 +76,7 @@ ENDDOCUMENT sub buttons { my $adv=shift; - my $output='
'; + my $output=''; if ($adv==1) { $output.= '
'; + $targetmsg=&Apache::lonhtmlcommon::confirm_success(&mt('Saved')); } else { - $targetmsg=''.&mt('An error occurred while saving.').'
'; + $targetmsg=&Apache::lonhtmlcommon::confirm_success( + &mt('An error occurred while saving.'),1); } } if ($env{'form.revert'}) { - $targetmsg=''.&mt('Reverted.').'
'; + $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= - ''.&mt('You are working with an unsaved version of your map.').'
'; - my ($errtext,$fatal)=&LONCAPA::map::mapread($tmpfn,''); + $targetmsg= + '

' + .&mt('You are working with an unsaved version of your map.') + .'

'; + my ($errtext,$fatal)=&LONCAPA::map::mapread($tmpfn,''); } + $errtext = '

'.$errtext.'

' if ($errtext); # ---------------------------------------------------------- Process form input my @importselect=&Apache::loncommon::get_env_multiple('form.importsel'); @@ -491,11 +496,12 @@ sub smpedt { my $editscript=&editscript('simple'); my %lt=&Apache::lonlocal::texthash( + 'sm' => 'Select Map', 'sa' => 'Save', 'nt' => 'New Title', 'se' => 'Search', 'im' => 'Import', - 'bk' => 'Import Bookmarks', + 'wl' => 'Import from Stored Links', 'vi' => 'View', 'lm' => 'Load Map', 'ds' => 'Discard Selected', @@ -512,9 +518,7 @@ sub smpedt { 'pas' => 'Paste after selected', 'reco' => 'Recover Deleted' ); - my $js=< - + my $js=&Apache::lonhtmlcommon::scripttag(" $editscript function openview(entry) { @@ -546,14 +550,12 @@ sub smpedt { document.forms.simpleedit.submit(); } } - - -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',}); @@ -567,16 +569,18 @@ 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]',''.$url.''); $r->print(<$errtext - +$targetmsg +$errtext + @@ -584,39 +588,39 @@ $start_page - +
$lt{'ta'}  File: $url
$filetext
- - + + $lt{'as'}
+onclick="javascript:openbrowser('simpleedit','importmap','sequence,page','')" +value="$lt{'sm'}" />
- + 		  - - - - + + $lt{'as'}
- -
$targetmsg + +
- +
$lt{'cs'}
-

+

$lt{'ps'}
-

+

$lt{'pas'}
- +

+
@@ -649,12 +654,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( @@ -673,8 +680,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',}); @@ -710,7 +717,7 @@ sub viewmap { .''.&mt('Title in map').'' .''.&mt('Filename of resource').'' .''.&mt('Link to published resource').'' - .''.&mt('Link to resource in Construction Space').'' + .''.&mt('Link to resource in Authoring Space').'' .&Apache::loncommon::end_data_table_header_row() ); foreach (&LONCAPA::map::attemptread(&Apache::lonnet::filelocation('',$url))) { @@ -729,10 +736,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() .'' - .'' + .'' .'' .'' .&HTML::Entities::encode(&LONCAPA::map::qtescape($title)) @@ -748,7 +755,7 @@ sub viewmap { $r->print(''); if ($url) { $r->print(''. - &mt('Construction space').''); + &mt('Authoring space').''); } else { $r->print(' '); }