From b5ae458a269727ac12ad136a2e27291a102524f3 Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 13 Apr 2012 20:31:32 +0200 Subject: [PATCH] carabiner_css --- .htaccess | 15 ------------ htdocs/application/config/autoload.php | 2 +- htdocs/application/views/defaults/header.php | 24 ++++++++++++++++---- htdocs/static/asset/.keep | 0 4 files changed, 21 insertions(+), 20 deletions(-) delete mode 100644 .htaccess create mode 100644 htdocs/static/asset/.keep diff --git a/.htaccess b/.htaccess deleted file mode 100644 index 87dc0f9..0000000 --- a/.htaccess +++ /dev/null @@ -1,15 +0,0 @@ - - RewriteEngine On - RewriteBase / - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteRule ^(.*)$ index.php/$1 [L] - - - - # If we don't have mod_rewrite installed, all 404's - # can be sent to index.php, and everything works as normal. - # Submitted by: ElliotHaughin - - ErrorDocument 404 /index.php - \ No newline at end of file diff --git a/htdocs/application/config/autoload.php b/htdocs/application/config/autoload.php index 7c64c54..b602db2 100644 --- a/htdocs/application/config/autoload.php +++ b/htdocs/application/config/autoload.php @@ -52,7 +52,7 @@ $autoload['packages'] = array(); | $autoload['libraries'] = array('database', 'session', 'xmlrpc'); */ -$autoload['libraries'] = array('database', 'db_session'); +$autoload['libraries'] = array('database', 'db_session', 'carabiner'); /* diff --git a/htdocs/application/views/defaults/header.php b/htdocs/application/views/defaults/header.php index 9114b68..beff52c 100755 --- a/htdocs/application/views/defaults/header.php +++ b/htdocs/application/views/defaults/header.php @@ -5,10 +5,26 @@ <?php echo $this->config->item('site_name');?> - - - - +carabiner->config(array( + 'script_dir' => 'static/js/', + 'style_dir' => 'static/styles/', + 'cache_dir' => 'static/asset/', + 'base_uri' => base_url(), + 'combine' => true, + //'dev' => true, +)); + +// CSS +$this->carabiner->css('reset.css'); +$this->carabiner->css('fonts.css'); +$this->carabiner->css('main.css'); + +$this->carabiner->display('css'); + +?> diff --git a/htdocs/static/asset/.keep b/htdocs/static/asset/.keep new file mode 100644 index 0000000..e69de29