Refactor template assignment of top menu + isFileWritable()

13 files changed, 19 insertions, 26 deletions

diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index 3c12840267..2a971d6cf9 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -41,7 +41,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
             $view->todayArchiveTimeToLive = $todayArchiveTimeToLive;
             $view->enableBrowserTriggerArchiving = $enableBrowserTriggerArchiving;
 
-            $view->configFileNotWritable = !Piwik_Config::getInstance()->isFileWritable();
+            $this->displayWarningIfConfigFileNotWritable($view);
 
             $config = Piwik_Config::getInstance();
 
@@ -67,8 +67,6 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
 
         $view->language = Piwik_LanguagesManager::getLanguageCodeForCurrentUser();
         $this->setBasicVariablesView($view);
-        $view->topMenu = Piwik_GetTopMenu();
-        $view->menu = Piwik_GetAdminMenu();
         echo $view->render();
     }
 
@@ -130,7 +128,6 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
         $view = new Piwik_View('@CoreAdminHome/trackingCodeGenerator');
         $this->setBasicVariablesView($view);
         $view->topMenu = Piwik_GetTopMenu();
-        $view->menu = Piwik_GetAdminMenu();
 
         $viewableIdSites = Piwik_SitesManager_API::getInstance()->getSitesIdWithAtLeastViewAccess();
 
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index b8495a64b4..a4b7d397b4 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -17,8 +17,21 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin
 {
     function index()
     {
+        return $this->plugins();
+    }
+
+    function plugins()
+    {
         Piwik::checkUserIsSuperUser();
+        $view = new Piwik_View('@CorePluginsAdmin/plugins');
+        $view->pluginsInfo = $this->getPluginsInfo();
+        $this->setBasicVariablesView($view);
+        $this->displayWarningIfConfigFileNotWritable($view);
+        echo $view->render();
+    }
 
+    protected function getPluginsInfo()
+    {
         $plugins = array();
 
         $listPlugins = array_merge(
@@ -50,13 +63,7 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin
                 );
             }
         }
-
-        $view = new Piwik_View('@CorePluginsAdmin/index');
-        $view->pluginsName = $plugins;
-        $this->setBasicVariablesView($view);
-        $view->menu = Piwik_GetAdminMenu();
-        $view->configFileNotWritable = !Piwik_Config::getInstance()->isFileWritable();
-        echo $view->render();
+        return $plugins;
     }
 
     public function deactivate($redirectAfter = true)
diff --git a/plugins/CorePluginsAdmin/templates/index.twig b/plugins/CorePluginsAdmin/templates/plugins.twig
index 214a764dc9..6910b4bce4 100644
--- a/plugins/CorePluginsAdmin/templates/index.twig
+++ b/plugins/CorePluginsAdmin/templates/plugins.twig
@@ -19,7 +19,7 @@
             </tr>
             </thead>
             <tbody id="plugins">
-            {% for name,plugin in pluginsName %}
+            {% for name,plugin in pluginsInfo %}
                 {% if plugin.alwaysActivated is defined and not plugin.alwaysActivated %}
                     <tr {% if plugin.activated %}class="highlighted"{% endif %}>
                         <td class="name">
diff --git a/plugins/DBStats/Controller.php b/plugins/DBStats/Controller.php
index 2adc0cc416..a4e8d08bac 100644
--- a/plugins/DBStats/Controller.php
+++ b/plugins/DBStats/Controller.php
@@ -27,7 +27,6 @@ class Piwik_DBStats_Controller extends Piwik_Controller_Admin
         Piwik::checkUserIsSuperUser();
         $view = new Piwik_View('@DBStats/index');
         $this->setBasicVariablesView($view);
-        $view->menu = Piwik_GetAdminMenu();
 
         $view->databaseUsageSummary = $this->getDatabaseUsageSummary(true);
         $view->trackerDataSummary = $this->getTrackerDataSummary(true);
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 443baaaa12..e257d47635 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -475,7 +475,6 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin
 
         $view = new Piwik_View('@Installation/systemCheckPage');
         $this->setBasicVariablesView($view);
-        $view->menu = Piwik_GetAdminMenu();
 
         $view->duringInstall = false;
 
diff --git a/plugins/MobileMessaging/Controller.php b/plugins/MobileMessaging/Controller.php
index 01c3d731e0..2438245e82 100644
--- a/plugins/MobileMessaging/Controller.php
+++ b/plugins/MobileMessaging/Controller.php
@@ -67,7 +67,6 @@ class Piwik_MobileMessaging_Controller extends Piwik_Controller_Admin
 
         $this->setBasicVariablesView($view);
 
-        $view->menu = Piwik_GetAdminMenu();
         echo $view->render();
     }
 }
diff --git a/plugins/PleineLune/PleineLune.php b/plugins/PleineLune/PleineLune.php
index 25bfbc9744..9d035197f0 100644
--- a/plugins/PleineLune/PleineLune.php
+++ b/plugins/PleineLune/PleineLune.php
@@ -23,6 +23,7 @@ class Piwik_PleineLune extends Piwik_Plugin
             'author_homepage'      => 'http://piwik.org/',
             'version'              => Piwik_Version::VERSION,
             'translationAvailable' => true,
