[LON-CAPA-cvs] cvs: loncom(GCI_2) /interface londocs.pm
raeburn
raeburn@source.lon-capa.org
Thu, 24 Sep 2009 22:04:41 -0000
raeburn Thu Sep 24 22:04:41 2009 EDT
Modified files: (Branch: GCI_2)
/loncom/interface londocs.pm
Log:
- londocs.pm for GCI_2 updated to 2.9.X
- Backport 1.336, 1.340, 1.343, 1.345, 1.346, 1.347, 1.349, 1.353,
1.358, 1.361, 1.365, 1.366.
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.325 loncom/interface/londocs.pm:1.325.4.1
--- loncom/interface/londocs.pm:1.325 Fri Dec 19 18:57:43 2008
+++ loncom/interface/londocs.pm Thu Sep 24 22:04:40 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.325 2008/12/19 18:57:43 raeburn Exp $
+# $Id: londocs.pm,v 1.325.4.1 2009/09/24 22:04:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -401,10 +401,10 @@
$display .= '<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" /><img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" />'."\n";
}
if ($curRes->is_sequence()) {
- $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif"> '."\n";
+ $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" /> '."\n";
$lastcontainer = $count + $startcount + $boards;
} elsif ($curRes->is_page()) {
- $display .= '<img src="/adm/lonIcons/navmap.page.open.gif"> '."\n";
+ $display .= '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" /> '."\n";
$lastcontainer = $count + $startcount + $boards;
}
my $currelem = $count+$boards+$startcount;
@@ -478,7 +478,7 @@
$scripttag));
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));
$r->print($display.'</table>'.
- '<p><input type="hidden" name="finishexport" value="1">'.
+ '<p><input type="hidden" name="finishexport" value="1" />'.
'<input type="submit" name="exportcourse" value="'.
&mt('Export '.$type.' DOCS').'" /></p></form>');
}
@@ -1227,7 +1227,7 @@
&Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title});
($title) = &parse_supplemental_title($title);
} elsif ($env{'docs.markedcopy_supplemental'}) {
- &Apache::lonnet::delenv('docs\\.markedcopy_supplemental');
+ &Apache::lonnet::delenv('docs.markedcopy_supplemental');
}
$url=~s{http(:|:)//https(:|:)//}{https$2//};
@@ -1331,7 +1331,7 @@
}
# published maps can only exists once, so remove it from paste buffer when done
if (($url=~/\.(page|sequence)$/) && ($url=~m {^/res/})) {
- &Apache::lonnet::delenv('docs\\.markedcopy');
+ &Apache::lonnet::delenv('docs.markedcopy');
}
if ($url=~ m{/smppg$}) {
my $db_name = &Apache::lonsimplepage::get_db_name($url);
@@ -1779,7 +1779,7 @@
'<select name="newpos" onChange="this.form.submit()">';
for (my $i=1;$i<=$#LONCAPA::map::order+1;$i++) {
if ($i==$incindex) {
- $selectbox.='<option value="" selected="1">('.$i.')</option>';
+ $selectbox.='<option value="" selected="selected">('.$i.')</option>';
} else {
$selectbox.='<option value="'.$i.'">'.$i.'</option>';
}
@@ -1903,6 +1903,7 @@
}
my $orig_url = $url;
+ $orig_url=~s{http(:|:)//https(:|:)//}{https$2//};
my $external = ($url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/});
if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
my $symb=&Apache::lonnet::symbclean(
@@ -2003,9 +2004,9 @@
'hd' => 'Hidden',
'ec' => 'URL hidden');
my $enctext=
- ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
+ ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="checked"':'');
my $hidtext=
- ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
+ ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="checked"':'');
$line.=(<<ENDPARMS);
<td class="LC_docs_entry_parameter">
$form_start
@@ -2097,7 +2098,7 @@
if (($errorcount) ||
($warningcount)) {
if ($errorcount) {
- $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'.
+ $r->print('<img src="/adm/lonMisc/bomb.gif" alt="" /><span class="LC_error">'.
&mt('[quant,_1,error]',$errorcount).'</span>');
}
if ($warningcount) {
@@ -2122,7 +2123,7 @@
unless ($url=~/\$/) {
$r->print('<span class="LC_error">'.&mt('not found').'</b></span>');
} else {
- $r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>');
+ $r->print('<span class="LC_error">'.&mt('unable to verify variable URL').'</span>');
}
} else {
$r->print('<span class="LC_error">'.&mt('access denied').'</span>');
@@ -2762,13 +2763,13 @@
'extr' => 'External Resource',
'syll' => 'Syllabus',
'navc' => 'Navigate Contents',
- 'sipa' => 'Simple Page',
+ 'sipa' => 'Simple Course Page',
'sipr' => 'Simple Problem',
'drbx' => 'Drop Box',
'scuf' => 'Score Upload Form',
- 'bull' => 'Bulletin Board',
- 'mypi' => 'My Personal Info',
- 'grpo' => 'Group Files',
+ 'bull' => 'Discussion Board',
+ 'mypi' => 'My Personal Information Page',
+ 'grpo' => 'Group Portfolios',
'rost' => 'Course Roster',
'abou' => 'About User',
'imsf' => 'Import IMS package',
@@ -3138,7 +3139,7 @@
</span>
<br /><br />
$lt{'comment'}:<br />
-<textarea cols=50 rows=4 name='comment'>
+<textarea cols="50" rows="4" name="comment">
</textarea>
<br />
<input type="hidden" name="folderpath" value="$path" />
@@ -3225,10 +3226,10 @@
p_mnp => 'Name of New Page',
t_mnp => 'New Page',
p_mxu => 'Title for the Uploaded Score',
- p_msp => 'Title for the Page',
+ p_msp => 'Name of the Simple Course Page',
p_msb => 'Title for the Problem',
p_mdb => 'Title for the Drop Box',
- p_mbb => 'Title for the Bulletin Board',
+ p_mbb => 'Title for the Discussion Board',
p_mab => "Enter user:domain for User's 'About Me' Page",
p_mab2 => "About [_99]",
p_mab_alrt1 => 'Not a valid user:domain',