|
version 1.484.2.36, 2013/08/03 18:16:46
|
version 1.484.2.39, 2013/08/18 17:32:28
|
|
Line 56 my $hashtied;
|
Line 56 my $hashtied;
|
| my %alreadyseen=(); |
my %alreadyseen=(); |
| |
|
| my $hadchanges; |
my $hadchanges; |
| |
my $suppchanges; |
| |
|
| |
|
| my %help=(); |
my %help=(); |
|
Line 79 sub storemap {
|
Line 80 sub storemap {
|
| $map,1,$report); |
$map,1,$report); |
| if ($errtext) { return ($errtext,2); } |
if ($errtext) { return ($errtext,2); } |
| |
|
| $hadchanges=1; |
if ($map =~ /^default/) { |
| |
$hadchanges=1; |
| |
} else { |
| |
$suppchanges=1; |
| |
} |
| return ($errtext,0); |
return ($errtext,0); |
| } |
} |
| |
|
|
Line 402 END
|
Line 407 END
|
| } |
} |
| my ($errtext,$fatal) = |
my ($errtext,$fatal) = |
| &storemap($coursenum, $coursedom, $folder.'.'.$container,1); |
&storemap($coursenum, $coursedom, $folder.'.'.$container,1); |
| |
unless ($fatal) { |
| |
if ($folder =~ /^supplemental/) { |
| |
&Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1); |
| |
my ($errtext,$fatal) = &mapread($coursenum,$coursedom, |
| |
$folder.'.'.$container); |
| |
} |
| |
} |
| return ($errtext,$fatal,$fixuperrors); |
return ($errtext,$fatal,$fixuperrors); |
| } |
} |
| |
|
|
Line 1615 sub dbcopy {
|
Line 1627 sub dbcopy {
|
| &mt('There was a problem removing a lockfile.'); |
&mt('There was a problem removing a lockfile.'); |
| if ($prefix eq 'smppg') { |
if ($prefix eq 'smppg') { |
| $lockerrorsref->{$prefix} .= |
$lockerrorsref->{$prefix} .= |
| &mt('This will prevent creation of additional simple pages in this course.'); |
' '.&mt('This will prevent creation of additional simple pages in this course.'); |
| } else { |
} else { |
| $lockerrorsref->{$prefix} .= &mt('This will prevent creation of additional bulletin boards in this course.'); |
$lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional bulletin boards in this course.'); |
| } |
} |
| $lockerrorsref->{$prefix} .= &mt('Please contact the domain coordinator for your LON-CAPA domain.').'</div>'; |
$lockerrorsref->{$prefix} .= ' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.', |
| |
'<a href="/adm/helpdesk" target="_helpdesk">','</a>'). |
| |
'</div>'; |
| } |
} |
| } |
} |
| } elsif ($url =~ m{/syllabus$}) { |
} elsif ($url =~ m{/syllabus$}) { |
|
Line 3506 sub new_timebased_suffix {
|
Line 3520 sub new_timebased_suffix {
|
| } |
} |
| unless ($type eq 'paste') { |
unless ($type eq 'paste') { |
| $locknotfreed .= |
$locknotfreed .= |
| ' '.&mt('Please contact the domain coordinator for your LON-CAPA domain.'); |
' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.', |
| |
'<a href="/adm/helpdesk" target="_helpdesk">','</a>'); |
| } |
} |
| $locknotfreed .= '</div>'; |
$locknotfreed .= '</div>'; |
| } |
} |
|
Line 4170 sub handler {
|
Line 4185 sub handler {
|
| # supplementalflag=0: show standard documents |
# supplementalflag=0: show standard documents |
| # toolsflag=1: show utilities |
# toolsflag=1: show utilities |
| |
|
| $env{'form.folderpath'} = &unescape($env{'form.folderpath'}); |
my $unesc_folderpath = &unescape($env{'form.folderpath'}); |
| my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/); |
my $supplementalflag=($unesc_folderpath=~/^supplemental/); |
| if (($env{'form.folderpath'}=~/^default/) || ($env{'form.folderpath'} eq "")) { |
if (($unesc_folderpath=~/^default/) || ($unesc_folderpath eq "")) { |
| $supplementalflag=0; |
$supplementalflag=0; |
| } |
} |
| if ($env{'form.forcesupplement'}) { $supplementalflag=1; } |
if ($env{'form.forcesupplement'}) { $supplementalflag=1; } |
|
Line 4707 NASOFORM
|
Line 4722 NASOFORM
|
| <input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
| value="$lt{'rost'}=/adm/viewclasslist" /> |
value="$lt{'rost'}=/adm/viewclasslist" /> |
| <a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a> |
<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a> |
| $help{'Course Roster'} |
$help{'Course_Roster'} |
| </form> |
</form> |
| NROSTFORM |
NROSTFORM |
| |
|
|
Line 4804 NGFFORM
|
Line 4819 NGFFORM
|
| ); |
); |
| } |
} |
| push(@importdoc, |
push(@importdoc, |
| {'<img class="LC_noBorder_LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'doc\');" />'=>$fileuploadform} |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'doc\');" />'=>$fileuploadform} |
| ); |
); |
| $fileuploadform = &create_form_ul(&create_list_elements(@importdoc)); |
$fileuploadform = &create_form_ul(&create_list_elements(@importdoc)); |
| |
|
|
Line 4975 my %suporderhash = (
|
Line 4990 my %suporderhash = (
|
| $supplementalflag,\%suporderhash,$iconpath,$pathitem); |
$supplementalflag,\%suporderhash,$iconpath,$pathitem); |
| if ($error) { |
if ($error) { |
| $r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
| |
} else { |
| |
if ($suppchanges) { |
| |
my %servers = &Apache::lonnet::internet_dom_servers($coursedom); |
| |
my @ids=&Apache::lonnet::current_machine_ids(); |
| |
foreach my $server (keys(%servers)) { |
| |
next if (grep(/^\Q$server\E$/,@ids)); |
| |
my $hashid=$coursenum.':'.$coursedom; |
| |
&Apache::lonnet::remote_devalidate_cache($server,'suppcount',$hashid); |
| |
} |
| |
&Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1); |
| |
undef($suppchanges); |
| |
} |
| } |
} |
| } |
} |
| } elsif ($supplementalflag) { |
} elsif ($supplementalflag) { |
![[BACK]](/icons/back.gif){kind=icon}
Return to londocs.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / interface