-
+
-
+
$removelink
+$renamelink
$cutlink
$copylink
@@ -2638,18 +2307,22 @@ END
my ($extension)=($url=~/\.(\w+)$/);
my $uploaded=($url=~/^\/*uploaded\//);
my $icon=&Apache::loncommon::icon($url);
- my $isfolder;
- my $ispage;
- my $containerarg;
+ my $isfolder=0;
+ my $ispage=0;
+ my $folderarg;
+ my $pagearg;
+ my $pagefile;
if ($uploaded) {
if (($extension eq 'sequence') || ($extension eq 'page')) {
$url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/;
- $containerarg = $1;
+ my $containerarg = $1;
if ($extension eq 'sequence') {
$icon=$iconpath.'navmap.folder.closed.gif';
+ $folderarg=$containerarg;
$isfolder=1;
} else {
$icon=$iconpath.'page.gif';
+ $pagearg=$containerarg;
$ispage=1;
}
if ($allowed) {
@@ -2662,11 +2335,15 @@ END
}
}
- my ($editlink,$extresform);
+ my $editlink;
my $orig_url = $url;
$orig_url=~s{http(:|:)//https(:|:)//}{https$2//};
- $url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/};
+ my $external = ($url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/});
if (!$supplementalflag && $residx && $symb) {
+ if ($container eq 'page') {
+ $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
+ $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
+ }
if ((!$isfolder) && (!$ispage)) {
(undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
$url=&Apache::lonnet::clutter($url);
@@ -2682,6 +2359,7 @@ END
}
} elsif ($url=~m|^/ext/|) {
$url='/adm/wrapper'.$url;
+ $external = 1;
}
if (&Apache::lonnet::symbverify($symb,$url)) {
$url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
@@ -2691,93 +2369,113 @@ END
}
}
my ($rand_pick_text,$rand_order_text);
- if ($isfolder || $ispage || $extension eq 'sequence' || $extension eq 'page') {
+ if ($isfolder || $extension eq 'sequence') {
my $foldername=&escape($foldertitle);
my $folderpath=$env{'form.folderpath'};
if ($folderpath) { $folderpath.='&' };
- if (!$allowed && $supplementalflag) {
- $folderpath.=$containerarg.'&'.$foldername;
- $url.='folderpath='.&escape($folderpath);
- } else {
# Append randompick number, hidden, and encrypted with ":" to foldername,
# so it gets transferred between levels
- $folderpath.=$containerarg.'&'.$foldername.
- ':'.(&LONCAPA::map::getparameter($orderidx,
+ $folderpath.=$folderarg.'&'.$foldername.':'.(&LONCAPA::map::getparameter($orderidx,
'parameter_randompick'))[0]
.':'.((&LONCAPA::map::getparameter($orderidx,
'parameter_hiddenresource'))[0]=~/^yes$/i)
.':'.((&LONCAPA::map::getparameter($orderidx,
'parameter_encrypturl'))[0]=~/^yes$/i)
.':'.((&LONCAPA::map::getparameter($orderidx,
- 'parameter_randomorder'))[0]=~/^yes$/i)
- .':'.$ispage;
- $url.='folderpath='.&escape($folderpath);
- my $rpicknum = (&LONCAPA::map::getparameter($orderidx,
- 'parameter_randompick'))[0];
- my $rpckchk;
- if ($rpicknum) {
- $rpckchk = ' checked="checked"';
- }
- my $formname = 'edit_rpick_'.$orderidx;
- $rand_pick_text =
+ 'parameter_randomorder'))[0]=~/^yes$/i);
+ $url.='folderpath='.&escape($folderpath);
+ my $rpicknum = (&LONCAPA::map::getparameter($orderidx,
+ 'parameter_randompick'))[0];
+ my $rpckchk;
+ if ($rpicknum) {
+ $rpckchk = ' checked="checked"';
+ }
+ my $formname = 'edit_rpick_'.$orderidx;
+ $rand_pick_text =
'';
- my $ro_set=
- ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
- $rand_order_text =
+ if ($rpicknum ne '') {
+ $rand_pick_text .= ': '.$rpicknum.' ';
+ }
+ $rand_pick_text .= '';
+ my $ro_set=
+ ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
+ $rand_order_text =
$form_start.
$form_common.'
+ $lt{'ed'}
+
+EXTLNK
+ } else {
my ($cfile,$home,$switchserver,$forceedit,$forceview) =
&Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
- if (($cfile ne '') && ($symb ne '' || $supplementalflag)) {
+ my $geteditlink;
+ if ($supplementalflag) {
+ if ($orig_url eq "/adm/$env{'user.domain'}/$env{'user.name'}/aboutme") {
+ $geteditlink = 1;
+ }
+ } elsif (($cfile ne '') && ($symb ne '')) {
+ $geteditlink = 1;
+ }
+ if ($geteditlink) {
my $jscall =
&Apache::lonhtmlcommon::jump_to_editres($cfile,$home,
$switchserver,
$forceedit,
- undef,$symb,
- &escape($env{'form.folderpath'}),
- $renametitle,'','',1);
+ undef,$symb);
if ($jscall) {
- $editlink = ''.&mt('Edit').' '."\n";
+ $editlink = ' '.&mt('Edit').' ';
}
}
}
- $tdalign = ' align="right" valign="top"';
- $tdwidth = ' width="80%"';
}
my $reinit;
if ($crstype eq 'Community') {
$reinit = &mt('(re-initialize community to access)');
} else {
$reinit = &mt('(re-initialize course to access)');
- }
- $line.=''.$editlink.$renamelink;
+ }
+ $line.=' ';
if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
$line.=' ';
+ $line.='';
if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
$line.=''.$title.' ';
} elsif ($url) {
@@ -2795,7 +2493,7 @@ $form_common.'
} else {
$line.=$title.' '.$reinit.' ';
}
- $line.="$extresform ";
+ $line.=$editlink."";
$rand_pick_text = ' ' if ($rand_pick_text eq '');
$rand_order_text = ' ' if ($rand_order_text eq '');
if (($allowed) && ($folder!~/^supplemental/)) {
@@ -2826,52 +2524,26 @@ ENDPARMS
return $line;
}
-sub new_timebased_suffix {
- my ($coursedom,$coursenum,$type,$area,$container) = @_;
- my ($prefix,$namespace,$idtype,$errtext,$locknotfreed);
- if ($type eq 'map') {
- $prefix = 'docs';
- if ($area eq 'supplemental') {
- $prefix = 'supp';
- }
- $prefix .= $container;
- $namespace = 'uploadedmaps';
- } else {
- $prefix = $type;
- $namespace = 'templated';
+sub newmap_suffix {
+ my ($area,$container,$coursedom,$coursenum) = @_;
+ my ($prefix,$idtype,$errtext,$locknotfreed);
+ $prefix = 'docs';
+ if ($area eq 'supplemental') {
+ $prefix = 'supp';
}
+ $prefix .= $container;
$idtype = 'concat';
my ($suffix,$freedlock,$error) =
- &Apache::lonnet::get_timebased_id($prefix,'num',$namespace,
+ &Apache::lonnet::get_timebased_id($prefix,'num','uploadedmaps',
$coursedom,$coursenum);
if (!$suffix) {
- if ($type eq 'map') {
- $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.');
- } elsif ($type eq 'smppg') {
- $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new simple page.');
- } else {
- $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new bulletin board.');
- }
+ $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.');
if ($error) {
$errtext .= ''.
- &mt('There was a problem removing a lockfile.').' ';
- if ($type eq 'map') {
- &mt('This will prevent creation of additional folders or composite pages in this course.');
- } elsif ($type eq 'smppg') {
- $locknotfreed .=
- &mt('This will prevent creation of additional simple pages in this course.');
- } else {
- $locknotfreed .=
- &mt('This will prevent creation of additional bulletin boards in this course.');
- }
- $locknotfreed .=
- ' '.&mt('Please contact the domain coordinator for your LON-CAPA domain.').
- '
';
+ $locknotfreed = ''.&mt('There was a problem removing a lockfile. This will prevent creation of additional folders or composite pages in this course. Please contact the domain coordinator for your LON-CAPA domain.').'
';
}
return ($suffix,$errtext,$locknotfreed);
}
@@ -2971,7 +2643,7 @@ sub checkonthis {
$r->print(''.&mt('connection down').' ');
} elsif ($result eq 'not_found') {
unless ($url=~/\$/) {
- $r->print(''.&mt('not found').' ');
+ $r->print(''.&mt('not found').' ');
} else {
$r->print(''.&mt('unable to verify variable URL').' ');
}
@@ -3017,7 +2689,7 @@ sub list_symbs {
$r->print(&Apache::loncommon::start_data_table_row().
''.$res->compTitle().' '.
''.$res->symb().' '.
- &Apache::loncommon::end_data_table_row());
+ &Apache::loncommon::start_data_table_row());
$count ++;
}
if (!$count) {
@@ -3027,7 +2699,6 @@ sub list_symbs {
}
$r->print(&Apache::loncommon::end_data_table());
}
- $r->print(&endContentScreen());
}
@@ -3058,7 +2729,6 @@ sub verifycontent {
}
&untiehash();
$r->print(''.&mt('Done').'
');
- $r->print(&endContentScreen());
}
@@ -3138,7 +2808,7 @@ sub checkversions {
if ($env{'form.timerange'} eq 'all') {
# show all documents
$header=&mt('All Documents in '.$crstype);
- $allsel=' selected="selected"';
+ $allsel=1;
foreach my $key (keys(%hash)) {
if ($key=~/^ids\_(\/res\/.+)$/) {
my $src=$1;
@@ -3159,19 +2829,19 @@ sub checkversions {
.&mt('seconds');
if ($env{'form.timerange'}==-1) {
$seltext='since start of course';
- $startsel=' selected="selected"';
+ $startsel='selected';
$env{'form.timerange'}=time;
}
$starttime=time-$env{'form.timerange'};
if ($env{'form.timerange'}==2592000) {
$seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
- $monthsel=' selected="selected"';
+ $monthsel='selected';
} elsif ($env{'form.timerange'}==604800) {
$seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
- $weeksel=' selected="selected"';
+ $weeksel='selected';
} elsif ($env{'form.timerange'}==86400) {
$seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
- $daysel=' selected="selected"';
+ $daysel='selected';
}
$header=&mt('Content changed').' '.$seltext;
} else {
@@ -3209,11 +2879,11 @@ sub checkversions {
$lt{'cd'}
-$lt{'al'}
-$lt{'st'}
-$lt{'lm'}
-$lt{'lw'}
-$lt{'sy'}
+$lt{'al'}
+$lt{'st'}
+$lt{'lm'}
+$lt{'lw'}
+$lt{'sy'}
@@ -3229,93 +2899,111 @@ $lt{'sc'}:
ENDHEADERS
#number of columns for version history
+ my $num_ver_col = 1;
$r->print(
- &Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_header_row().
- ''.&mt('Resources').' '.
- "$lt{'mr'} ".
- "$lt{'ve'} ".
- "$lt{'vu'} ".
- ''.&mt('History').' '.
- &Apache::loncommon::end_data_table_header_row()
- );
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ ''.&mt('Resources').' '.
+ "$lt{'mr'} ".
+ "$lt{'ve'} ".
+ "$lt{'vu'} ".
+ ''.&mt('History').' '.
+ '');
foreach my $key (sort(keys(%changes))) {
#excludes not versionable problems from resource version history:
- next unless ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/);
- my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
- my $currentversion=&Apache::lonnet::getversion($key);
- if ($currentversion<0) {
- $currentversion=''.&mt('Could not be determined.').' ';
- }
- my $linkurl=&Apache::lonnet::clutter($key);
+ if ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/) {
+ my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
+ my $currentversion=&Apache::lonnet::getversion($key);
+ if ($currentversion<0) {
+ $currentversion=''.&mt('Could not be determined.').' ';
+ }
+ my $linkurl=&Apache::lonnet::clutter($key);
$r->print(
+ &Apache::loncommon::end_data_table_header_row().
&Apache::loncommon::start_data_table_row().
- ''.&Apache::lonnet::gettitle($linkurl).' '.&Apache::lonnet::gettitle($linkurl).' '.$linkurl.' '.$currentversion.' '.$currentversion.' '.
- ''
- );
- # Used in course
- my $usedversion=$hash{'version_'.$linkurl};
- if (($usedversion) && ($usedversion ne 'mostrecent')) {
- if ($usedversion != $currentversion) {
+ ' ');
+# Used in course
+ my $usedversion=$hash{'version_'.$linkurl};
+ if (($usedversion) && ($usedversion ne 'mostrecent')) {
+ if($usedversion != $currentversion){
$r->print(''.$usedversion.' ');
- } else {
+ }else{
$r->print($usedversion);
}
+ } else {
+ $r->print($currentversion);
+ }
+ $r->print(' ');
+# Set version
+ $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
+ 'set_version_'.$linkurl,
+ {'select_form_order' =>
+ ['',1..$currentversion,'mostrecent'],
+ '' => '',
+ 'mostrecent' => &mt('most recent'),
+ map {$_,$_} (1..$currentversion)}));
+ my $lastold=1;
+ for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
+ my $url=$root.'.'.$prevvers.'.'.$extension;
+ if (&Apache::lonnet::metadata($url,'lastrevisiondate')<
+ $starttime) {
+ $lastold=$prevvers;
+ }
+ }
+ #
+ # Code to figure out how many version entries should go in
+ # each of the four columns
+ my $entries_per_col = 0;
+ my $num_entries = ($currentversion-$lastold);
+ if ($num_entries % $num_ver_col == 0) {
+ $entries_per_col = $num_entries/$num_ver_col;
} else {
- $r->print($currentversion);
+ $entries_per_col = $num_entries/$num_ver_col + 1;
}
- $r->print(' ');
- # Set version
- $r->print(&Apache::loncommon::select_form(
- $setversions{$linkurl},
- 'set_version_'.$linkurl,
- {'select_form_order' => ['',1..$currentversion,'mostrecent'],
- '' => '',
- 'mostrecent' => &mt('most recent'),
- map {$_,$_} (1..$currentversion)}));
- my $lastold=1;
- for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
- my $url=$root.'.'.$prevvers.'.'.$extension;
- if (&Apache::lonnet::metadata($url,'lastrevisiondate')<$starttime) {
- $lastold=$prevvers;
- }
- }
- $r->print(' ');
- # List all available versions
- $r->print('');
- for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
- my $url=$root.'.'.$prevvers.'.'.$extension;
- $r->print(
- ''
- .''
- .&mt('Version [_1]',$prevvers).' '
- .' ('.&Apache::lonlocal::locallocaltime(
- &Apache::lonnet::metadata($url,'lastrevisiondate'))
- .')');
- if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {
- $r->print(
- ' &').
- '" target="diffs">'.&mt('Diffs').' ');
+ my $entries_count = 0;
+ $r->print(' ');
+ my $cols_output = 1;
+ for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
+ my $url=$root.'.'.$prevvers.'.'.$extension;
+ $r->print(''.&mt('Version').' '.$prevvers.' ('.
+ &Apache::lonlocal::locallocaltime(
+ &Apache::lonnet::metadata($url,
+ 'lastrevisiondate')
+ ).
+ ')');
+ if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {
+ $r->print(' '.&mt('Diffs').' ');
+ }
+ $r->print(' ');
+ $cols_output++;
+ }
+ }
+ }
+ while($cols_output++ < $num_ver_col) {
+ $r->print(' ');
}
- $r->print(' '.&Apache::loncommon::end_data_table_row());
+ }
}
- $r->print(
- &Apache::loncommon::end_data_table().
- ' '.&mt('Content Overview').' '.&mt('Content Search').' '.&mt('Content Index').' '.&mt('Supplemental Content').' '.&mt('Content Editor').'