Skip to content
Extraits de code Groupes Projets
Valider b2a59cc1 rédigé par Thomas Steur's avatar Thomas Steur
Parcourir les fichiers

refs #4179 use new notification system to display notification

parent 2fe40636
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -109,7 +109,7 @@ class Notification ...@@ -109,7 +109,7 @@ class Notification
public $priority = self::PRIORITY_LOW; public $priority = self::PRIORITY_LOW;
/** /**
* @param string $message The notification message. * @param string $message The notification message. Make sure to escape the message if needed.
* @throws \Exception In case the message is empty. * @throws \Exception In case the message is empty.
*/ */
public function __construct($message) public function __construct($message)
......
...@@ -13,6 +13,7 @@ namespace Piwik\Plugin; ...@@ -13,6 +13,7 @@ namespace Piwik\Plugin;
use Piwik\Config as PiwikConfig; use Piwik\Config as PiwikConfig;
use Piwik\Menu\MenuAdmin; use Piwik\Menu\MenuAdmin;
use Piwik\Menu\MenuTop; use Piwik\Menu\MenuTop;
use Piwik\Notification;
use Piwik\Piwik; use Piwik\Piwik;
use Piwik\Notification\Manager as NotificationManager; use Piwik\Notification\Manager as NotificationManager;
use Piwik\Url; use Piwik\Url;
...@@ -80,8 +81,6 @@ abstract class ControllerAdmin extends Controller ...@@ -80,8 +81,6 @@ abstract class ControllerAdmin extends Controller
} }
$view->topMenu = MenuTop::getInstance()->getMenu(); $view->topMenu = MenuTop::getInstance()->getMenu();
$view->notifications = NotificationManager::getAllNotificationsToDisplay();
NotificationManager::cancelAllNonPersistent();
$view->currentAdminMenuName = MenuAdmin::getInstance()->getCurrentAdminMenuName(); $view->currentAdminMenuName = MenuAdmin::getInstance()->getCurrentAdminMenuName();
$view->enableFrames = PiwikConfig::getInstance()->General['enable_framed_settings']; $view->enableFrames = PiwikConfig::getInstance()->General['enable_framed_settings'];
...@@ -100,20 +99,30 @@ abstract class ControllerAdmin extends Controller ...@@ -100,20 +99,30 @@ abstract class ControllerAdmin extends Controller
$pluginsLink = Url::getCurrentQueryStringWithParametersModified(array( $pluginsLink = Url::getCurrentQueryStringWithParametersModified(array(
'module' => 'CorePluginsAdmin', 'action' => 'plugins' 'module' => 'CorePluginsAdmin', 'action' => 'plugins'
)); ));
$view->invalidPluginsWarning = Piwik::translate('CoreAdminHome_InvalidPluginsWarning', array( $invalidPluginsWarning = Piwik::translate('CoreAdminHome_InvalidPluginsWarning', array(
self::getPiwikVersion(), self::getPiwikVersion(),
'<strong>' . implode('</strong>,&nbsp;<strong>', $missingPlugins) . '</strong>')) '<strong>' . implode('</strong>,&nbsp;<strong>', $missingPlugins) . '</strong>'))
. '<br/>'
. Piwik::translate('CoreAdminHome_InvalidPluginsYouCanUninstall', array( . Piwik::translate('CoreAdminHome_InvalidPluginsYouCanUninstall', array(
'<a href="' . $pluginsLink . '"/>', '<a href="' . $pluginsLink . '"/>',
'</a>' '</a>'
)); ));
if (Piwik::isUserIsSuperUser()) {
$notification = new Notification($invalidPluginsWarning);
$notification->context = Notification::CONTEXT_WARNING;
$notification->title = Piwik::translate('General_Warning') . ':';
$notification->flags = Notification::FLAG_NO_CLEAR;
Notification\Manager::notify('ControllerAdmin_InvalidPluginsWarning', $notification);
}
} }
self::checkPhpVersion($view); self::checkPhpVersion($view);
$adminMenu = MenuAdmin::getInstance()->getMenu(); $adminMenu = MenuAdmin::getInstance()->getMenu();
$view->adminMenu = $adminMenu; $view->adminMenu = $adminMenu;
$view->notifications = NotificationManager::getAllNotificationsToDisplay();
NotificationManager::cancelAllNonPersistent();
} }
static protected function getPiwikVersion() static protected function getPiwikVersion()
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
color: #9b7a44; color: #9b7a44;
float: none; float: none;
padding: 10px 35px 10px 14px; padding: 15px 35px 15px 15px;
text-shadow: 0 1px 0 rgba(255,255,255,.5); text-shadow: 0 1px 0 rgba(255,255,255,.5);
background-color: #ffffe0; background-color: #ffffe0;
border: 1px solid #e6db55; border: 1px solid #e6db55;
......
...@@ -61,13 +61,6 @@ ...@@ -61,13 +61,6 @@
{% include "@CoreHome/_warningInvalidHost.twig" %} {% include "@CoreHome/_warningInvalidHost.twig" %}
{# missing plugins warning #}
{% if isSuperUser and invalidPluginsWarning is defined %}
<div class="ajaxSuccess">
<strong>{{ 'General_Warning'|translate }}:&nbsp;</strong>{{ invalidPluginsWarning|raw }}
</div>
{% endif %}
{# old GeoIP plugin warning #} {# old GeoIP plugin warning #}
{% if isSuperUser and usingOldGeoIPPlugin is not empty %} {% if isSuperUser and usingOldGeoIPPlugin is not empty %}
<div class="ajaxSuccess"> <div class="ajaxSuccess">
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter