Fix rendering of the carousel inside of a Story. Fixes bug #12386

perlDreamer · perlDreamer · commit e046e5a8ce70 · 2012-09-20T14:00:57.000-07:00
diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
@@ -10,6 +10,7 @@
  - fixed: UpdateAssetSubscribers workflow activity ERRORs if the group cannot be found.
  - fixed: EMS has issues showing badges WITHOUT related badge groups.
  - fixed: It's okay to paste assets which are archived, because if you don't they stay in the clipboard forever.
+ - fixed #12386: Story Manager - Carousel rendering broken in Story
 
 7.10.26
  - fixed: Template diagnostics when called without a session asset.
diff --git a/docs/upgrades/packages-7.10.27/root_import_storymanager_storytemplate.wgpkg b/docs/upgrades/packages-7.10.27/root_import_storymanager_storytemplate.wgpkg
diff --git a/docs/upgrades/upgrade_7.10.26-7.10.27.pl b/docs/upgrades/upgrade_7.10.26-7.10.27.pl
@@ -32,6 +32,7 @@ BEGIN
 
 # upgrade functions go here
 fixMetaDataRevisionDates($session);
+addPhotoHeightToStoryArchive($session);
 
 finish($session); # this line required
 
@@ -91,6 +92,22 @@ sub fixMetaDataRevisionDates {
 }
 
 
+#----------------------------------------------------------------------------
+# Describe what our function does
+sub addPhotoHeightToStoryArchive {
+    my $session = shift;
+    print "\tAdd Photo Height to the Story Manager... " unless $quiet;
+    # and here's our code
+    $session->db->write(<<EOSQL);
+ALTER TABLE StoryArchive add column photoHeight INT(11);
+EOSQL
+    $session->db->write(<<EOSQL);
+UPDATE StoryArchive set photoHeight=300
+EOSQL
+    print "DONE!\n" unless $quiet;
+}
+
+
 #----------------------------------------------------------------------------
 # Describe what our function does
 #sub exampleFunction {
diff --git a/lib/WebGUI/Asset/Story.pm b/lib/WebGUI/Asset/Story.pm
@@ -966,10 +966,11 @@ sub viewTemplateVariables {
         };
         ++$photoCounter;
     }
-    $var->{hasPhotos}   = $photoCounter;
-    $var->{singlePhoto} = $photoCounter == 1;
-    $var->{canEdit}     = $self->canEdit;
-    $var->{photoWidth}  = $archive->get('photoWidth');
+    $var->{hasPhotos}    = $photoCounter;
+    $var->{singlePhoto}  = $photoCounter == 1;
+    $var->{canEdit}      = $self->canEdit;
+    $var->{photoWidth}   = $archive->get('photoWidth');
+    $var->{photoHeight}  = $archive->get('photoHeight');
     return $var;
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/StoryArchive.pm b/lib/WebGUI/Asset/Wobject/StoryArchive.pm
@@ -126,6 +126,13 @@ sub definition {
             hoverHelp    => $i18n->get('photo width help'),
             defaultValue => '300',
         },
+        photoHeight => {
+            tab          => 'display',
+            fieldType    => 'integer',
+            label        => $i18n->get('photo height'),
+            hoverHelp    => $i18n->get('photo height help'),
+            defaultValue => '300',
+        },
         editStoryTemplateId => {
             tab          => 'display',
             fieldType    => 'template',
diff --git a/lib/WebGUI/Help/Asset_Story.pm b/lib/WebGUI/Help/Asset_Story.pm
@@ -87,6 +87,7 @@ our $HELP = {
               ],
             },
             { name      => 'photoWidth',   },
+            { name      => 'photoHeight',   },
             { name      => 'hasPhotos',   },
             { name      => 'singlePhoto', },
             { name      => 'photo_loop',
diff --git a/lib/WebGUI/i18n/English/Asset_Story.pm b/lib/WebGUI/i18n/English/Asset_Story.pm
@@ -437,6 +437,12 @@ our $I18N = {
         lastUpdated => 0,
     },
 
+    'photoWidth' => {
+        message => q|The height of slides, set in the Story Archive for this Story.|,
+        context => q|Template variable|,
+        lastUpdated => 0,
+    },
+
     'hasPhoto' => {
         message => q|This template variable will be true if the a photo in the photo_loop has an image in it.|,
         context => q|Template variable|,
diff --git a/lib/WebGUI/i18n/English/Asset_StoryArchive.pm b/lib/WebGUI/i18n/English/Asset_StoryArchive.pm
@@ -321,6 +321,12 @@ our $I18N = {
         lastUpdated => 0,
     },
 
+    'photoHeight' => {
+        message => q|The height used to display photos.|,
+        context => q|Template variable.|,
+        lastUpdated => 0,
+    },
+
     'photo width' => {
         message => q|Photo width|,
         context => q|Label in the edit screen|,
@@ -333,6 +339,18 @@ our $I18N = {
         lastUpdated => 0,
     },
 
+    'photo height' => {
+        message => q|Photo Height|,
+        context => q|Label in the edit screen|,
+        lastUpdated => 0,
+    },
+
+    'photo height help' => {
+        message => q|Slides in the photo carousel have to have a fixed height to render in some browsers.  To disable this feature, set it to 0.|,
+        context => q|hoverhelp for photoHeight in the edit screen|,
+        lastUpdated => 0,
+    },
+
     'sortAlphabeticallyChronologically' => {
         message => q|Sort Order|,
         context => q|Label in the edit screen|,
