Getting the max height from the img files correctly (Bug #1266586)

Problem existed where the cache didn't know the height of the files as
they had not been loaded before so the getting of the hightest one was
failing.

Changed it so that mahara passes in the height of the file to allow it
to fetch that instead.

Change-Id: I0a2cd8d316544cce65da73c1a7787759d5d6706d
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

htdocs/artefact/file/blocktype/gallery/theme/raw/squarethumbs.tpl

@@ -14,7 +14,11 @@ $j(function() {
     if ($j('#thumbnails{$instanceid}')) {
         // adjust height of image + description box to align things up
         var maxHeight = Math.max.apply(null, $j('#thumbnails{$instanceid} .thumb').map(function() {
-            return $j(this).height();
+            var height = parseInt($j(this).find('img').attr('height'));
+            if ($j(this).find('.caption').length > 0) {
+                height += parseInt($j(this).find('.caption').height());
+            }
+            return (height + 3); // we will give it a little more heigth to avoid a vertical scrollbar sometimes appearing
         }).get());
         $j('#thumbnails{$instanceid} .thumb').each(function() {
             $j(this).css('height', maxHeight);

htdocs/artefact/file/blocktype/gallery/theme/raw/thumbnails.tpl

@@ -14,7 +14,11 @@ $j(function() {
     if ($j('#thumbnails{$instanceid}')) {
         // adjust height of image + description box to align things up
         var maxHeight = Math.max.apply(null, $j('#thumbnails{$instanceid} .thumb').map(function() {
-            return $j(this).height();
+            var height = parseInt($j(this).find('img').attr('height'));
+            if ($j(this).find('.caption').length > 0) {
+                height += parseInt($j(this).find('.caption').height());
+            }
+            return (height + 3); // we will give it a little more heigth to avoid a vertical scrollbar sometimes appearing
         }).get());
         $j('#thumbnails{$instanceid} .thumb').each(function() {
             $j(this).css('height', maxHeight);