Merge pull request #202 from hmalphettes/master

Elasticsearch-2.0 refactoring

Author: mobz

Gruntfile.js

@@ -5,26 +5,26 @@ module.exports = function(grunt) {
 	// Project configuration.
 	grunt.initConfig({
 		clean: {
-			dist: {
-				src: ['dist']
+			_site: {
+				src: ['_site']
 			}
 		},
 		concat: {
 			vendorjs: {
 				src: fileSets.vendorJs,
-				dest: 'dist/vendor.js'
+				dest: '_site/vendor.js'
 			},
 			vendorcss: {
 				src: fileSets.vendorCss,
-				dest: 'dist/vendor.css'
+				dest: '_site/vendor.css'
 			},
 			appjs: {
 				src: fileSets.srcJs,
-				dest: 'dist/app.js'
+				dest: '_site/app.js'
 			},
 			appcss: {
 				src: fileSets.srcCss,
-				dest: 'dist/app.css'
+				dest: '_site/app.css'
 			}
 		},
 
@@ -33,23 +33,23 @@ module.exports = function(grunt) {
 				expand: true,
 				cwd: 'src/app/base/',
 				src: [ '*.gif', '*.png', '*.css' ],
-				dest: 'dist/base/'
+				dest: '_site/base/'
 			},
 			iconFonts: {
 				expand: true,
 				cwd: 'src/vendor/font-awesome/fonts/',
 				src: '**',
-				dest: 'dist/fonts'
+				dest: '_site/fonts'
 			},
 			i18n: {
 				src: 'src/vendor/i18n/i18n.js',
-				dest: 'dist/i18n.js'
+				dest: '_site/i18n.js'
 			},
 			lang: {
 				expand: true,
 				cwd: 'src/app/lang/',
 				src: '**',
-				dest: 'dist/lang/'
+				dest: '_site/lang/'
 			}
 		},
 

README.textile

@@ -61,7 +61,7 @@ Then
 # @npm install@ # downloads node dev dependencies
 # @grunt dev@ # builds the distribution files, then watches the src directory for changes
 
-Changes to both dist and src directories *must* be committed, to allow people to run head without running dev tools
+Changes to both _site and src directories *must* be committed, to allow people to run head without running dev tools
 and folllow existing dev patterns, such as indenting with tabs
 
 h5. Contributing an Internationalisation
@@ -76,7 +76,7 @@ To contribute an internationalisation
 
 # Follow "Contributing" instructions above
 # Find your 2-character "ISO 639-1 language code":http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes 
-# edit index.html to add your 2 letter language code to the data-langs attribute of this line @<script src="dist/i18n.js" data-baseDir="dist/lang" data-langs="en,fr,your_lang_here"></script>@
+# edit _site/index.html to add your 2 letter language code to the data-langs attribute of this line @<script src="_site/i18n.js" data-baseDir="_site/lang" data-langs="en,fr,your_lang_here"></script>@
 # make a copy of @src/app/langs/en_strings.js@ prefixed with your langugae code
 # convert english strings and fragments to your language. "Formatting Rules":http://docs.oracle.com/javase/tutorial/i18n/format/messageintro.html
 # Submit a pull request