Will you add day support ?

Gruntfile.js

@@ -10,7 +10,7 @@ module.exports = function(grunt) {
 			},
 			my_target: {
 				files: {
-					'dist/timesheet.min.js': ['source/javascripts/timesheet.js']
+					'dist/timesheet-advanced.min.js': ['source/javascripts/timesheet-advanced.js']
 				}
 			}
 		},
@@ -29,7 +29,6 @@ module.exports = function(grunt) {
 				},
 				files: {
 					'dist/timesheet.min.css': 'source/stylesheets/timesheet.sass',
-					'dist/timesheet-white.min.css': 'source/stylesheets/timesheet-white.sass'
 				}
 			}
 		},
@@ -43,17 +42,17 @@ module.exports = function(grunt) {
 				}
 			}
 		},
-		simplemocha: {
-			options: {
-				globals: ['should'],
-				timeout: 3000,
-				ignoreLeaks: false,
-				grep: '',
-				ui: 'tdd',
-				reporter: 'spec'
-			},
-			all: { src: ['test/**/*.js'] }
-		},
+		//simplemocha: {
+		//	options: {
+		//		globals: ['should'],
+		//		timeout: 3000,
+		//		ignoreLeaks: false,
+		//		grep: '',
+		//		ui: 'tdd',
+		//		reporter: 'spec'
+		//	},
+		//	all: { src: ['test/**/*.js'] }
+		//},
 		express: {
 			options: {
 				port: 8080
@@ -95,13 +94,11 @@ module.exports = function(grunt) {
 		copy: {
 			gh: {
 				files: [
-					{expand: false, src: __dirname + '/source/javascripts/lib.js', 				 dest: __dirname + '/gh-pages/script/lib.js'},
+					{expand: false, src: __dirname + '/source/javascripts/lib.js', 				dest: __dirname + '/gh-pages/script/lib.js'},
 					{expand: false, src: __dirname + '/source/javascripts/main.js',				dest: __dirname + '/gh-pages/script/main.js'},
-					{expand: false, src: __dirname + '/dist/timesheet.min.js',			      dest: __dirname + '/gh-pages/script/timesheet.min.js'},
-					{expand: false, src: __dirname + '/dist/timesheet.min.css', 					 dest: __dirname + '/gh-pages/styles/timesheet.css'},
-					{expand: false, src: __dirname + '/dist/timesheet-white.min.css',			dest: __dirname + '/gh-pages/styles/timesheet-white.css'},
-					{expand: false, src: __dirname + '/dist/timesheet.min.css.map', 			 dest: __dirname + '/gh-pages/styles/timesheet.css.map'},
-					{expand: false, src: __dirname + '/dist/timesheet-white.min.css.map',	dest: __dirname + '/gh-pages/styles/timesheet-white.css.map'}
+					{expand: false, src: __dirname + '/dist/timesheet-advanced.min.js',		dest: __dirname + '/gh-pages/script/timesheet-advanced.min.js'},
+					{expand: false, src: __dirname + '/dist/timesheet.min.css', 					dest: __dirname + '/gh-pages/styles/timesheet.css'},
+					{expand: false, src: __dirname + '/dist/timesheet.min.css.map', 			dest: __dirname + '/gh-pages/styles/timesheet.css.map'},
 				]
 			}
 		}
@@ -110,20 +107,17 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-contrib-jshint');
 	grunt.loadNpmTasks('grunt-contrib-watch');
 	grunt.loadNpmTasks('grunt-simple-mocha');
-
 	grunt.loadNpmTasks('grunt-contrib-copy');
-
 	grunt.loadNpmTasks('grunt-contrib-uglify');
 	grunt.loadNpmTasks('grunt-contrib-sass');
-
 	grunt.loadNpmTasks('grunt-express-server');
-
 	grunt.loadNpmTasks('grunt-haml');
 
 	// Default task
 	grunt.registerTask('default', 	['build']);
-	grunt.registerTask('build', 		['simplemocha', 'jshint', 'uglify', 'sass']);
-	grunt.registerTask('server', 		['express:dev', 'watch' ])
+	//grunt.registerTask('build', 		['simplemocha', 'jshint', 'uglify', 'sass']);
+	grunt.registerTask('build', 		['jshint', 'uglify', 'sass']);
+	grunt.registerTask('server', 		['express:dev', 'watch' ]);
 	grunt.registerTask('gh', 				['build', 'haml:gh', 'sass:gh', 'copy:gh']);
 
 };

README.md

@@ -1,43 +1,81 @@
-# Timesheet.js
+# Timesheet-advanced.js
 
-Simple JavaScript library to create HTML time sheets. Wrapped in an example project using Middleman …
+JavaScript library to create HTML time sheets.
 
-![https://sbstjn.github.io/timesheet.js](https://raw.githubusercontent.com/sbstjn/timesheet.js/master/screen.png)
+https://ntucakovic.github.io/timesheet-advanced.js
 
-You only have to include `dist/timesheet.js` and `dist/timesheet.css` in your HTML and initialize Timesheet.js with:
+You only have to include `dist/timesheet-advanced.js` and `dist/timesheet.min.css` in your HTML and initialize time sheet with:
 
 ```HTML
-<div id="timesheet"></div>
+<div id="my-timesheet"></div>
 ```
 
 ```javascript
-new Timesheet('timesheet', 2002, 2013, [
-  ['2002', '09/2002', 'A freaking awesome time', 'lorem'],
-  ['06/2002', '09/2003', 'Some great memories', 'ipsum'],
-  ['2003', 'Had very bad luck'],
-  ['10/2003', '2006', 'At least had fun', 'dolor'],
-  ['02/2005', '05/2006', 'Enjoyed those times as well', 'ipsum'],
-  ['07/2005', '09/2005', 'Bad luck again', 'default'],
-  ['10/2005', '2008', 'For a long time nothing happened', 'dolor'],
-  ['01/2008', '05/2009', 'LOST Season #4', 'lorem'],
-  ['01/2009', '05/2009', 'LOST Season #4', 'lorem'],
-  ['02/2010', '05/2010', 'LOST Season #5', 'lorem'],
-  ['09/2008', '06/2010', 'FRINGE #1 & #2', 'ipsum']
-]);
+var bubbles = [
+  {start: '2002',    end: '09/2002', label: 'First project', type: 'red', data: { technologies: 'php,drupal,mysql,symfony' }},
+  {start: '06/2002', end: '09/2003', label: 'Second project', type: 'blue'},
+  {start: '2003',    label: 'Still working on'},
+  {start: '10/2003', end: '2006',    label: 'Yellow project', type: 'yellow', link: 'http://www.example.com'},
+  {start: '02/2005', end: '05/2006', label: 'Green project', type: 'green', link: '#'},
+  {start: '07/2005', end: '09/2005', label: 'The shortest project', type: 'purple', link: '#'}
+];
+
+new Timesheet(bubbles, {
+    container: 'my-timesheet',
+    type: 'parallel',
+    timesheetYearMin: 2002,
+    timesheetYearMax: 2008,
+    theme: 'light'
+});
 ```
 
+### Explanation
+
+'Bubbles' array contains information about all the bubbles that will appear in the time sheet. Each bubble can have:
+- start: required; starting date in one of the following formats: mm/yyyy or yyyy
+- end  : optional; end date (if no end date is given, bubble is stretched until the end of the timesheet)
+- label: required; name of the bubble (what does it refer to)
+- type : optional; color of the bubble (if nothing is given, default value is used)
+- link : optional; URL (if bubble name should act as a link)
+- data : optional; HTML data attributes of a bubble. Foreach key in data object a data attribute is created in HTML. Values must be STRINGS.
+
+Timesheet object contains information about the time sheet itself. It consists of:
+- bubbles array,
+- timesheetYearMax,
+- timesheetYearMin,
+- container : ID of the HTML element,
+- theme: light or dark,
+- type: serial or parallel.
+
+In parallel mode, every bubble is in its own row.
+
+In serial mode, bubbles are 'packed' in one row without overlapping.
+
+Parallel Dark
+
+![https://ntucakovic.github.io/timesheet-advanced.js](https://raw.githubusercontent.com/ntucakovic/timesheet-advanced.js/master/images/parallel-dark.png)
+
+Serial Dark
+
+![https://ntucakovic.github.io/timesheet-advanced.js](https://raw.githubusercontent.com/ntucakovic/timesheet-advanced.js/master/images/serial-dark.png)
+
+Serial Light
+
+![https://ntucakovic.github.io/timesheet-advanced.js](https://raw.githubusercontent.com/ntucakovic/timesheet-advanced.js/master/images/serial-light.png)
+
+
 ### Bower
 
-`$ > bower install https://github.com/sbstjn/timesheet.js.git`
+`$ > bower install timesheet-advanced.js`
 
 ## Grunt commands
 
 Use `grunt` to build all JavaScript and StyleSheet files located inside `dist/`. 
 
-Use `grunt server` to start a local web server on [localhost:8080](http://localhost:8080) to customize Timesheet.js, afterwards run `grunt` to compile all needed files.
+Use `grunt server` to start a local web server on [localhost:8080](http://localhost:8080) to customize Timesheet-advanced.js, afterwards run `grunt` to compile all needed files.
 
-Use `grunt gh` to generate the site and files available at [sbstjn.github.io/timesheet.js](http://sbstjn.github.io/timesheet.js) into the `gh-pages` folder.
+Use `grunt gh` to generate the site and files available at [ntucakovic.github.io/timesheet-advanced.js](http://ntucakovic.github.io/timesheet-advanced.js) into the `gh-pages` folder.
 
 ## License
 
-Timesheet.js is licensed under MIT License.
+Timesheet-advanced.js is licensed under MIT License.

bower.json

@@ -1,17 +1,20 @@
 {
-  "name": "timesheet.js",
-  "homepage": "https://sbstjn.github.io/timesheet.js/",
+  "name": "timesheet-advanced.js",
+  "version": "1.0.1",
+  "homepage": "https://github.com/ntucakovic/timesheet-advanced.js",
   "authors": [
-    "sbstjn <[email protected]>"
+    "Jelena <[email protected]>",
+    "Nikola <[email protected]>"
   ],
-  "description": "With Timesheet.js you can easily create simple time and data sheets or timelines using HTML5, JavaScript and CSS3. Yep, it's a Vanilla JS library!",
-  "main": ["dist/timesheet.min.js", "dist/timesheet.min.css"],
+  "description": "Timesheet-advanced.js is improved version of timesheet.js plugin with more functionality and more customization options.",
+  "main": ["dist/timesheet-advanced.min.js", "dist/timesheet.min.css"],
   "moduleType": [
     "amd"
   ],
   "keywords": [
     "timeline",
     "timesheet",
+    "timesheet-advanced",
     "timebar",
     "line",
     "bar",
@@ -26,7 +29,6 @@
     "bower_components",
     "test",
     "tests",
-    "screen.png",
     "source",
     "Gruntfile.js",
     "package.json"