From 9c50fc9eb57b7fe6bdb6b0d2905269525570f857 Mon Sep 17 00:00:00 2001
From: Andrew Engelbrecht <ae@n0r.co>
Date: Sat, 28 Apr 2018 21:14:05 -0400
Subject: Don't markdown project owner's name in tooltip

---
 app/Helper/AppHelper.php           | 5 +++++
 app/Helper/ProjectHeaderHelper.php | 8 ++++----
 app/Template/header/title.php      | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/Helper/AppHelper.php b/app/Helper/AppHelper.php
index 63ebac98..3db297d8 100644
--- a/app/Helper/AppHelper.php
+++ b/app/Helper/AppHelper.php
@@ -17,6 +17,11 @@ class AppHelper extends Base
         return '<span class="tooltip"><i class="fa '.$icon.'"></i><script type="text/template"><div class="markdown">'.$this->helper->text->markdown($markdownText).'</div></script></span>';
     }
 
+    public function tooltipHTML($htmlText, $icon = 'fa-info-circle')
+    {
+        return '<span class="tooltip"><i class="fa '.$icon.'"></i><script type="text/template"><div class="markdown">'.$htmlText.'</div></script></span>';
+    }
+
     public function tooltipLink($label, $link)
     {
         return '<span class="tooltip" data-href="'.$link.'">'.$label.'</span>';
diff --git a/app/Helper/ProjectHeaderHelper.php b/app/Helper/ProjectHeaderHelper.php
index e4f96107..2eb7fa9e 100644
--- a/app/Helper/ProjectHeaderHelper.php
+++ b/app/Helper/ProjectHeaderHelper.php
@@ -67,14 +67,14 @@ class ProjectHeaderHelper extends Base
     public function getDescription(array &$project)
     {
         if ($project['owner_id'] > 0) {
-            $description = t('Project owner: ').'**'.$this->helper->text->e($project['owner_name'] ?: $project['owner_username']).'**'.PHP_EOL.PHP_EOL;
+            $description = t('Project owner: ').'<strong>'.$this->helper->text->e($project['owner_name'] ?: $project['owner_username']).'</strong>'.PHP_EOL.PHP_EOL;
 
             if (! empty($project['description'])) {
-                $description .= '***'.PHP_EOL.PHP_EOL;
-                $description .= $project['description'];
+                $description .= '<hr>'.PHP_EOL.PHP_EOL;
+                $description .= $this->helper->text->markdown($project['description']);
             }
         } else {
-            $description = $project['description'];
+            $description = $this->helper->text->markdown($project['description']);
         }
 
         return $description;
diff --git a/app/Template/header/title.php b/app/Template/header/title.php
index 75fb1af7..0c3be779 100644
--- a/app/Template/header/title.php
+++ b/app/Template/header/title.php
@@ -10,6 +10,6 @@
         <?php endif ?>
     </span>
     <?php if (! empty($description)): ?>
-        <?= $this->app->tooltipMarkdown($description) ?>
+        <?= $this->app->tooltipHTML($description) ?>
     <?php endif ?>
 </h1>
-- 
cgit v1.2.3