Merge "Adding comment display to image gallery artefact (Bug #1037531)"

htdocs/artefact/file/blocktype/gallery/lib.php

@@ -402,7 +402,17 @@ class PluginBlocktypeGallery extends PluginBlocktype {
         }
         $smarty->assign('frame', get_config_plugin('blocktype', 'gallery', 'photoframe'));
         $smarty->assign('copyright', $copyright);
+        if (!empty($configdata['artefactid'])) {
+            $artefact = $instance->get_artefact_instance($configdata['artefactid']);
 
+            require_once(get_config('docroot') . 'artefact/comment/lib.php');
+            require_once(get_config('docroot') . 'lib/view.php');
+            $view = new View($configdata['viewid']);
+            list($commentcount, $comments) = ArtefactTypeComment::get_artefact_comments_for_view($artefact, $view, $instance->get('id'));
+
+            $smarty->assign('commentcount', $commentcount);
+            $smarty->assign('comments', $comments);
+        }
         return $smarty->fetch('blocktype:gallery:' . $template . '.tpl');
     }
 

htdocs/theme/raw/artefact/file/blocktype/gallery/templates/slideshow.tpl

@@ -33,3 +33,6 @@ $j(function() {
 {else}
   {str tag=noimagesfound section=artefact.file}
 {/if}
+{if $commentcount || $commentcount === 0}
+{$comments|safe}
+{/if}

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

@@ -27,3 +27,6 @@ $j(function() {
 });
 </script>
 {if isset($copyright)}<div class="cb" id="lbBottom">{$copyright|safe}</div>{/if}
+{if $commentcount || $commentcount === 0}
+{$comments|safe}
+{/if}

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

@@ -27,3 +27,6 @@ $j(function() {
 });
 </script>
 {if isset($copyright)}<div class="cb" id="lbBottom">{$copyright|safe}</div>{/if}
+{if $commentcount || $commentcount === 0}
+{$comments|safe}
+{/if}