--- rat/lonratedt.pm 2009/04/04 21:46:02 1.93
+++ rat/lonratedt.pm 2011/10/31 01:23:26 1.103
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.93 2009/04/04 21:46:02 bisitz Exp $
+# $Id: lonratedt.pm,v 1.103 2011/10/31 01:23:26 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -43,12 +43,8 @@ use HTML::Entities();
# --------------------------------------------------------- Build up RAT screen
sub ratedt {
my ($r,$url)=@_;
- my %layout = ('border' => "0");
- if ($env{'environment.remote'} eq 'off') {
- $layout{'rows'} = "1,250,*";
- } else {
- $layout{'rows'} = "1,70,*";
- }
+ my %layout = ('border' => "0",
+ 'rows' => "1,250,*");
my $js ='
<script type="text/javascript">
var flag=0;
@@ -58,6 +54,7 @@ sub ratedt {
&Apache::loncommon::start_page('Edit Sequence',$js,
{'frameset' => 1,
'add_entries' => \%layout});
+
my $end_page =
&Apache::loncommon::end_page({'frameset' => 1});
@@ -75,19 +72,29 @@ ENDDOCUMENT
sub buttons {
my $adv=shift;
- my $output='<form method=post>';
+ my $output='<form method="post">';
if ($adv==1) {
- $output.='<input type="submit" name="forceadv" value="'.&mt('Edit').'" />'.
- &Apache::loncommon::help_open_topic('Sequence_Advanced_Editor_Creation');
+ $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="'.&mt('Simple Edit').'" />'.
- &Apache::loncommon::help_open_topic('Sequence_Simple_Editor_Creation');
+ $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="'.&mt('Advanced Edit').'" />'.
- &Apache::loncommon::help_open_topic('Sequence_Advanced_Editor_Creation');
+ $output.=
+ '<input type="submit" name="forceadv"'
+ .' value="'.&mt('Advanced Edit').'" />'
+ .&Apache::loncommon::help_open_topic(
+ 'Sequence_Advanced_Editor_Creation');
}
- return $output.'</form><hr />';
+ return $output.'</form>';
}
# ----------------------------------------------------------------- Edit script
@@ -144,10 +151,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();
}
@@ -214,7 +221,6 @@ ENDSCRIPT
sub smpedt {
my ($r,$url,$errtext)=@_;
- my $buttons=&buttons(2);
my $tmpfn=&Apache::lonnet::filelocation('',$url).'.tmp';
my $targetmsg='';
if ($env{'form.save'}) {
@@ -485,7 +491,7 @@ sub smpedt {
'nt' => 'New Title',
'se' => 'Search',
'im' => 'Import',
- 'bk' => 'Import Bookmarks',
+ 'wl' => 'Import from Wishlist',
'vi' => 'View',
'lm' => 'Load Map',
'ds' => 'Discard Selected',
@@ -540,15 +546,31 @@ sub smpedt {
</script>
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');
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ text => 'Construction Space',
+ href => &Apache::loncommon::authorspace(),
+ faq => 6,
+ bug => 'RAT',
+ help => 'Sequence_Simple_Editor_Creation',});
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ text => 'RAT',
+ title => 'Resource Assembly Tool',
+ href => '',});
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ text => 'Editor',
+ title => 'Simple Editor',
+ href => '',});
+
+ # Breadcrumbs are included by &start_page
+ my $start_page = &Apache::loncommon::start_page('Construction Space',$js)
+ .&Apache::loncommon::head_subbox(
+ &Apache::loncommon::CSTR_pageheader()
+ .&buttons(2));
my $end_page = &Apache::loncommon::end_page();
$r->print(<<ENDSMPHEAD);
$start_page
-$buttons
<span class="LC_error">$errtext</span>
<form name="simpleedit" method="post">
<input type="hidden" name="forcesmp" value="1" />
@@ -579,9 +601,9 @@ value="Select Map" /><input type="submit
<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'}" />
+"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'}" />
+"javascript:impfortarget.value=1;groupopen('$url',1);" value="$lt{'reco'}" />
$lt{'as'}
<hr />
<input type="submit" name="moveup" value="$lt{'mu'}" />
@@ -623,22 +645,47 @@ ENDSMPHEAD
# ----------------------------------------------------------------- No such dir
sub nodir {
my ($r,$dir)=@_;
- $dir=~s{^/home/$LONCAPA::username_re/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());
+ my $londocroot = $r->dir_config('lonDocRoot');
+ $dir=~s{^\Q$londocroot/priv/\E[^/]+/[^/]+}{};
+ my $brcrum = [{'href' => &Apache::loncommon::authorspace(),
+ 'text' => 'Construction Space'}];
+# {'href' => '',
+# 'text' => 'No such directory'}];
+ $r->print(&Apache::loncommon::start_page('Construction Space',
+ undef,
+ {'bread_crumbs' => $brcrum,})
+ .&Apache::loncommon::head_subbox(
+ &Apache::loncommon::CSTR_pageheader())
+ .'<p class="LC_error">'
+ .&mt('No such directory: [_1]','<span class="LC_filename">'.$dir.'</span>'
+ .'</p>'
+ .&Apache::loncommon::end_page())
+ );
}
# ---------------------------------------------------------------- View Handler
sub viewmap {
my ($r,$url,$adv,$errtext)=@_;
- $r->print(
- &Apache::loncommon::start_page('Edit Content of a Map').
- &Apache::loncommon::help_open_menu('','',6,'RAT').
- &buttons($adv));
+
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ text => 'Construction Space',
+ href => &Apache::loncommon::authorspace(),
+ faq => 6,
+ bug => 'RAT',
+ help => 'Sequence_Simple_Editor_Creation',});
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ text => 'RAT',
+ title => 'Resource Assembly Tool',
+ href => '',});
+
+ # Breadcrumbs are included by &start_page
+ $r->print(&Apache::loncommon::start_page('Edit Content of a Map')
+ .&Apache::loncommon::head_subbox(
+ &Apache::loncommon::CSTR_pageheader()
+ .&buttons($adv))
+ );
if ($errtext) {
$r->print('<div class="LC_error">'
.$errtext
@@ -647,7 +694,7 @@ sub viewmap {
);
}
my $idx=0;
- $r->print('<h1>'.$url.'</h1>');
+ $r->print('<p><span class="LC_filename">'.$url.'</span></p>');
if ($adv) {
$r->print('<p class="LC_warning">'
.&mt('Map contents are not shown in order.')