Merge "Changing the image block to show hide comments (Bug #1037531)"

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

@@ -49,8 +49,15 @@ class PluginBlocktypeImage extends PluginBlocktype {
         if (!empty($configdata['width'])) {
             $src .= '&maxwidth=' . $configdata['width'];
         }
+        $artefact = new ArtefactTypeImage($id);
 
+        require_once(get_config('docroot') . 'artefact/comment/lib.php');
+        require_once(get_config('docroot') . 'lib/view.php');
+        $view = new View($viewid);
+        list($commentcount, $comments) = ArtefactTypeComment::get_artefact_comments_for_view($artefact, $view, $instance->get('id'));
         $smarty = smarty_core();
+        $smarty->assign('commentcount', $commentcount);
+        $smarty->assign('comments', $comments);
         $smarty->assign('url', $wwwroot . 'artefact/artefact.php?artefact=' . $id . '&view=' . $viewid);
         $smarty->assign('src', $src);
         $smarty->assign('description', $description);

htdocs/theme/raw/artefact/file/blocktype/image/templates/image.tpl

 <div class="center imageblock" itemscope itemtype="http://schema.org/ImageObject">
 <div class="image"><a href="{$url}"><img src="{$src}" alt="{$description}" itemprop="contentURL"></a></div>
 {if $showdescription}<div class="detail" itemprop="description">{$description}</div>{/if}
+{if $commentcount || $commentcount === 0}
+{$comments|safe}
+{/if}
 </div>