Merge branch 'master' of https://github.com/asciimoo/searx into code_results

Conflicts:
	searx/engines/searchcode_code.py
	searx/engines/searchcode_doc.py
	searx/static/oscar/js/searx.min.js
	searx/templates/oscar/result_templates/default.html
	searx/templates/oscar/result_templates/images.html
	searx/templates/oscar/result_templates/map.html
	searx/templates/oscar/result_templates/torrent.html
	searx/templates/oscar/result_templates/videos.html

1 files changed, 88 insertions, 0 deletions

diff --git a/searx/static/themes/oscar/gruntfile.js b/searx/static/themes/oscar/gruntfile.js
new file mode 100644
index 000000000..c591e8505
--- /dev/null
+++ b/searx/static/themes/oscar/gruntfile.js
@@ -0,0 +1,88 @@
+module.exports = function(grunt) {
+
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
+    concat: {
+      options: {
+        separator: ';'
+      },
+      dist: {
+        src: ['js/searx_src/*.js'],
+        dest: 'js/searx.js'
+      }
+    },
+    uglify: {
+      options: {
+        banner: '/*! oscar/searx.min.js | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n'
+      },
+      dist: {
+        files: {
+          'js/searx.min.js': ['<%= concat.dist.dest %>']
+        }
+      }
+    },
+    jshint: {
+      files: ['gruntfile.js', 'js/searx_src/*.js'],
+      options: {
+        // options here to override JSHint defaults
+        globals: {
+          jQuery: true,
+          console: true,
+          module: true,
+          document: true
+        }
+      }
+    },
+    less: {
+        development: {
+            options: {
+                paths: ["less/oscar"]
+                //banner: '/*! less/oscar/oscar.css | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n'
+            },
+            files: {"css/oscar.css": "less/oscar/oscar.less"}
+        },
+        production: {
+            options: {
+                paths: ["less/oscar"],
+                //banner: '/*! less/oscar/oscar.css | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n',
+                cleancss: true
+            },
+            files: {"css/oscar.min.css": "less/oscar/oscar.less"}
+        },
+        bootstrap: {
+            options: {
+                paths: ["less/bootstrap"],
+                cleancss: true
+            },
+            files: {"css/bootstrap.min.css": "less/bootstrap/bootstrap.less"}
+        },
+    },
+    watch: {
+        scripts: {
+            files: ['<%= jshint.files %>'],
+            tasks: ['jshint', 'concat', 'uglify']
+        },
+        oscar_styles: {
+            files: ['less/oscar/**/*.less'],
+            tasks: ['less:development', 'less:production']
+        },
+        bootstrap_styles: {
+            files: ['less/bootstrap/**/*.less'],
+            tasks: ['less:bootstrap']
+        }
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-uglify');
+  grunt.loadNpmTasks('grunt-contrib-jshint');
+  grunt.loadNpmTasks('grunt-contrib-watch');
+  grunt.loadNpmTasks('grunt-contrib-concat');
+  grunt.loadNpmTasks('grunt-contrib-less');
+
+  grunt.registerTask('test', ['jshint']);
+
+  grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'less']);
+  
+  grunt.registerTask('styles', ['less']);
+
+};