fixed gallery edit album buttons to work properly in IE6/7

This commit is contained in:
Doug Bell 2008-06-17 20:42:18 +00:00
parent 3bed35a223
commit 3b3a733a19
3 changed files with 20 additions and 14 deletions

View file

@ -18,6 +18,7 @@
- fixed: Adding Donation Asset breaks style template - fixed: Adding Donation Asset breaks style template
- fixed: Adding Flat Discount Coupon causes "Problem w/ Request" error - fixed: Adding Flat Discount Coupon causes "Problem w/ Request" error
- fixed: No label for yes/no radio buttons - fixed: No label for yes/no radio buttons
- fixed: Gallery Edit Album buttons did not work properly in IE
7.5.12 7.5.12
- skipping this release - skipping this release

View file

@ -914,8 +914,9 @@ sub www_edit {
return $self->www_view; return $self->www_view;
} }
# Promote the file # Promote the file
elsif ( $form->get("promote") ) { elsif ( grep { $_ =~ /^promote-(.{22})$/ } $form->param ) {
my $assetId = $form->get("promote"); my $assetId = ( grep { $_ =~ /^promote-(.{22})$/ } $form->param )[0];
$assetId =~ s/^promote-//;
my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId );
if ( $asset ) { if ( $asset ) {
$asset->promote; $asset->promote;
@ -925,8 +926,9 @@ sub www_edit {
} }
} }
# Demote the file # Demote the file
elsif ( $form->get("demote") ) { elsif ( grep { $_ =~ /^demote-(.{22})$/ } $form->param ) {
my $assetId = $form->get("demote"); my $assetId = ( grep { $_ =~ /^demote-(.{22})$/ } $form->param )[0];
$assetId =~ s/^demote-//;
my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId );
if ( $asset ) { if ( $asset ) {
$asset->demote; $asset->demote;
@ -935,8 +937,9 @@ sub www_edit {
$session->errorHandler->error("Couldn't demote asset '$assetId' because we couldn't instantiate it."); $session->errorHandler->error("Couldn't demote asset '$assetId' because we couldn't instantiate it.");
} }
} }
elsif ( $form->get("delete") ) { elsif ( grep { $_ =~ /^delete-(.{22})$/ } $form->param ) {
my $assetId = $form->get("delete"); my $assetId = ( grep { $_ =~ /^delete-(.{22})$/ } $form->param )[0];
$assetId =~ s/^delete-//;
my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId ); my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId );
if ( $asset ) { if ( $asset ) {
$asset->purge; $asset->purge;
@ -989,7 +992,8 @@ sub www_edit {
.= WebGUI::Form::hidden( $session, { .= WebGUI::Form::hidden( $session, {
name => "proceed", name => "proceed",
value => "showConfirmation", value => "showConfirmation",
}); })
;
$var->{ form_end } $var->{ form_end }
= WebGUI::Form::formFooter( $session ); = WebGUI::Form::formFooter( $session );
@ -1027,21 +1031,22 @@ sub www_edit {
# Raw HTML here to provide proper value for the image # Raw HTML here to provide proper value for the image
$file->{ form_promote } $file->{ form_promote }
= qq{<button type="submit" name="promote" class="promote" value="$file->{assetId}" onclick="this.setAttribute('innerHTML','$file->{assetId}')">} = qq{<button type="submit" name="promote-$file->{assetId}" class="promote">}
. $session->icon->moveUp( undef, undef, "disabled" ) . $session->icon->moveUp( undef, undef, "disabled" )
. qq{</button>} . qq{</button>}
; ;
$file->{ form_demote } $file->{ form_demote }
= qq{<button type="submit" name="demote" class="demote" value="$file->{assetId}" onclick="this.setAttribute('innerHTML','$file->{assetId}')">} = qq{<button type="submit" name="demote-$file->{assetId}" class="demote">}
. $session->icon->moveDown( undef, undef, "disabled" ) . $session->icon->moveDown( undef, undef, "disabled" )
. qq{</button>} . qq{</button>}
; ;
my $deleteConfirm = $i18n->get( 'template delete message', 'Asset_Photo' ); my $deleteConfirm = $i18n->get( 'template delete message', 'Asset_Photo' );
my $deleteLabel = $i18n->get( 'Delete', 'Icon' );
$file->{ form_delete } $file->{ form_delete }
= qq!<button onclick="if ( confirm('$deleteConfirm') ) { this.setAttribute('innerHTML','$file->{assetId}'); return true; } else { return false };" type="submit" name="delete" class="delete" value="$file->{assetId}">! = qq{<button onclick="return confirm('$deleteConfirm')" type="submit" name="delete-$file->{assetId}" class="delete">}
. $session->icon->delete( undef, undef, "disabled" ) . qq{<img src="/extras/toolbar/bullet/delete.gif" style="vertical-align:middle;border: 0px;" alt="$deleteLabel" title="$deleteLabel" />}
. qq{</button>} . qq{</button>}
; ;
@ -1051,7 +1056,7 @@ sub www_edit {
value => $form->get( "fileSynopsis_$file->{assetId}" ) || $file->{ synopsis }, value => $form->get( "fileSynopsis_$file->{assetId}" ) || $file->{ synopsis },
richEditId => $self->getParent->get( 'richEditIdFile' ), richEditId => $self->getParent->get( 'richEditIdFile' ),
height => 150, height => 150,
width => 400, width => 300,
}); });
} }