[system] / trunk / webwork-modperl / lib / WeBWorK / ContentGenerator.pm Repository:
ViewVC logotype

Diff of /trunk/webwork-modperl/lib/WeBWorK/ContentGenerator.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 794 Revision 795
243 my %args = %{ shift() }; 243 my %args = %{ shift() };
244 my $tail = shift; 244 my $tail = shift;
245 my @links = @_; 245 my @links = @_;
246 my $auth = $self->url_authen_args; 246 my $auth = $self->url_authen_args;
247 my $ce = $self->{courseEnvironment}; 247 my $ce = $self->{courseEnvironment};
248 my $prefix = $ce->{webworkURLs}->{htdocs}."/images";
248 my @result; 249 my @result;
249 while (@links) { 250 while (@links) {
250 my $name = shift @links; 251 my $name = shift @links;
251 my $url = shift @links; 252 my $url = shift @links;
252 my $img = shift @links; 253 my $img = shift @links;
253 my $html = ($img && $args{style} eq "images") ? CGI::img({src=>($args{imageprefix}.$img.$args{imagesuffix}), border=>""}): $name; 254 my $html =
255 ($img && $args{style} eq "images")
256 ? CGI::img(
257 {src=>($prefix."/".$img.$args{imagesuffix}),
258 border=>"",
259 alt=>"$name"})
260 : $name;
254 unless($img && !$url) { 261 unless($img && !$url) {
255 push @result, $url 262 push @result, $url
256 ? CGI::a({-href=>"$url?$auth$tail"}, $html) 263 ? CGI::a({-href=>"$url?$auth$tail"}, $html)
257 : $html; 264 : $html;
258 } 265 }

Legend:
Removed from v.794  
changed lines
  Added in v.795

aubreyja at gmail dot com
ViewVC Help
Powered by ViewVC 1.0.9