From ac7481780484c4dbe2e18468cb68f6b046941370 Mon Sep 17 00:00:00 2001 From: Karol Janyst Date: Tue, 2 Aug 2011 11:03:30 +0200 Subject: [PATCH] Changes and fixes for Kohana 3.2 --- .gitmodules | 3 +++ README.md | 22 ++++++++++++++-------- classes/less/.DS_Store | Bin 6148 -> 0 bytes classes/less/core.php | 38 ++++++++++++++++++++++---------------- vendor/lessphp | 1 + 5 files changed, 40 insertions(+), 24 deletions(-) create mode 100644 .gitmodules delete mode 100644 classes/less/.DS_Store create mode 160000 vendor/lessphp diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..2d7b674 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "vendor/lessphp"] + path = vendor/lessphp + url = git://github.com/leafo/lessphp.git diff --git a/README.md b/README.md index 1ca9cba..ee991af 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -KO3 LESS Module v.1.1 -===================== +KO3 LESS Module v.1.1.1 +======================= LESS Module is a port of Leaf Corcoran's [LESSPHP](http://leafo.net/lessphp) for Kohana 3 It adopts some of Alex Sancho's Kohana 2.3 Assets Module codes for CSS compression, credits goes to them @@ -13,12 +13,11 @@ To Use 3. Copy the less config file from /modules/less/config/less.php to your application's config directory 4. From your less.php config file, put the 'path' to where you want the CSS files compiled / compressed, the folder must be writable 5. You can set 'compress' to TRUE on your less.php config file if you want your CSS files to be combined in to one file and compressed (to lessen server calls) -6. Checkout how to use through the included sample-code folder, that folder is not part of the module Sample Code ------------ - +Default less files extension is set into `Less::$extension` and is `.less`. ** MODPATH/baseModule/media/css/layout.less ** @@ -60,27 +59,34 @@ Sample Code 'compress' => TRUE, ); -** APPPATH/classes/controller/sample.php ** +** In your controller ** class Controller_Sample extends Controller_Template { public $template = 'template'; - public function action_index() + public function action_example1() { // no need to add .less extension // you can put your less files anywhere $less_files = array ( - MODPATH.'baseModule/media/css/layout', + MODPATH.'baseModule/media/css/layout.less', APPPATH.'media/css/style', ); $this->template->stylesheet = Less::compile($less_files); } + + public function action_example2() + { + // you can pass just single file + + $this->template->stylesheet = Less::compile(APPPATH.'media/css/style'); + } } -** APPPATH/views/template.php ** +** In your template ** diff --git a/classes/less/.DS_Store b/classes/less/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0load('less'); // if compression is allowed if ($config['compress']) @@ -96,12 +105,9 @@ class Less_Core // if the file exists no need to generate if ( ! file_exists($filename)) { - // create data holder - $data = ''; + touch($filename, filemtime($file) - 3600); - touch($filename, filemtime($file.'.less') - 3600); - - lessc::ccompile($file.'.less', $filename); + lessc::ccompile($file, $filename); } return $filename; @@ -116,7 +122,7 @@ class Less_Core protected static function _combine($files) { // get assets' css config - $config = Kohana::config('less'); + $config = Kohana::$config->load('less'); // get the most recent modified time of any of the files $last_modified = self::_get_last_modified($files); @@ -153,7 +159,7 @@ class Less_Core foreach($files as $file) { - $data .= file_get_contents($file.'.less'); + $data .= file_get_contents($file); } echo $data; @@ -196,7 +202,7 @@ class Less_Core foreach ($files as $file) { - $modified = filemtime($file.'.less'); + $modified = filemtime($file); if ($modified !== false and $modified > $last_modified) $last_modified = $modified; } diff --git a/vendor/lessphp b/vendor/lessphp new file mode 160000 index 0000000..c26bc93 --- /dev/null +++ b/vendor/lessphp @@ -0,0 +1 @@ +Subproject commit c26bc93eb07014b422251a92d94fd40a915fd199