'.
''.&mt('Content items').' '.
@@ -507,7 +518,7 @@ function containerCheck(item) {
// ]]>
|;
- $r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package',
+ $r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package',
$scripttag));
$r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
$r->print($display.
@@ -998,7 +1009,7 @@ sub group_import {
}
sub breadcrumbs {
- my ($where,$allowed,$type)=@_;
+ my ($allowed,$crstype)=@_;
&Apache::lonhtmlcommon::clear_breadcrumbs();
my (@folders);
if ($env{'form.pagepath'}) {
@@ -1013,6 +1024,15 @@ sub breadcrumbs {
my $isencrypted=0;
my $ishidden=0;
my $is_random_order=0;
+ if (!$allowed) {
+ my $description = $env{'course.'.$env{'request.course.id'}.'.description'};
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ {'href' => '/adm/menu',
+ 'title'=> 'Go to main menu',
+ 'text' => $description,
+ });
+ $plain .= $description.' >';
+ }
while (@folders) {
my $folder=shift(@folders);
my $foldername=shift(@folders);
@@ -1032,7 +1052,7 @@ sub breadcrumbs {
if ($3) { $isencrypted=1; }
if ($4 ne '') { $is_random_order = 1; }
if ($folder eq 'supplemental') {
- $name = &mt('Supplemental '.$type.' Documents');
+ $name = &mt('Supplemental '.$crstype.' Documents');
}
&Apache::lonhtmlcommon::add_breadcrumb(
{'href'=>$url.$cpinfo,
@@ -1488,7 +1508,7 @@ sub handle_edit_cmd {
}
sub editor {
- my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$type)=@_;
+ my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype)=@_;
my $container= ($env{'form.pagepath'}) ? 'page'
: 'sequence';
@@ -1503,9 +1523,14 @@ sub editor {
$LONCAPA::map::resources[$idx]='';
}
- my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=
- &breadcrumbs($folder,$allowed,$type);
- $r->print($breadcrumbtrail);
+ my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
+ if ($allowed) {
+ ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
+ &breadcrumbs($allowed,$crstype);
+ $r->print($breadcrumbtrail);
+ } else {
+ $randompick = -1;
+ }
# ------------------------------------------------------------ Process commands
@@ -1622,7 +1647,7 @@ sub editor {
unless ($name) { $name=(split(/\//,$url))[-1]; }
unless ($name) { $idx++; next; }
$output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
- $coursenum);
+ $coursenum,$crstype);
$idx++;
$shown++;
}
@@ -1790,7 +1815,7 @@ sub parse_supplemental_title {
# --------------------------------------------------------------- An entry line
sub entryline {
- my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
+ my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$crstype)=@_;
my ($foldertitle,$pagetitle,$renametitle);
if (&is_supplemental_title($title)) {
($title,$foldertitle,$renametitle) = &parse_supplemental_title($title);
@@ -2047,18 +2072,24 @@ END
$url.='pagepath='.&escape($pagepath).
'&pagesymb='.&escape($symb).$cpinfo;
}
- if ($external) {
+ if (($external) && ($allowed)) {
my $form = ($folder =~ /^default/)? 'newext' : 'supnewext';
$external = ' '.&mt('Edit').' ';
} else {
undef($external);
}
+ my $reinit;
+ if ($crstype eq 'Community') {
+ $reinit = &mt('(re-initialize community to access)');
+ } else {
+ $reinit = &mt('(re-initialize course to access)');
+ }
$line.='
'.($url?'':'').' ':'').'
- '.($url?"":'').$title.($url?' ':' '.&mt('(re-initialize course to access)').' ').$external."
+ '.($url?"":'').$title.($url?' ':' '.$reinit.' ').$external."
";
if (($allowed) && ($folder!~/^supplemental/)) {
my %lt=&Apache::lonlocal::texthash(
@@ -2206,7 +2237,7 @@ List Symbs
sub list_symbs {
my ($r) = @_;
- my $type = &Apache::loncommon::course_type();
+ my $crstype = &Apache::loncommon::course_type();
$r->print(&Apache::loncommon::start_page('Symb List'));
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Symb List'));
my $navmap = Apache::lonnavmaps::navmap->new();
@@ -2215,7 +2246,7 @@ sub list_symbs {
''.
&mt('Unable to retrieve information about course contents').
'
');
- &Apache::lonnet::logthis('Symb list failed - could not create navmap object in '.lc($type).':'.$env{'request.course.id'});
+ &Apache::lonnet::logthis('Symb list failed - could not create navmap object in '.lc($crstype).':'.$env{'request.course.id'});
} else {
$r->print("\n");
foreach my $res ($navmap->retrieveResources()) {
@@ -2229,11 +2260,11 @@ sub list_symbs {
sub verifycontent {
my ($r) = @_;
- my $type = &Apache::loncommon::course_type();
+ my $crstype = &Apache::loncommon::course_type();
my $loaderror=&Apache::lonnet::overloaderror($r);
if ($loaderror) { return $loaderror; }
- $r->print(&Apache::loncommon::start_page('Verify '.$type.' Documents'));
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$type.' Documents'));
+ $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Documents'));
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Documents'));
$hashtied=0;
undef %alreadyseen;
%alreadyseen=();
@@ -2242,7 +2273,7 @@ sub verifycontent {
if ($hash{$key}=~/\.(page|sequence)$/) {
if (($key=~/^src_/) && ($alreadyseen{&unescape($hash{$key})})) {
$r->print(''.
- &mt('The following sequence or page is included more than once in your '.$type.': ').
+ &mt('The following sequence or page is included more than once in your '.$crstype.': ').
&unescape($hash{$key}).' Most Recent: '.
''.$currentversion.' '.
' In '.$type.': '.
+ ' In '.$crstype.': '.
'');
# Used in course
my $usedversion=$hash{'version_'.$linkurl};
@@ -2448,7 +2479,7 @@ ENDHEADERS
('select_form_order' =>
['',1..$currentversion,'mostrecent'],
'' => '',
- 'mostrecent' => 'most recent',
+ 'mostrecent' => &mt('most recent'),
map {$_,$_} (1..$currentversion))));
$r->print(' $lt{'srch'} " },
- { '$lt{'impo'} $help{'Importing_LON-CAPA_Resource'}" },
- { '$lt{'book'} " },
+ { '$lt{'srch'} " },
+ { '$lt{'impo'} $help{'Importing_LON-CAPA_Resource'}" },
+ { '$lt{'book'} " },
);
$simpleeditdefaultform .= create_form_ul(create_list_elements(@simpleeditdefaultforma));
$simpleeditdefaultform .=(<print('');
- if (($standard) && ($allowed) && (!$forcesupplement) && (($env{'form.folderpath'}=~/^default/) || $env{'form.folderpath'}eq"" || ($env{'form.pagepath'}))) {
- if($activeClass == 1){
- $active = 'class="active"';
- $activeClass = 0;
- }
- }
- if ($allowed){
- $r->print(''.&mt('Main Course Documents').' ');
+ if (($standard) && ($allowed) && (!$forcesupplement) && (($env{'form.folderpath'}=~/^default/) || $env{'form.folderpath'}eq"" || ($env{'form.pagepath'}))) {
+ if($activeClass == 1){
+ $active = 'class="active"';
+ $activeClass = 0;
+ }
}
+ $r->print(''.$tabtitles{'main'}{$crstype}.' '.$tabtitles{'supplemental'}{$crstype}.' ');
+ } else {
+ $r->print(''.&mt('Supplemental Course Documents').' '
- .''
+ $r->print('
'
.'
');
# --------------------------------------------------------- Standard documents
my $savefolderpath;
- my $active = 'style="display: none;"';
+ $active = 'style="display: none;"';
if($activeClass == 0){
$active = 'style="display: block;"';
}
@@ -3030,7 +3091,7 @@ HIDDENFORM
if ($folder eq '' || $folder=~/^supplemental/) {
$folder='default';
$savefolderpath = $env{'form.folderpath'};
- $env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents'));
+ $env{'form.folderpath'}='default&'.&escape($tabtitles{'main'}{$crstype});
$uploadtag = '
';
}
@@ -3213,37 +3274,37 @@ NSYLFORM
NGFFORM
@specialdocumentsforma=(
- {'
'=>$newpageform},
- {'
'=>$newsylform},
- {'
'=>$newgroupfileform},
+ {'
'=>$newpageform},
+ {'
'=>$newsylform},
+ {'
'=>$newgroupfileform},
);
}
- push @specialdocumentsforma, ({'
'=>$newnavform},
- {'
'=>$newsmppageform},
- {'
'=>$newsmpproblemform},
- {'
'=>$newdropboxform},
- {'
'=>$newexuploadform},
- {'
'=>$newbulform},
- {'
'=>$newaboutmeform},
- {'
'=>$newaboutsomeoneform},
- {'
'=>$newrosterform},);
+ push @specialdocumentsforma, ({'
'=>$newnavform},
+ {'
'=>$newsmppageform},
+ {'
'=>$newsmpproblemform},
+ {'
'=>$newdropboxform},
+ {'
'=>$newexuploadform},
+ {'
'=>$newbulform},
+ {'
'=>$newaboutmeform},
+ {'
'=>$newaboutsomeoneform},
+ {'
'=>$newrosterform},);
$specialdocumentsform = create_form_ul(create_list_elements(@specialdocumentsforma));
if($env{'form.pagepath'}) {
@specialdocumentsforma=(
- {'
'=>$newsmpproblemform},
- {'
'=>$newexuploadform}
+ {'
'=>$newsmpproblemform},
+ {'
'=>$newexuploadform}
);
$specialdocumentsform= create_form_ul(create_list_elements(@specialdocumentsforma));
}
my @tools = (
- {'
'=>$extresourcesform},
- {'
'=>$imspform},
- {'
'=>$recoverform},
+ {'
'=>$extresourcesform},
+ {'
'=>$imspform},
+ {'
'=>$recoverform},
);
my %orderhash = (
@@ -3254,9 +3315,8 @@ my %orderhash = (
'dd' => ['Tools', create_form_ul(create_list_elements(@tools)).&generate_admin_options($containertag,$uploadtag,\%help,\%env)],
);
my $tid='1';
-my $varcd = 'Main Course Documents';
$hadchanges=0;
- my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
+ my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
if ($error) {
$r->print('
'.$error.'
');
}
@@ -3265,14 +3325,14 @@ my $varcd = 'Main Course Documents';
}
&changewarning($r,'');
-$r->print(&generate_edit_table($tid,$varcd,\%orderhash));
+$r->print(&generate_edit_table($tid,\%orderhash));
$r->print('
');
}
if ($env{'form.pagepath'}) {
}
# ----------------------------------------------------- Supplemental documents
- my $active = 'style="display: none;"';
+ $active = 'style="display: none;"';
if($activeClass == 1){
$active = 'style="display: block;"';
}
@@ -3284,7 +3344,7 @@ $r->print('
');
if ($folder =~ /^supplemental$/ &&
(($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
$env{'form.folderpath'} = 'supplemental&'.
- &escape(&mt('Supplemental '.$type.' Documents'));
+ &escape(&mt('Supplemental '.$crstype.' Documents'));
} elsif ($allowed) {
$env{'form.folderpath'} = $savefolderpath;
}
@@ -3296,9 +3356,7 @@ $r->print('
@@ -3361,9 +3419,9 @@ SNAMFORM
my @specialdocs = (
- {''.$error.'
');
}
my $tid='2';
- my $varscd = 'Supplemental Course Documents';
- $r->print(&generate_edit_table($tid,$varscd,\%suporderhash));
+ $r->print(&generate_edit_table($tid,\%suporderhash));
} else {
- my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
+ my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
if ($error) {
$r->print(''.$error.'
');
}
@@ -3426,15 +3483,15 @@ sub generate_admin_options {
my $dumpbut=&dumpbutton();
my $exportbut=&exportbutton();
my @list = (
- {'$lt{'vc'} $help{'Verify_Content'}"},
- {'$lt{'cv'} $help{'Check_Resource_Versions'}"},
+ {'$lt{'vc'} $help{'Verify_Content'}"},
+ {'$lt{'cv'} $help{'Check_Resource_Versions'}"},
);
if($dumpbut ne ''){
- push @list, {'$lt{'ls'} $lt{'sl'} "},
+ push @list, ({'$lt{'ls'} $lt{'sl'} "},
);
return '';
@@ -3442,7 +3499,8 @@ sub generate_admin_options {
sub generate_edit_table {
- my ($tid,$varcd,$orderhash_ref) = @_;
+ my ($tid,$orderhash_ref) = @_;
+ return unless(ref($orderhash_ref) eq 'HASH');
my %orderhash = %{$orderhash_ref};
my $form;
my $activetab;
@@ -3466,7 +3524,7 @@ sub generate_edit_table {
}
}
$form .= '';
- $form .= '';
+ $form .= '
';
foreach my $field (keys(%orderhash)){
if($field ne '00'){
if($activetab eq '' || $activetab ne $field){
@@ -3484,6 +3542,74 @@ sub generate_edit_table {
return $form;
}
+sub concept_test_builder {
+ my ($r,$cdom,$cnum) = @_;
+ &Apache::londocsgci::setdefaults();
+ if ($env{'form.context'} eq 'requestcrs') {
+ if ($env{'form.phase'} eq 'storemap') {
+ &Apache::londocsgci::evaluate();
+ my $error = &Apache::londocsgci::store('requestcrs',$cdom,$cnum);
+ my $output = '
';
+ if ($error) {
+ $output .= ''.
+ &mt('An error occurred saving your concept test: [_1].',$error).
+ ' ';
+ } else {
+ &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
+ $output .= &mt('Your concept test has been saved.');
+ }
+ $output .= '
';
+ if (&Apache::lonrequestcourse::generate_page($r,'new','chooseitems')) {
+ my $formname = 'requestcrs';
+ $r->print('