From 8fa754e4497eb3b356c1e422008dfe9aa6210bdc Mon Sep 17 00:00:00 2001 From: ADTC Date: Tue, 14 Mar 2017 12:21:25 +0800 Subject: [PATCH] Show incompatibility warning as an icon next to the version number Signed-off-by: ADTC --- bl-kernel/admin/themes/default/css/default.css | 4 ++++ bl-kernel/admin/views/plugins.php | 10 ++++++---- bl-kernel/admin/views/themes.php | 8 +++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/bl-kernel/admin/themes/default/css/default.css b/bl-kernel/admin/themes/default/css/default.css index 64f8a1ac..b9c18d5f 100644 --- a/bl-kernel/admin/themes/default/css/default.css +++ b/bl-kernel/admin/themes/default/css/default.css @@ -597,6 +597,10 @@ div.plugin-name i.settings-icon { margin-left: 3px; } +i.incompatible-warning { + color: #daa520; +} + div.plugin-links > a { display: inline-block; margin-top: 5px; diff --git a/bl-kernel/admin/views/plugins.php b/bl-kernel/admin/views/plugins.php index 30c8671f..b3077f73 100644 --- a/bl-kernel/admin/views/plugins.php +++ b/bl-kernel/admin/views/plugins.php @@ -39,13 +39,15 @@ foreach($plugins['all'] as $Plugin) echo ''; echo $Plugin->description(); - if( !$Plugin->isCompatible() ) { - echo '
This plugin is incompatible with Bludit v'.BLUDIT_VERSION.'
'; - } echo ''; + echo ' + '; + if( !$Plugin->isCompatible() ) { + echo ''; + } + echo $Plugin->version().''; echo ' - '.$Plugin->version().' '.$Plugin->author().' '; diff --git a/bl-kernel/admin/views/themes.php b/bl-kernel/admin/views/themes.php index 0fba80c5..b8565581 100644 --- a/bl-kernel/admin/views/themes.php +++ b/bl-kernel/admin/views/themes.php @@ -36,14 +36,16 @@ foreach($themes as $theme) echo ''; echo $theme['description']; + echo ''; + echo ' + '; if( !$theme['compatible'] ) { - echo '
This theme is incompatible with Bludit v'.BLUDIT_VERSION.'
'; + echo ''; } - echo ''; + echo $theme['version'].''; echo ' - '.$theme['version'].' '.$theme['author'].' ';