Skip to content
This repository has been archived by the owner on Dec 24, 2021. It is now read-only.

Commit

Permalink
only include bootstrap css file from twitter, if user configures it i…
Browse files Browse the repository at this point in the history
…n his setup

- see issue #2
  • Loading branch information
Mischosch committed Nov 29, 2012
1 parent a289135 commit 2c3b5ff
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
9 changes: 7 additions & 2 deletions README.md
Expand Up @@ -12,6 +12,10 @@ WORK IN PROGRESS

[twitter bootstrap]: https://github.com/twitter/bootstrap/tags

Use your own bootstrap css files or enable $bootstrapIntegration = true within setup.
It will include http://twitter.github.com/bootstrap/assets/css/bootstrap.css then.
But we cannot guarantee, that this version will match with the version we use (2.2.1).

### Installation

Add `lagged/Zf_Crud` to your `composer.json`!
Expand All @@ -28,7 +32,8 @@ Add `lagged/Zf_Crud` to your `composer.json`!
protected $title = 'My Interface';
// Optional
protected $dbAdapter = 'db';
protected $count = 15;
protected $bulkDelete = false;
protected $count = 15;
protected $bulkDelete = true;
protected $bootstrapIntegration = true;
}

13 changes: 10 additions & 3 deletions library/Controller.php
Expand Up @@ -100,6 +100,11 @@ abstract class Controller extends \Zend_Controller_Action
*/
protected $bulkDelete = false;

/**
* @var bool $bootstrapIntegration Add Bootstrap css from twitter
*/
protected $bootstrapIntegration = false;


/**
* Init
Expand All @@ -119,9 +124,11 @@ public function init()

$this->_initSession();

$this->view->headLink()->appendStylesheet(
'http://twitter.github.com/bootstrap/assets/css/bootstrap-1.2.0.min.css'
);
if (true === $this->bootstrapIntegration) {
$this->view->headLink()->appendStylesheet(
'http://twitter.github.com/bootstrap/assets/css/bootstrap.css'
);
}

$this->view->assign('ui_title', $this->title);

Expand Down

0 comments on commit 2c3b5ff

Please sign in to comment.