--- loncom/interface/portfolio.pm 2009/02/26 16:17:29 1.211
+++ loncom/interface/portfolio.pm 2009/10/23 09:33:45 1.216
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.211 2009/02/26 16:17:29 schafran Exp $
+# $Id: portfolio.pm,v 1.216 2009/10/23 09:33:45 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -88,13 +88,12 @@ sub display_common {
my $iconpath= $r->dir_config('lonIconsURL') . "/";
my %lt=&Apache::lonlocal::texthash(
- 'upload' => 'Upload',
- 'upload_label' => 'Upload file to current directory',
- 'createdir' => 'Create Subdirectory',
- 'createdir_label' =>
- 'Create subdirectory in current directory',
- 'parse' => 'If HTML file, upload embedded images/multimedia/css/linked files'
- );
+ 'upload' => 'Upload',
+ 'upload_label' => 'Upload file to current directory',
+ 'createdir' => 'Create Subdirectory',
+ 'createdir_label' => 'Create subdirectory in current directory',
+ 'parse' => 'Upload embedded images/multimedia/css/linked files if HTML file',
+ );
my $escuri = &HTML::Entities::encode($r->uri,'&<>"');
my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');
my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');
@@ -105,8 +104,9 @@ sub display_common {
$parse_check = <<"END";
<br />
<span class="LC_nobreak">
- <label>$lt{'parse'}
- <input type="checkbox" name="parserflag" checked="checked" />
+ <label>
+ <input type="checkbox" name="parserflag" checked="checked" />
+ $lt{'parse'}
</label>
</span>
END
@@ -158,6 +158,7 @@ END
'fieldname' => $env{"form.fieldname"},
'continue' => $env{"form.continue"}
);
+ $r->print('<br clear="all" />');
$r->print('<span class="LC_current_location">'.&make_anchor($url,\%anchor_fields,$port_path).'/');
if (@tree > 1){
my $newCurrentPath = '/';
@@ -235,7 +236,7 @@ sub display_directory_line {
$r->print($line); # contains first two cells of table
my $lock_info;
if ($version_flag) { # versioned can't be versioned, so TRUE when root file
- $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
+ $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" class="LC_fileicon" /></td>');
$r->print('<td>'.$version_flag.'</td>');
} else { # this is a graded or handed back file
my ($user,$domain) = &get_name_dom($env{'form.group'});
@@ -413,7 +414,7 @@ sub display_directory {
$colspan_fill=' colspan="4"';
}
$r->print('<tr class="LC_browser_folder">');
- $r->print('<td'.$colspan_folder.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>'
+ $r->print('<td'.$colspan_folder.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'navmap.folder.closed.gif" class="LC_fileicon" /></td>'
.'<td>'.&mt('Go to ...').'</td>');
my %anchor_fields = (
'selectfile' => $filename.'/',
@@ -521,7 +522,7 @@ sub display_directory {
<input type="hidden" name="mode" value="selectfile" />
<p>
<input type="submit" name="submit" value="'.&mt('Select checked files, and continue selecting').'" /><br />
- <input type="button" name="doit" onClick= "finishSelect();" value="'.&mt('Select checked files, and close window').'" />
+ <input type="button" name="doit" onClick="finishSelect();" value="'.&mt('Select checked files, and close window').'" />
</p>
<input type="hidden" name="currentpath" value="'.$current_path.'" />
</form>');
@@ -1545,13 +1546,13 @@ sub course_row {
$r->print('</table>');
}
$r->print('<br />'.&mt('Add a roles-based condition').
- ' <input type="checkbox" name ="add_role_'.
+ ' <input type="checkbox" name="add_role_'.
$num.'" onClick="javascript:setRoleOptions('."'$num',
'$max_id','$content->{'domain'}','$content->{'number'}',
'$uctype'".')" value="" />');
$newrole_id = $max_id;
} else {
- $r->print('<input type="hidden" name ="add_role_'.$num.'" value="" />');
+ $r->print('<input type="hidden" name="add_role_'.$num.'" value="" />');
}
$r->print(&add_course_role($num,$newrole_id));
$r->print('</td>');
@@ -1579,7 +1580,7 @@ sub domains_row {
foreach my $dom (@{$all_doms}) {
if ((@{$content->{'dom'}} > 0)
&& (grep(/^\Q$dom\E$/,@{$content->{'dom'}}))) {
- $dom_select .= '<option value="'.$dom.'" selected>'.
+ $dom_select .= '<option value="'.$dom.'" selected="selected">'.
$dom.'</option>';
} else {
$dom_select .= '<option value="'.$dom.'">'.$dom.'</option>';
@@ -1721,7 +1722,7 @@ sub role_selectors {
if ($caller eq 'display') {
if ((@{$$content{'roles'}{$role_id}{$item}} > 0) &&
(grep(/^\Q$entry\E$/,@{$$content{'roles'}{$role_id}{$item}}))) {
- $output .= ' <option value="'.$entry.'" selected>'.
+ $output .= ' <option value="'.$entry.'" selected="selected">'.
$lookup{$item}{$entry}.'</option>';
next;
}
@@ -2137,7 +2138,7 @@ sub missing_priv {
$r->print(&mt('You do not have sufficient privileges to [_1] ',
$longtext->{$priv}));
if (defined($env{'form.group'})) {
- $r->print(&mt("in the group's file repository."));
+ $r->print(&mt("in the group's group portfolio."));
$rtnlink .= &group_args()
} else {
$r->print(&mt('in this portfolio.'));
@@ -2245,7 +2246,7 @@ sub handler {
$r->print(&mt('Not a valid group for this course'));
$earlyout = 1;
}
- $title = &mt('Group files for [_1]', $group);
+ $title = &mt('Group portfolio for [_1]', $group);
} else {
$r->print(&mt('Invalid group'));
$earlyout = 1;