Merge pull request #88 from tzi/pleineLune__less-installation

CSS, templates improvements. Enable Assetmanager on login page, separate css for installer/upgrader, progress in theming, Less installation. Super boulot Thomas !

2 files changed, 6 insertions, 13 deletions

diff --git a/core/AssetManager.php b/core/AssetManager.php
index ccae3e8126..21a5662479 100644
--- a/core/AssetManager.php
+++ b/core/AssetManager.php
@@ -10,11 +10,6 @@
  */
 
 /**
- * @see libs/cssmin/cssmin.php
- */
-require_once PIWIK_INCLUDE_PATH . '/libs/cssmin/cssmin.php';
-
-/**
  * @see libs/jsmin/jsmin.php
  */
 require_once PIWIK_INCLUDE_PATH . '/libs/jsmin/jsmin.php';
@@ -60,7 +55,7 @@ class Piwik_AssetManager
         if (self::getDisableMergedAssets()) {
             // Individual includes mode
             self::removeMergedAsset(self::MERGED_CSS_FILE);
-            return self::getIndividualCssIncludes();
+            self::generateMergedCssFile();
         }
         return sprintf(self::CSS_IMPORT_DIRECTIVE, self::GET_CSS_MODULE_ACTION);
     }
@@ -96,6 +91,8 @@ class Piwik_AssetManager
         }
         $rootDirectoryLen = strlen($rootDirectory);
 
+        $less = new lessc;
+
         // Loop through each css file
         $files = self::getCssFiles();
         foreach ($files as $file) {
@@ -103,6 +100,7 @@ class Piwik_AssetManager
             self::validateCssFile($file);
 
             $fileLocation = self::getAbsoluteLocation($file);
+            $less->addImportDir(dirname($fileLocation));
             $content = file_get_contents($fileLocation);
 
             // Rewrite css url directives
@@ -120,8 +118,7 @@ class Piwik_AssetManager
             $mergedContent = $mergedContent . $content;
         }
 
-        $mergedContent = cssmin::minify($mergedContent);
-        $mergedContent = str_replace("\n", "\r\n", $mergedContent);
+        $mergedContent = $less->compile($mergedContent);
 
         Piwik_PostEvent('AssetManager.filterMergedCss', array(&$mergedContent));
 
@@ -189,7 +186,7 @@ class Piwik_AssetManager
     {
         $priorityCssOrdered = array(
             'libs/',
-            'plugins/Zeitgeist/stylesheets/common.css',
+            'plugins/Zeitgeist/stylesheets/base.less',
             'plugins/Zeitgeist/stylesheets/',
             'plugins/',
         );
diff --git a/core/Twig.php b/core/Twig.php
index 47497b00be..9022c31ba7 100644
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -72,13 +72,9 @@ class Piwik_Twig
             $assetType = strtolower($params['type']);
             switch ($assetType) {
                 case 'css':
-
                     return Piwik_AssetManager::getCssAssets();
-
                 case 'js':
-
                     return Piwik_AssetManager::getJsAssets();
-
                 default:
                     throw new Exception("The twig function includeAssets 'type' parameter needs to be either 'css' or 'js'.");
             }