Merge remote branch 'spunky/rfe620'
Conflicts: docs/changelog/7.x.x.txt docs/upgrades/packages-7.9.3/root_import_gallery-templates_default-gallery-edit-album.wgpkg
This commit is contained in:
Doug Bell
commit
e60c6fdc91
10 changed files with 336 additions and 16 deletions
|
|
@ -390,6 +390,29 @@ sub processPropertiesFromFormPost {
|
|||
return undef;
|
||||
}
|
||||
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
=head2 rotate ( angle )
|
||||
|
||||
Rotate the photo clockwise by the specified C<angle> (in degrees) including the
|
||||
thumbnail and all resolutions.
|
||||
|
||||
=cut
|
||||
|
||||
sub rotate {
|
||||
my $self = shift;
|
||||
my $angle = shift;
|
||||
my $storage = $self->getStorageLocation;
|
||||
|
||||
# Rotate all files in the storage
|
||||
foreach my $file (@{$storage->getFiles}) {
|
||||
$storage->rotate($file, $angle);
|
||||
}
|
||||
# Re-create thumbnail
|
||||
$self->generateThumbnail;
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
=head2 setFile ( filename )
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ use WebGUI::International;
|
|||
use WebGUI::Utility;
|
||||
use WebGUI::HTML;
|
||||
use WebGUI::ProgressBar;
|
||||
use WebGUI::Storage;
|
||||
|
||||
use Archive::Any;
|
||||
|
||||
|
|
@ -964,6 +965,7 @@ sub www_addArchive {
|
|||
$var->{ form_start }
|
||||
= WebGUI::Form::formHeader( $session, {
|
||||
action => $self->getUrl('func=addArchiveSave'),
|
||||
name => 'name="galleryAlbumAddArchive"',
|
||||
});
|
||||
$var->{ form_end }
|
||||
= WebGUI::Form::formFooter( $session );
|
||||
|
|
@ -1395,6 +1397,43 @@ sub www_edit {
|
|||
$session->errorHandler->error("Couldn't demote asset '$assetId' because we couldn't instantiate it.");
|
||||
}
|
||||
}
|
||||
# Rotate to the left
|
||||
elsif ( grep { $_ =~ /^rotateLeft-(.{22})$/ } $form->param ) {
|
||||
my $assetId = ( grep { $_ =~ /^rotateLeft-(.{22})$/ } $form->param )[0];
|
||||
$assetId =~ s/^rotateLeft-//;
|
||||
my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId );
|
||||
|
||||
if ( $asset ) {
|
||||
# Add revision and create a new version tag by doing so
|
||||
my $newRevision = $asset->addRevision;
|
||||
# Rotate photo (i.e. all attached image files) by 90° CCW
|
||||
$newRevision->rotate(-90);
|
||||
# Auto-commit version tag
|
||||
$newRevision->requestAutoCommit;
|
||||
}
|
||||
else {
|
||||
$session->log->error("Couldn't rotate asset '$assetId' because we couldn't instantiate it.");
|
||||
}
|
||||
}
|
||||
# Rotate to the right
|
||||
elsif ( grep { $_ =~ /^rotateRight-(.{22})$/ } $form->param ) {
|
||||
my $assetId = ( grep { $_ =~ /^rotateRight-(.{22})$/ } $form->param )[0];
|
||||
$assetId =~ s/^rotateRight-//;
|
||||
my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId );
|
||||
|
||||
if ( $asset ) {
|
||||
# Add revision and create a new version tag by doing so
|
||||
my $newRevision = $asset->addRevision;
|
||||
# Rotate photo (i.e. all attached image files) by 90° CW
|
||||
$newRevision->rotate(90);
|
||||
# Auto-commit version tag
|
||||
$newRevision->requestAutoCommit;
|
||||
}
|
||||
else {
|
||||
$session->log->error("Couldn't rotate asset '$assetId' because we couldn't instantiate it.");
|
||||
}
|
||||
}
|
||||
# Delete the file
|
||||
elsif ( grep { $_ =~ /^delete-(.{22})$/ } $form->param ) {
|
||||
my $assetId = ( grep { $_ =~ /^delete-(.{22})$/ } $form->param )[0];
|
||||
$assetId =~ s/^delete-//;
|
||||
|
|
@ -1414,6 +1453,7 @@ sub www_edit {
|
|||
$var->{ form_start }
|
||||
= WebGUI::Form::formHeader( $session, {
|
||||
action => $self->getParent->getUrl('func=editSave;assetId=new;class='.__PACKAGE__),
|
||||
extras => 'name="galleryAlbumAdd"',
|
||||
})
|
||||
. WebGUI::Form::hidden( $session, {
|
||||
name => "ownerUserId",
|
||||
|
|
@ -1432,6 +1472,7 @@ sub www_edit {
|
|||
$var->{ form_start }
|
||||
= WebGUI::Form::formHeader( $session, {
|
||||
action => $self->getUrl('func=edit'),
|
||||
extras => 'name="galleryAlbumEdit"',
|
||||
})
|
||||
. WebGUI::Form::hidden( $session, {
|
||||
name => "ownerUserId",
|
||||
|
|
@ -1493,23 +1534,44 @@ sub www_edit {
|
|||
id => "assetIdThumbnail_$file->{ assetId }",
|
||||
} );
|
||||
|
||||
# Raw HTML here to provide proper value for the image
|
||||
my $promoteLabel = $i18n->get( 'Move Up', 'Icon' );
|
||||
$file->{ form_promote }
|
||||
= qq{<input type="submit" name="promote-$file->{assetId}" class="promote" value="$promoteLabel" />}
|
||||
;
|
||||
= WebGUI::Form::submit( $session, {
|
||||
name => "promote-$file->{assetId}",
|
||||
value => $i18n->get( 'Move Up', 'Icon' ),
|
||||
class => "promote",
|
||||
});
|
||||
|
||||
my $demoteLabel = $i18n->get( 'Move Down', 'Icon' );
|
||||
$file->{ form_demote }
|
||||
= qq{<input type="submit" name="demote-$file->{assetId}" class="demote" value="$demoteLabel" />}
|
||||
;
|
||||
= WebGUI::Form::submit( $session, {
|
||||
name => "demote-$file->{assetId}",
|
||||
value => $i18n->get( 'Move Down', 'Icon' ),
|
||||
class => "demote",
|
||||
});
|
||||
|
||||
my $deleteConfirm = $i18n->get( 'template delete message', 'Asset_Photo' );
|
||||
my $deleteLabel = $i18n->get( 'Delete', 'Icon' );
|
||||
$file->{ form_delete }
|
||||
= qq{<input type="submit" name="delete-$file->{assetId}" class="delete" value="$deleteLabel" }
|
||||
. qq{ onclick="return confirm('$deleteConfirm')" />}
|
||||
;
|
||||
= WebGUI::Form::submit( $session, {
|
||||
name => "delete-$file->{assetId}",
|
||||
value => $i18n->get( 'Delete', 'Icon' ),
|
||||
class => "delete",
|
||||
extras => "onclick=\"return confirm('$deleteConfirm')\"",
|
||||
});
|
||||
|
||||
$file->{ form_rotateLeft }
|
||||
= WebGUI::Form::submit( $session, {
|
||||
name => "rotateLeft-$file->{assetId}",
|
||||
value => $i18n->get( 'rotate left' ),
|
||||
class => "rotateLeft",
|
||||
});
|
||||
|
||||
$file->{ form_rotateRight }
|
||||
= WebGUI::Form::submit( $session, {
|
||||
name => "rotateRight-$file->{assetId}",
|
||||
value => $i18n->get( 'rotate right' ),
|
||||
class => "rotateRight",
|
||||
});
|
||||
|
||||
$file->{ form_synopsis }
|
||||
= WebGUI::Form::HTMLArea( $session, {
|
||||
|
|
|
|||
|
|
@ -331,6 +331,14 @@ our $HELP = {
|
|||
name => 'form_demote',
|
||||
description => 'helpvar form_demote',
|
||||
},
|
||||
{
|
||||
name => 'form_rotateLeft',
|
||||
description => 'helpvar form_rotateLeft',
|
||||
},
|
||||
{
|
||||
name => 'form_rotateRight',
|
||||
description => 'helpvar form_rotateRight',
|
||||
},
|
||||
{
|
||||
name => 'form_synopsis',
|
||||
description => 'helpvar form_synopsis',
|
||||
|
|
|
|||
|
|
@ -23,6 +23,18 @@ our $I18N = {
|
|||
context => "Label for Save button",
|
||||
},
|
||||
|
||||
'rotate left' => {
|
||||
message => "90° CCW",
|
||||
lastUpdated => 1270582436,
|
||||
context => "Label for rotate left button",
|
||||
},
|
||||
|
||||
'rotate right' => {
|
||||
message => "90° CW",
|
||||
lastUpdated => 1270582436,
|
||||
context => "Label for rotate right button",
|
||||
},
|
||||
|
||||
'save message' => {
|
||||
message => 'Album settings saved.',
|
||||
lastUpdated => 0,
|
||||
|
|
@ -38,12 +50,11 @@ our $I18N = {
|
|||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
|
||||
'delete message' => {
|
||||
message => 'Album has been deleted. <a href="%s">Return to Gallery</a>',
|
||||
lastUpdated => 0,
|
||||
},
|
||||
|
||||
|
||||
'help common title' => {
|
||||
message => 'Gallery Album Variables (Common)',
|
||||
lastUpdated => 0,
|
||||
|
|
@ -524,6 +535,18 @@ our $I18N = {
|
|||
lastUpdated => 1213631346,
|
||||
context => q{Description of template variable},
|
||||
},
|
||||
|
||||
'helpvar form_rotateLeft' => {
|
||||
message => q{A button to rotate the photo by 90° counter clockwise.},
|
||||
lastUpdated => 1270582436,
|
||||
context => q{Description of template variable},
|
||||
},
|
||||
|
||||
'helpvar form_rotateRight' => {
|
||||
message => q{A button to rotate the photo by 90° clockwise.},
|
||||
lastUpdated => 1270582436,
|
||||
context => q{Description of template variable},
|
||||
},
|
||||
|
||||
'helpvar form_delete' => {
|
||||
message => q{A button to delete the image.},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue