Merge branch 'master' into dev

Author: l-lin

.travis.yml

@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - '0.8'
   - '0.10'
 before_script:
   - 'npm install -g bower grunt-cli'

README.md

@@ -1,6 +1,71 @@
 angular-datatables [![Build Status](https://travis-ci.org/l-lin/angular-datatables.png?branch=master)](https://travis-ci.org/l-lin/angular-datatables) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)
 ================
-> Datatables for Angular.
+> Angular module that provides a `datatable` directive along with datatable options helpers.
+
+Notes
+-----
+
+The required dependencies are:
+
+* [AngularJS](http://angular.org) (tested with version 1.2.6)
+* [jQuery](http://jquery.com) (tested with version 1.11.0)
+* [Datatables](https://datatables.net) (tested with version 1.9.4)
+
+This module has been tested with the following datatables modules:
+
+* [ColReorder](https://datatables.net/extras/colreorder/) with version 1.1.0
+* [ColVis](https://datatables.net/extras/colvis/) with version 1.1.0
+* [TableTools](https://datatables.net/extras/tabletools/) with version 2.2.0
+
+This module also has a [Twitter Bootstrap](http://getbootstrap.com/) support (tested with version 3.1.1).
+
+Getting started
+---------------
+
+### Download
+
+**Manually**
+
+The files can be downloaded from:
+
+* Minified [JS](https://raw.github.com/l-lin/angular-datatables/master/dist/angular-datatables.min.js) and [CSS](https://raw.github.com/l-lin/angular-datatables/master/dist/datatables.bootstrap.min.css) for production usage
+* Un-minified [JS](https://raw.github.com/l-lin/angular-datatables/master/dist/angular-datatables.js) and [CSS](https://raw.github.com/l-lin/angular-datatables/master/dist/datatables.bootstrap.css) for development
+
+> The CSS file only contains `Twitter Bootstrap` styles to support datatables.
+
+**With Bower**
+
+```
+bower install angular-datatables
+```
+
+### Installation
+
+Include the JS file in your `index.html` file:
+
+```html
+<script src="angular-datatables.min.js"></script>
+```
+
+If you want the `Twitter Bootstrap` support, then add the CSS file:
+
+```html
+<link rel="datatables.bootstrap.min.css" rel="stylesheet">
+```
+
+Declare dependencies on your module app like this:
+
+```html
+angular.module('myModule', ['datatables']);
+```
+
+Additional notes
+----------------
+
+This module does not support multiple datatables in the same page YET!
+
+Usage
+-----
 
 See [github page](https://l-lin.github.io/angular-datatables).
 

demo/partials/getting_started.html

@@ -24,10 +24,10 @@ <h4>Manually</h4>
 		The files can be downloaded from:
 		<ul>
 			<li>
-				Minified <a href="https://raw.github.com/l-lin/angular-datatables/master/dist/angular-datatables.min.js">JS</a> for production usage
+				Minified <a href="https://raw.github.com/l-lin/angular-datatables/master/dist/angular-datatables.min.js">JS</a> and <a href="https://raw.github.com/l-lin/angular-datatables/master/dist/datatables.bootstrap.min.css">CSS</a> for production usage
 			</li>
 			<li>
-				Un-minified <a href="https://raw.github.com/l-lin/angular-datatables/master/dist/angular-datatables.js">JS</a> for development
+				Un-minified <a href="https://raw.github.com/l-lin/angular-datatables/master/dist/angular-datatables.js">JS</a> and <a href="https://raw.github.com/l-lin/angular-datatables/master/dist/datatables.bootstrap.css">CSS</a> for development
 			</li>
 		</ul>
 	</p>