diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index bb93deca6..bdc9f5e23 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -9,6 +9,7 @@ - fixed #11710: Weird license in json.js might be taken as non free - fixed #11708: Activity DeleteExpiredSessions is too slow - fixed #11621: Documentation Error: Methods that accept URLs should indicate whether or not to include Gateway + - fixed #11457: Carousel broken 7.9.8 - fixed #11651: First Day of Week is a string... diff --git a/docs/upgrades/upgrade_7.9.8-7.9.9.pl b/docs/upgrades/upgrade_7.9.8-7.9.9.pl index 8d496fa14..14b70bc79 100644 --- a/docs/upgrades/upgrade_7.9.8-7.9.9.pl +++ b/docs/upgrades/upgrade_7.9.8-7.9.9.pl @@ -32,6 +32,7 @@ my $session = start(); # this line required # upgrade functions go here addIndexToUserSessionLog($session); +addHeightToCarousel($session); finish($session); # this line required @@ -54,6 +55,15 @@ sub addIndexToUserSessionLog { print "DONE!\n" unless $quiet; } +#---------------------------------------------------------------------------- +# Describe what our function does +sub addHeightToCarousel { + my $session = shift; + print "\tAdd slide height to Carousel... " unless $quiet; + $session->db->write(q|alter table Carousel add column slideHeight int(11)|); + print "DONE!\n" unless $quiet; +} + # -------------- DO NOT EDIT BELOW THIS LINE -------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/Carousel.pm b/lib/WebGUI/Asset/Wobject/Carousel.pm index 74ef0633f..74e96defb 100644 --- a/lib/WebGUI/Asset/Wobject/Carousel.pm +++ b/lib/WebGUI/Asset/Wobject/Carousel.pm @@ -53,6 +53,13 @@ sub definition { hoverHelp => $i18n->get('carousel slideWidth description'), label => $i18n->get('carousel slideWidth label'), }, + slideHeight =>{ + fieldType => "integer", + defaultValue => 0, + tab => "display", + hoverHelp => $i18n->get('carousel slideHeight description'), + label => $i18n->get('carousel slideHeight label'), + }, items =>{ noFormPost =>1, fieldType =>'text', diff --git a/lib/WebGUI/Help/Asset_Carousel.pm b/lib/WebGUI/Help/Asset_Carousel.pm index 9a63baaf1..37eaa1011 100644 --- a/lib/WebGUI/Help/Asset_Carousel.pm +++ b/lib/WebGUI/Help/Asset_Carousel.pm @@ -20,6 +20,7 @@ our $HELP = { ], }, { 'name' => 'slideWidth', }, + { 'name' => 'slideHeight', }, ], related => [], }, diff --git a/lib/WebGUI/i18n/English/Asset_Carousel.pm b/lib/WebGUI/i18n/English/Asset_Carousel.pm index 08b6e096d..bc610dab9 100644 --- a/lib/WebGUI/i18n/English/Asset_Carousel.pm +++ b/lib/WebGUI/i18n/English/Asset_Carousel.pm @@ -33,12 +33,30 @@ our $I18N = { context => q|Description of the carousel template field, used as hover help.| }, + 'carousel slideHeight label' => { + message => q|Carousel slide height|, + lastUpdated => 0, + context => q|Slide, one "frame" or "page" in the Carousel.| + }, + + 'carousel slideHeight description' => { + message => q|Height in pixels. The Carousel will not automatically resize itself for content of various widths. Setting this width will help it render properly. If left with the default, 0, then the width of the Carousel is set by the width of the first element.|, + lastUpdated => 0, + context => q|Description of the carousel template field, used as hover help.| + }, + 'slideWidth' => { message => q|The width set for each slide in the Carousel|, lastUpdated => 0, context => q|Description of the carousel template field, used as hover help.| }, + 'slideHeight' => { + message => q|The height set for each slide in the Carousel|, + lastUpdated => 0, + context => q|Description of the carousel template field, used as hover help.| + }, + 'items label' => { message => q|Items|, lastUpdated => 0,