diff options
| author | Andrew Engelbrecht <ae@n0r.co> | 2018-04-28 21:14:05 -0400 |
|---|---|---|
| committer | Frédéric Guillot <fred@kanboard.net> | 2018-04-30 11:03:49 -0700 |
| commit | 9c50fc9eb57b7fe6bdb6b0d2905269525570f857 (patch) | |
| tree | 843f29804c4c88464466418b933b0cb93a7b2ef4 /app | |
| parent | e8df859da2894fb29cacce43ba9940b329fc1e57 (diff) | |
Don't markdown project owner's name in tooltip
Diffstat (limited to 'app')
| -rw-r--r-- | app/Helper/AppHelper.php | 5 | ||||
| -rw-r--r-- | app/Helper/ProjectHeaderHelper.php | 8 | ||||
| -rw-r--r-- | app/Template/header/title.php | 2 |
3 files changed, 10 insertions, 5 deletions
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> |