--- loncom/interface/londocs.pm 2009/07/10 19:48:51 1.378
+++ loncom/interface/londocs.pm 2009/07/27 20:35:40 1.382
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.378 2009/07/10 19:48:51 tempelho Exp $
+# $Id: londocs.pm,v 1.382 2009/07/27 20:35:40 tempelho Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1049,7 +1049,7 @@ sub breadcrumbs {
}
$plain=~s/\>\;\s*$//;
return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
- 'LC_docs_path', undef, 1 ),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
+ undef, undef, 1 ),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
}
sub log_docs {
@@ -1273,10 +1273,11 @@ sub print_paste_buffer {
my ($r,$container) = @_;
return if (!defined($env{'docs.markedcopy_url'}));
- $r->print(<
-ENDPASTE
- $r->print(' ');
+ $r->print('
'
+ .''.&mt('Clipboard').' '
+ .'
');
+ $r->print('');
}
sub do_paste_from_buffer {
@@ -1588,34 +1589,66 @@ sub editor {
my $idx=0;
my $shown=0;
if (($ishidden) || ($isencrypted) || ($randompick>=0) || ($is_random_order)) {
- $r->print(''.&mt('Parameters').':
'.
- ($randompick>=0?''.&mt('randomly pick [_1] resources',$randompick).' ':'').
+ $r->print(''.
+ '
'.&mt('Parameters:').
+ '
'.
+ ($randompick>=0?''.&mt('randomly pick [quant,_1,resource]',$randompick).' ':'').
($ishidden?''.&mt('contents hidden').' ':'').
($isencrypted?''.&mt('URLs hidden').' ':'').
+ ($is_random_order?''.&mt('random order').' ':'').
' ');
+ if ($randompick>=0) {
+ $r->print('
'
+ .&mt('Caution: this folder is set to randomly pick a subset'
+ .' of resources. Adding or removing resources from this'
+ .' folder will change the set of resources that the'
+ .' students see, resulting in spurious or missing credit'
+ .' for completed problems, not limited to ones you'
+ .' modify. Do not modify the contents of this folder if'
+ .' it is in active student use.')
+ .'
'
+ );
+ }
+ if ($is_random_order) {
+ $r->print('
'
+ .&mt('Caution: this folder is set to randomly order its'
+ .' contents. Adding or removing resources from this folder'
+ .' will change the order of resources shown.')
+ .'
'
+ );
+ }
+ $r->print('
');
}
- if ($randompick>=0) {
- $r->print(''.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'
');
- }
- if ($is_random_order) {
- $r->print(''.&mt('Caution: this folder is set to randomly order its contents. Adding or removing resources from this folder will change the order of resources shown.').'
');
- }
- $r->print('');
+
+ my $output;
foreach my $res (@LONCAPA::map::order) {
- my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
- $name=&LONCAPA::map::qtescape($name);
- $url=&LONCAPA::map::qtescape($url);
- unless ($name) { $name=(split(/\//,$url))[-1]; }
- unless ($name) { $idx++; next; }
- $r->print(&entryline($idx,$name,$url,$folder,$allowed,$res,
- $coursenum));
- $idx++;
- $shown++;
+ my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
+ $name=&LONCAPA::map::qtescape($name);
+ $url=&LONCAPA::map::qtescape($url);
+ unless ($name) { $name=(split(/\//,$url))[-1]; }
+ unless ($name) { $idx++; next; }
+ $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
+ $coursenum);
+ $idx++;
+ $shown++;
}
- unless ($shown) {
- $r->print(''.&mt('Currently no documents.').' ');
+ if ($shown) {
+ $r->print(&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .''.&mt('Move').' '
+ .''.&mt('Actions').' '
+ .''.&mt('Document').' '
+ .''.&mt('Settings').' '
+ .&Apache::loncommon::end_data_table_header_row()
+ .$output
+ .&Apache::loncommon::end_data_table()
+ )
+ } else {
+ $r->print(''
+ .&mt('Currently no documents.')
+ .'
'
+ );
}
- $r->print("\n
\n");
if ($allowed) {
&print_paste_buffer($r,$container);
}
@@ -1778,7 +1811,7 @@ sub entryline {
$renametitle=~s/\\/\\\\/g;
$renametitle=~s/\"\;/\\\"/g;
$renametitle=~s/ /%20/g;
- my $line='';
+ my $line=&Apache::loncommon::start_data_table_row();
my ($form_start,$form_end);
# Edit commands
my ($container, $type, $esc_path, $path, $symb);
@@ -1881,18 +1914,16 @@ END
$form_end = '';
$line.=(<
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
$form_start
@@ -1919,7 +1950,7 @@ END
my $pagefile;
if ($uploaded) {
if ($extension eq 'sequence') {
- $icon=$iconpath.'/folder_closed.gif';
+ $icon=$iconpath.'/navmap.folder.closed.gif';
$url=~/\Q$coursenum\E\/([\/\w]+)\.sequence$/;
$url='/adm/coursedocs?';
$folderarg=$1;
@@ -2026,10 +2057,10 @@ END
undef($external);
}
$line.='
-
+
'.($url?'':'').' '.($url?' ':'').'
-
+
'.($url?"":'').$title.($url?' ':' '.&mt('(re-initialize course to access)').' ').$external."
";
if (($allowed) && ($folder!~/^supplemental/)) {
@@ -2055,7 +2086,7 @@ END
$form_start $parameterset $form_end
ENDPARMS
}
- $line.=" ";
+ $line.=&Apache::loncommon::end_data_table_row();
return $line;
}
@@ -2942,14 +2973,14 @@ HIDDENFORM
$activeClass = 0;
}
}
- $r->print(''.&mt('Main Course Documents').' ');
+ $r->print(''.&mt('Main Course Documents').' ');
$active = '';
if (!$forcestandard || ($env{'form.folderpath'}=~/^supplemental/)) {
if($activeClass == 1){
$active = 'class="active"';
}
}
- $r->print(''.&mt('Supplemental Course Documents').' ');
+ $r->print(''.&mt('Supplemental Course Documents').' ');
$r->print(' '
.''
.'
');
@@ -3391,7 +3422,7 @@ sub generate_edit_table {
if($env{'form.active'} ne ''){
$activetab = $env{'form.active'};
}
- $form = '
'.&mt($varcd).' ';
+ $form = '
';
$form .= '
';
foreach my $name (sort(keys(%orderhash))){
if($name eq 'zz'){