+            'theme'                => true,
         );
     }
 
diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php
index 6d089e42c6..4244f4ad25 100644
--- a/plugins/PrivacyManager/Controller.php
+++ b/plugins/PrivacyManager/Controller.php
@@ -118,9 +118,8 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin
             $view->dbUser = Piwik_Config::getInstance()->database['username'];
         }
         $view->language = Piwik_LanguagesManager::getLanguageCodeForCurrentUser();
-        $view->configFileNotWritable = !Piwik_Config::getInstance()->isFileWritable();
+        $this->displayWarningIfConfigFileNotWritable($view);
         $this->setBasicVariablesView($view);
-        $view->menu = Piwik_GetAdminMenu();
 
         echo $view->render();
     }
diff --git a/plugins/SecurityInfo/Controller.php b/plugins/SecurityInfo/Controller.php
index bc7cc00b62..d33c57288a 100644
--- a/plugins/SecurityInfo/Controller.php
+++ b/plugins/SecurityInfo/Controller.php
@@ -36,7 +36,6 @@ class Piwik_SecurityInfo_Controller extends Piwik_Controller_Admin
 
         $view = new Piwik_View('@SecurityInfo/index');
         $this->setBasicVariablesView($view);
-        $view->menu = Piwik_GetAdminMenu();
         $view->results = $results;
         echo $view->render();
     }
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index 5be35b59c7..7374520cd5 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -70,7 +70,6 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin
         $view->showAddSite = (boolean)Piwik_Common::getRequestVar('showaddsite', false);
 
         $this->setBasicVariablesView($view);
-        $view->menu = Piwik_GetAdminMenu();
         echo $view->render();
     }
 
@@ -121,7 +120,6 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin
         $jsTag = Piwik::getJavascriptCode($idSite, Piwik_Url::getCurrentUrlWithoutFileName());
         $view = new Piwik_View('@SitesManager/displayJavascriptCode');
         $this->setBasicVariablesView($view);
-        $view->menu = Piwik_GetAdminMenu();
         $view->idSite = $idSite;
         $site = new Piwik_Site($idSite);
         $view->displaySiteName = $site->getName();
diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php
index 2346119db0..311561a497 100644
--- a/plugins/UserCountry/Controller.php
+++ b/plugins/UserCountry/Controller.php
@@ -70,7 +70,6 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin
         $this->setUpdaterManageVars($view);
         $this->setBasicVariablesView($view);
         Piwik_Controller_Admin::setBasicVariablesAdminView($view);
-        $view->menu = Piwik_GetAdminMenu();
 
         echo $view->render();
     }
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index 79388fef7e..661b625cf2 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -85,7 +85,6 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin
         uasort($websites, array('Piwik_UsersManager_Controller', 'orderByName'));
         $view->websites = $websites;
         $this->setBasicVariablesView($view);
-        $view->menu = Piwik_GetAdminMenu();
         echo $view->render();
     }
 
@@ -126,7 +125,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin
         if (Piwik::isUserIsSuperUser()) {
             $view->userAlias = $userLogin;
             $view->userEmail = Piwik::getSuperUserEmail();
-            $view->configFileNotWritable = !Piwik_Config::getInstance()->isFileWritable();
+            $this->displayWarningIfConfigFileNotWritable($view);
 
         } else {
             $user = Piwik_UsersManager_API::getInstance()->getUser($userLogin);
@@ -163,7 +162,6 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin
         $this->initViewAnonymousUserSettings($view);
         $view->piwikHost = Piwik_Url::getCurrentHost();
         $this->setBasicVariablesView($view);
-        $view->menu = Piwik_GetAdminMenu();
         echo $view->render();
     }
 
diff --git a/plugins/VisitorGenerator/Controller.php b/plugins/VisitorGenerator/Controller.php
index e93e99dd25..5f5c0cb1f5 100644
--- a/plugins/VisitorGenerator/Controller.php
+++ b/plugins/VisitorGenerator/Controller.php
@@ -27,7 +27,6 @@ class Piwik_VisitorGenerator_Controller extends Piwik_Controller_Admin
         $view->nonce = Piwik_Nonce::getNonce('Piwik_VisitorGenerator.generate');
         $view->countActionsPerRun = count($this->getAccessLog());
         $view->accessLogPath = $this->getAccessLogPath();
-        $view->menu = Piwik_GetAdminMenu();
         echo $view->render();
     }
 
@@ -81,7 +80,6 @@ class Piwik_VisitorGenerator_Controller extends Piwik_Controller_Admin
         // Init view
         $view = new Piwik_View('@VisitorGenerator/generate');
         $this->setBasicVariablesView($view);
-        $view->menu = Piwik_GetAdminMenu();
         $view->assign('browserArchivingEnabled', $browserArchiving);
         $view->assign('timer', $timer);
         $view->assign('days', $daysToCompute);