From 1f3641a82800e91ebfaed80dcbc1e35a818cf20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Wed, 15 Mar 2017 18:07:41 +0100 Subject: [PATCH 1/2] Add MagicMatcher Issue list to meta box This adds the issue list to the meta-box. SPR-881 --- Template.php | 11 ++++++++++- css/plugins/magic-matcher.less | 10 ++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Template.php b/Template.php index f1f71f4..68fd351 100644 --- a/Template.php +++ b/Template.php @@ -17,6 +17,7 @@ class Template { protected $plugins = array( 'sqlite' => null, 'tagging' => null, + 'magicmatcher' => null, ); /** @@ -44,6 +45,7 @@ class Template { $this->plugins['sqlite'] = plugin_load('helper', 'sqlite'); if($this->plugins['sqlite']) { $this->plugins['tagging'] = plugin_load('helper', 'tagging'); + $this->plugins['magicmatcher'] = plugin_load('syntax', 'magicmatcher_issuelist'); } } @@ -75,7 +77,14 @@ class Template { ); } - // fixme add magicmatcher info + if ($this->plugins['magicmatcher']) { + $tabs[] = array( + 'id' => 'spr__tab-issues', + 'label' => 'Issues', // FIXME + 'tab' => $this->plugins['magicmatcher']->getIssueListHTML(), + 'count' => $this->plugins['magicmatcher']->getCountIssues(), + ); + } return $tabs; } diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less index 84035fc..6366c45 100755 --- a/css/plugins/magic-matcher.less +++ b/css/plugins/magic-matcher.less @@ -76,6 +76,16 @@ } } + +/* + + + + + in meta box + + + + + */ +#spr__tab-issues { + ul.mmissuelist { + padding-left: 0; + margin-top: 1rem; + } +} + + /* + + + + + in content + + + + + */ a.jiralink { font-size: @font-size-default; From 9cae5e77236d47da2ce4eb8636749cb612a11a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Mon, 20 Mar 2017 16:58:22 +0100 Subject: [PATCH 2/2] Make Issues tab-heading translateable --- Template.php | 2 +- lang/en/lang.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Template.php b/Template.php index 68fd351..52d46bd 100644 --- a/Template.php +++ b/Template.php @@ -80,7 +80,7 @@ class Template { if ($this->plugins['magicmatcher']) { $tabs[] = array( 'id' => 'spr__tab-issues', - 'label' => 'Issues', // FIXME + 'label' => tpl_getLang('tab_issues'), 'tab' => $this->plugins['magicmatcher']->getIssueListHTML(), 'count' => $this->plugins['magicmatcher']->getCountIssues(), ); diff --git a/lang/en/lang.php b/lang/en/lang.php index b12f687..d06471c 100755 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -30,6 +30,7 @@ $lang['meta_box_tags_none'] = 'tags found: none'; $lang['js']['meta_box_toc_none'] = 'no Table of Contents available'; $lang['tab_tags'] = 'Tags'; +$lang['tab_issues'] = 'Issues'; $lang['quality_trigger'] = 'toggle page analysis';