--- loncom/interface/portfolio.pm 2013/04/12 17:21:09 1.241
+++ loncom/interface/portfolio.pm 2013/07/03 16:00:03 1.247
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.241 2013/04/12 17:21:09 bisitz Exp $
+# $Id: portfolio.pm,v 1.247 2013/07/03 16:00:03 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -98,7 +98,7 @@ sub display_common {
my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');
my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');
my $help_portfolio = &Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio'));
- $r->print(&display_usage($group));
+ $r->print(&display_portfolio_usage($group,$help_portfolio));
my $parse_check;
if (!&suppress_embed_prompt()) {
$parse_check = <<"END";
@@ -112,7 +112,6 @@ sub display_common {
END
}
- $r->print('<div>'.$help_portfolio);
# Upload File
$r->print('<div class="LC_left_float">'
.'<form method="post" enctype="multipart/form-data" action="'.$escuri.'">'
@@ -149,7 +148,6 @@ END
.'</form>'
.'</div>'
);
- $r->print('</div>');
} # end "if can_upload"
my @tree = split (/\//,$current_path);
@@ -188,46 +186,21 @@ END
$r->print("</form>");
}
-sub display_usage {
- my ($group) = @_;
+sub display_portfolio_usage {
+ my ($group,$helpitem) = @_;
my $disk_quota = &get_quota($group);
my $getpropath = 1;
my $portfolio_root = &get_portfolio_root();
my ($uname,$udom) = &get_name_dom($group);
my $current_disk_usage =
&Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
- my $usage = $current_disk_usage/1000;
- my $quota = $disk_quota/1000;
- my $percent;
- if ($disk_quota == 0) {
- $percent = 100.0;
- } else {
- $percent = 100*($current_disk_usage/$disk_quota);
- }
- $usage = sprintf("%.2f",$usage);
- $quota = sprintf("%.2f",$quota);
- $percent = sprintf("%.0f",$percent);
- my ($color,$cssclass);
- if ($percent <= 60) {
- $color = '#00A000';
- } elsif ($percent > 60 && $percent < 90) {
- $color = '#FFD300';
- $cssclass = 'class="LC_warning"';
- } elsif( $percent >= 90) {
- $color = '#FF0000';
- $cssclass = 'class="LC_error"';
- }
- my $prog_width = $percent;
- if ($prog_width > 100) {
- $prog_width = 100;
- }
- my $disk_meter = '
- <div id="meter1" align="left" '.$cssclass.'>'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB <span style="font-weight:bold;">('.$percent.'%)</span>',$quota.' MB')."\n".
-' <div id="meter2" style="display:block; margin-top:5px; margin-bottom:5px; margin-left:0px; margin-right:0px; width:400px; border:1px solid #000000; height:10px;">'."\n".
-' <div id="meter3" style="display:block; background-color:'.$color.'; width:'.$prog_width.'%; height:10px; color:#000000; margin:0px;"></div>'."\n".
-' </div>'."\n".
-' </div>';
- return &Apache::loncommon::head_subbox($disk_meter);
+ return &Apache::loncommon::head_subbox(
+ '<div style="float:right;padding-top:0;margin-top;0">'
+ .$helpitem
+ .'</div>'
+ .'<div>'
+ .&Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota)
+ .'</div>');
}
sub display_directory_line {
@@ -640,7 +613,7 @@ sub display_file {
sub done {
my ($linktext,$url)=@_;
- unless (defined $linktext) {
+ unless (defined($linktext)) {
$linktext='Return to directory';
}
my %anchor_fields = (
@@ -1219,7 +1192,7 @@ sub update_access {
$totalnew = $lastitem;
my @numbers;
for (my $i=$firstitem; $i<$lastitem; $i++) {
- push (@numbers,$i);
+ push(@numbers,$i);
}
&display_access_row($r,$status,$newitem,\@numbers,
$access_controls{$file_name},$now,$then);
@@ -2101,21 +2074,24 @@ function confirmOverwrite() {
}
// ]]>
</script>
+<p>
$msg
-<br /><div class="LC_warning"><form method="post" action="$url" name="existingfile" onsubmit="return confirmOverwrite();">
-<span class="LC_nobreak">$lt{'over'}
+</p>
+<form method="post" action="$url" name="existingfile" onsubmit="return confirmOverwrite();">
+<p class="LC_nobreak">$lt{'over'}
<label><input type="radio" name="overwrite" value="1" />
$lt{'yes'}</label>
-<label><input type="radio" name="overwrite" value="0" checked="checked" />$lt{'no'}</label></span>
+<label><input type="radio" name="overwrite" value="0" checked="checked" />$lt{'no'}</label></p>
+<p>
<input type="hidden" name="action" value="cancel_overwrite" />
<input type="hidden" name="filename" value="$showfname" />
<input type="hidden" name="timestamp" value="$timestamp" />
$hidden
$parserflag
$group_elem
-<br /><br />
<input type="submit" name="process" value="$lt{'cont'}" />
-</form></div>
+</p>
+</form>
END
} else {
$r->print(
@@ -2213,10 +2189,13 @@ sub overwrite {
}
}
if ($fname eq '') {
- my $msg = &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
'so after eliminating special characters there was nothing left.',
- '<span class="LC_filename">'.$env{'form.filename'}.'</span>');
- $r->print($msg.&done(undef,$url));
+ '<span class="LC_filename">'.$env{'form.filename'}.'</span>'),1)));
+ $r->print(&done(undef,$url));
return;
}
$env{'form.'.$formname.'.filename'} = $fname;
@@ -2227,9 +2206,11 @@ sub overwrite {
\%allfiles,\%codebase,undef,undef,undef,
undef,undef,undef,\$mimetype);
if ($result !~ m|^/uploaded/|) {
- $r->print('<p class="LC_error">'.&mt('An error occurred ([_1]) while trying to overwrite [_2].'
- ,$result,&display_file(undef,$fname)).'</p>');
- $r->print(&after_overwrite(&mt('Back'),$url));
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to overwrite [_2].'
+ ,$result,&display_file(undef,$fname)),1)));
} else {
if ($mode eq 'parse') {
if ($mimetype eq 'text/html') {
@@ -2237,18 +2218,21 @@ sub overwrite {
&print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
return;
} else {
- $r->print('<p>'.&mt('Overwriting completed.').'<br />'.
- &mt('No embedded items identified.').'</p>');
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Overwriting completed.'))
+ .'<br />'.&mt('No embedded items identified.')));
}
}
+ } else {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Overwriting completed.'))));
}
- $r->print(&after_overwrite(undef,$url));
}
- return;
-}
-sub after_overwrite {
- my ($text,$url) = @_;
my $group_elem;
if (defined($env{'form.group'})) {
$group_elem = '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />';
@@ -2256,18 +2240,18 @@ sub after_overwrite {
$group_elem .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />'."\n";
}
}
- if ($text eq '') {
- $text = &mt('Done');
- }
my $hidden = &hidden_elems();
- return <<END;
-
-<h3><a href="javascript:document.overwritedone.submit();">$text</a></h3>
-<form name="overwritedone" method="post" action="$url" />
-$hidden
-$group_elem
-</form>
-END
+ $r->print(
+ &Apache::lonhtmlcommon::actionbox(
+ ['<a href="javascript:document.overwritedone.submit();">'
+ .&mt('Return to directory')
+ .'</a>'])
+ .'<form name="overwritedone" method="post" action="'.$url.'">'
+ .$hidden
+ .$group_elem
+ .'</form>'
+ );
+ return;
}
sub lock_info {
@@ -2708,7 +2692,7 @@ sub handler {
$r->print(
'<p><span class="LC_warning">'
.&mt('No file was selected to upload.')
- .'</span><<br />'
+ .'</span><br />'
.&mt('To upload a file, click [_1]Browse...[_2] and select a file, then click [_1]Upload[_2].'
,'<strong>','</strong>')
.'</p>'
@@ -2750,8 +2734,8 @@ sub handler {
} elsif ($env{'form.action'} eq 'modify_orightml') {
if ($can_upload) {
my $result =
- &Apache::loncommon::modify_html_refs('portfolio',$port_path,$uname,$udom,$group,
- $portfolio_root,$group);
+ &Apache::loncommon::modify_html_refs('portfolio',$port_path,$uname,
+ $udom,$portfolio_root);
$r->print($result.
&done('Return to directory',$url));
} else {