--- loncom/interface/londocs.pm 2011/07/21 03:31:12 1.456
+++ loncom/interface/londocs.pm 2011/10/23 23:46:02 1.461
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.456 2011/07/21 03:31:12 raeburn Exp $
+# $Id: londocs.pm,v 1.461 2011/10/23 23:46:02 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -176,7 +176,7 @@ sub dumpcourse {
$newfilename=&clean($newfilename);
$newfilename.='.'.$ext;
my @dirs=split(/\//,$newfilename);
- my $path='/home/'.$ca.'/public_html';
+ my $path='/home/httpd/html/priv/'.$cd.'/'.$ca;
my $makepath=$path;
my $fail=0;
for (my $i=0;$i<$#dirs;$i++) {
@@ -1613,7 +1613,8 @@ sub handle_edit_cmd {
}
sub editor {
- my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype)=@_;
+ my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
+ $supplementalflag,$orderhash)=@_;
my $container= ($env{'form.pagepath'}) ? 'page'
: 'sequence';
@@ -1742,7 +1743,7 @@ sub editor {
$r->print('');
}
- my $output;
+ my ($to_show,$output);
&Apache::loncommon::start_data_table_count(); #setup a row counter
foreach my $res (@LONCAPA::map::order) {
@@ -1759,30 +1760,38 @@ sub editor {
&Apache::loncommon::end_data_table_count();
if ($shown) {
- $r->print(&Apache::loncommon::start_scrollbox('900px','880px','400px')
- .&Apache::loncommon::start_data_table());
+ $to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll')
+ .&Apache::loncommon::start_data_table(undef,'contentlist');
if ($allowed) {
- $r->print(&Apache::loncommon::start_data_table_header_row()
+ $to_show .= &Apache::loncommon::start_data_table_header_row()
.'
'.&mt('Move').' | '
.''.&mt('Actions').' | '
- .''.&mt('Document').' | ');
+ .''.&mt('Document').' | ';
if ($folder !~ /^supplemental/) {
- $r->print(''.&mt('Settings').' | ');
+ $to_show .= ''.&mt('Settings').' | ';
}
- $r->print(&Apache::loncommon::end_data_table_header_row());
+ $to_show .= &Apache::loncommon::end_data_table_header_row();
}
- $r->print($output
+ $to_show .= $output.' '
.&Apache::loncommon::end_data_table()
- .&Apache::loncommon::end_scrollbox()
- );
+ .'
'
+ .&Apache::loncommon::end_scrollbox();
} else {
- $r->print(''
+ $to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')
+ .'
'
.&mt('Currently no documents.')
- .''
- );
+ .'
'
+ .&Apache::loncommon::end_scrollbox();
+ }
+ my $tid = 1;
+ if ($supplementalflag) {
+ $tid = 2;
}
if ($allowed) {
+ $r->print(&generate_edit_table($tid,$orderhash,$to_show));
&print_paste_buffer($r,$container);
+ } else {
+ $r->print($to_show);
}
return;
}
@@ -1812,7 +1821,7 @@ sub process_file_upload {
$LONCAPA::map::resources[1]='';
}
if ($fatal) {
- $$upload_output = ''.&mt('The uploaded file has not been stored as an error occurred reading the contents of the current folder.').'
';
+ $$upload_output = ''.&mt('The uploaded file has not been stored as an error occurred reading the contents of the current folder.').'
';
return;
}
my $destination = 'docs/';
@@ -1838,7 +1847,7 @@ sub process_file_upload {
} else {
my ($filename) = ($env{'form.uploaddoc.filename'} =~ m{([^/]+)$});
- $$upload_output = ''.&mt('Unable to save file [_1].',''.$filename.'').'
';
+ $$upload_output = ''.&mt('Unable to save file [_1].',''.$filename.'').'
';
return;
}
my $ext='false';
@@ -1857,7 +1866,7 @@ sub process_file_upload {
($errtext,$fatal)=&storemap($coursenum,$coursedom,
$folder.'.'.$container);
if ($fatal) {
- $$upload_output = ''.$errtext.'
';
+ $$upload_output = ''.$errtext.'
';
return;
} else {
if ($parseaction eq 'parse' && $mimetype eq 'text/html') {
@@ -1884,6 +1893,7 @@ sub process_file_upload {
} else {
$$upload_output .= &mt('No embedded items identified').'
';
}
+ $$upload_output = ''.$$upload_output.'
';
}
}
}
@@ -2210,14 +2220,13 @@ END
$form_start
$form_end
-
-
+
$form_start
$form_end
|
- $form_start $rand_order_text $form_end |
- $form_start $parameterset $form_end |
+ $form_start $parameterset $form_end
+ $form_start $rand_order_text $form_end |
ENDPARMS
}
$line.=&Apache::loncommon::end_data_table_row();
@@ -2752,15 +2761,15 @@ sub startContentScreen {
if ($allowed) {
$r->print(' '.&mt('Content Editor').' ');
+ ' id="tabbededitor"> '.&mt('Content Editor').' ');
}
$r->print(' '.&mt('Content Search').' ');
$r->print(' '.&mt('Content Index').' ');
$r->print(''.&mt('Supplemental Documents').'');
$r->print('');
- $r->print(''
- .'
');
+ $r->print('
'
+ .'
');
$r->print('
');
}
@@ -2859,6 +2868,7 @@ sub handler {
my $script='';
my $showdoc=0;
+ my $addentries = {};
my $containertag;
my $uploadtag;
@@ -2959,7 +2969,22 @@ sub handler {
$iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
if ($allowed) {
- $script .= &editing_js($udom,$uname);
+ my @tabids;
+ if ($supplementalflag) {
+ @tabids = ('002','ee2','ff2');
+ } else {
+ @tabids = ('aa1','bb1','cc1','ff1');
+ unless ($env{'form.pagepath'}) {
+ unshift(@tabids,'001');
+ push(@tabids,('dd1','ee1'));
+ }
+ }
+ my $tabidstr = join("','",@tabids);
+ $script .= &editing_js($udom,$uname).
+ &resize_contentdiv_js($tabidstr);
+ $addentries = {
+ onload => "javascript:resize_contentdiv('contentscroll','1','1');",
+ };
}
# -------------------------------------------------------------------- Body tag
$script = '