From a48b7fc7b68885b003fefbeb2d29f40d8e306f0d Mon Sep 17 00:00:00 2001 From: Oreolek Date: Fri, 28 Dec 2012 12:07:16 +0700 Subject: [PATCH] Added LESS support. --- .gitmodules | 3 +++ {assets => application/assets}/stylesheets/base.less | 2 +- {assets => application/assets}/stylesheets/colors.less | 0 {assets => application/assets}/stylesheets/layout.less | 0 application/assets/stylesheets/style.less | 3 +++ application/bootstrap.php | 3 ++- application/classes/controller/header.php | 3 ++- application/config/database.php | 2 +- application/config/less.php | 8 ++++++++ application/views/header.php | 4 ++-- assets/stylesheets/compile.sh | 4 ---- modules/less | 1 + 12 files changed, 23 insertions(+), 10 deletions(-) rename {assets => application/assets}/stylesheets/base.less (99%) rename {assets => application/assets}/stylesheets/colors.less (100%) rename {assets => application/assets}/stylesheets/layout.less (100%) create mode 100644 application/assets/stylesheets/style.less create mode 100644 application/config/less.php delete mode 100755 assets/stylesheets/compile.sh create mode 160000 modules/less diff --git a/.gitmodules b/.gitmodules index a05dc37..3ea55fb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "modules/markdown"] path = modules/markdown url = git://github.com/aptgraph/kohana-markdown.git +[submodule "modules/less"] + path = modules/less + url = git://github.com/mongeslani/kohana-less.git diff --git a/assets/stylesheets/base.less b/application/assets/stylesheets/base.less similarity index 99% rename from assets/stylesheets/base.less rename to application/assets/stylesheets/base.less index a537118..7f88117 100644 --- a/assets/stylesheets/base.less +++ b/application/assets/stylesheets/base.less @@ -177,4 +177,4 @@ th,td,caption { tfoot { font-style: italic; -} \ No newline at end of file +} diff --git a/assets/stylesheets/colors.less b/application/assets/stylesheets/colors.less similarity index 100% rename from assets/stylesheets/colors.less rename to application/assets/stylesheets/colors.less diff --git a/assets/stylesheets/layout.less b/application/assets/stylesheets/layout.less similarity index 100% rename from assets/stylesheets/layout.less rename to application/assets/stylesheets/layout.less diff --git a/application/assets/stylesheets/style.less b/application/assets/stylesheets/style.less new file mode 100644 index 0000000..aae90d3 --- /dev/null +++ b/application/assets/stylesheets/style.less @@ -0,0 +1,3 @@ +@import "colors"; +@import "layout"; +@import "base"; diff --git a/application/bootstrap.php b/application/bootstrap.php index 236f692..9273f4c 100644 --- a/application/bootstrap.php +++ b/application/bootstrap.php @@ -80,7 +80,7 @@ if (isset($_SERVER['KOHANA_ENV'])) * - boolean caching enable or disable internal caching FALSE */ Kohana::init(array( - 'base_url' => '/', + 'base_url' => '/phunt', 'index_file' => FALSE, 'errors' => TRUE, 'profile' => (Kohana::$environment == Kohana::DEVELOPMENT), @@ -110,6 +110,7 @@ Kohana::modules(array( // 'unittest' => MODPATH.'unittest', // Unit testing // 'userguide' => MODPATH.'userguide', // User guide and API documentation 'markdown' => MODPATH.'markdown', // Markdown module + 'less' => MODPATH.'less' )); /** diff --git a/application/classes/controller/header.php b/application/classes/controller/header.php index 946e34a..3a7d329 100644 --- a/application/classes/controller/header.php +++ b/application/classes/controller/header.php @@ -4,6 +4,7 @@ class Controller_Header extends Controller_Template { public $template = 'header'; public function action_standard() { $this->template->title = $this->request->post('title'); + $this->template->stylesheet = Less::compile(APPPATH.'assets/stylesheets/style'); $scripts = $this->request->post('scripts'); $temp = ""; if (is_array($scripts)) foreach($scripts as $script): @@ -12,4 +13,4 @@ class Controller_Header extends Controller_Template { $this->template->scripts = $temp; } public function action_view(){$this->request->redirect('');} -} \ No newline at end of file +} diff --git a/application/config/database.php b/application/config/database.php index f0691d3..aab6342 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -18,7 +18,7 @@ return array * Ports and sockets may be appended to the hostname. */ 'hostname' => 'localhost', - 'database' => 'plastek', + 'database' => 'dandelion', 'username' => 'dandelion', 'password' => '', 'persistent' => FALSE, diff --git a/application/config/less.php b/application/config/less.php new file mode 100644 index 0000000..9e8c8c8 --- /dev/null +++ b/application/config/less.php @@ -0,0 +1,8 @@ + TRUE, + 'path' => 'application/cache/css/', + +); diff --git a/application/views/header.php b/application/views/header.php index 1a30e84..fc3abf6 100644 --- a/application/views/header.php +++ b/application/views/header.php @@ -4,7 +4,7 @@ <?php echo $title ?> ' rel='shortcut icon' type='image/x-icon'/> - + @@ -15,4 +15,4 @@ -
\ No newline at end of file +
diff --git a/assets/stylesheets/compile.sh b/assets/stylesheets/compile.sh deleted file mode 100755 index c73174c..0000000 --- a/assets/stylesheets/compile.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -lessc -x base.less >main.css -lessc -x layout.less >>main.css -lessc -x colors.less >>main.css \ No newline at end of file diff --git a/modules/less b/modules/less new file mode 160000 index 0000000..18624cc --- /dev/null +++ b/modules/less @@ -0,0 +1 @@ +Subproject commit 18624ccfdf559e2eedd1fe9c9bcdadd99fccf0b1