diff --git a/resources/gulp/build.js b/resources/gulp/build.js
index 20e5f4567b..fcea6b4abe 100644
--- a/resources/gulp/build.js
+++ b/resources/gulp/build.js
@@ -1,278 +1,190 @@
var gulp = require('gulp');
var util = require('gulp-util');
-var rename = require('gulp-rename');
-var concat = require('gulp-concat');
-var uglify = require('gulp-uglify');
-var cssmin = require('gulp-cssmin');
-var sass = require('gulp-sass');
var config = require('./config.js');
var debug = require('gulp-debug');
var fs = require('fs');
+var utils = require('./utils.js');
+
+gulp.task('build-common', function(){
+ var commonGroup = [
+ // config.paths.dist + 'assets/bootstrap/js/bootstrap.js', // should append no conflict
+ config.paths.dist + 'include/jslibs/jquery.mousewheel.js',
+ // jquery ui date picker langs
+ config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-ar.js',
+ config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-de.js',
+ config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-es.js',
+ config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-fr.js',
+ config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-nl.js',
+ config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-en-GB.js',
+ config.paths.vendors + 'jquery.cookie/jquery.cookie.js',
+ config.paths.dist + 'include/jslibs/jquery.contextmenu_scroll.js',
+ config.paths.dist + 'include/jquery.common.js',
+ config.paths.dist + 'include/jquery.tooltip.js',
+ config.paths.dist + 'skins/prod/jquery.Dialog.js',
+ config.paths.vendors + 'swfobject/swfobject/swfobject.js', // @TODO: should be moved away (embed-bundle)
+ config.paths.dist + 'include/jslibs/flowplayer/flowplayer-3.2.13.min.js' // @TODO: should be moved away (embed-bundle)
+ ];
+ return utils.buildJsGroup(commonGroup, 'common', 'common/js');
+});
+
+gulp.task('build-prod', function(){
+ var prodGroup = [
+ config.paths.vendors + 'underscore-amd/underscore.js',
+ config.paths.dist + 'include/jslibs/colorpicker/js/colorpicker.js',
+ config.paths.dist + 'include/jslibs/jquery.lazyload/jquery.lazyload.1.8.1.js',
+ config.paths.vendors + 'humane-js/humane.js', // @TODO > extra files
+ config.paths.vendors + 'blueimp-load-image/js/load-image.js', // @TODO > extra files
+ config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js',
+ config.paths.vendors + 'jquery-file-upload/js/jquery.fileupload.js',
+ config.paths.dist + 'include/jslibs/jquery.form.2.49.js',
+ config.paths.dist + 'include/jslibs/jquery.vertical.buttonset.js',
+ config.paths.dist + 'include/js/jquery.Selection.js',
+ config.paths.dist + 'include/js/jquery.Edit.js',
+ config.paths.dist + 'include/js/jquery.lists.js',
+ config.paths.dist + 'skins/prod/jquery.Prod.js',
+ config.paths.dist + 'skins/prod/jquery.Feedback.js',
+ config.paths.dist + 'skins/prod/jquery.Results.js',
+ config.paths.dist + 'skins/prod/jquery.main-prod.js',
+ config.paths.dist + 'skins/prod/jquery.WorkZone.js',
+ config.paths.dist + 'skins/prod/jquery.Alerts.js',
+ config.paths.dist + 'skins/prod/jquery.Upload.js',
+ config.paths.dist + 'include/jslibs/pixastic.custom.js',
+ config.paths.dist + 'skins/prod/ThumbExtractor.js',
+ config.paths.dist + 'skins/prod/publicator.js',
+ config.paths.dist + 'include/jslibs/jquery.sprintf.1.0.3.js',
+ config.paths.dist + 'include/jquery.p4.preview.js',
+ config.paths.dist + 'skins/prod/jquery.edit.js',
+ config.paths.dist + 'include/jslibs/jquery.color.animation.js',
+ config.paths.dist + 'include/jquery.image_enhancer.js',
+ config.paths.vendors + 'jquery.treeview/jquery.treeview.js',
+ config.paths.vendors + 'jquery.treeview/jquery.treeview.async.js',
+ config.paths.vendors + 'fancytree/dist/jquery.fancytree-all.min.js'
+ ];
+ return utils.buildJsGroup(prodGroup, 'prod', 'prod/js');
+});
+gulp.task('build-thesaurus', function(){
+ var thesaurusGroup = [
+ config.paths.dist + 'skins/thesaurus/win.js',
+ config.paths.dist + 'skins/thesaurus/xmlhttp.js',
+ config.paths.dist + 'skins/thesaurus/thesaurus.js',
+ config.paths.dist + 'skins/thesaurus/sprintf.js'
+ ];
+ return utils.buildJsGroup(thesaurusGroup, 'thesaurus', 'thesaurus/js');
+});
+gulp.task('build-uploadFlash', function(){
+ var uploadFlashGroup = [
+ config.paths.dist + 'include/jslibs/SWFUpload/swfupload.js',
+ config.paths.dist + 'include/jslibs/SWFUpload/plugins/swfupload.queue.js'
+ ];
+ return utils.buildJsGroup(uploadFlashGroup, 'uploadFlash', 'upload/js');
+});
+gulp.task('build-lightbox', function(){
+ var lightboxGroup = [
+ config.paths.dist + 'skins/lightbox/jquery.lightbox.js'
+ ];
+
+ var lightboxIE6Group = [
+ config.paths.dist + 'skins/lightbox/jquery.lightbox.ie6.js'
+ ];
+ utils.buildJsGroup(lightboxIE6Group, 'lightboxIe6', 'lightbox/js');
+ return utils.buildJsGroup(lightboxGroup, 'lightbox', 'lightbox/js');
+});
+
+gulp.task('build-admin', function(){
+ var adminGroup = [
+ config.paths.vendors + 'underscore-amd/underscore.js',
+ config.paths.vendors + 'jquery.treeview/jquery.treeview.js',
+ config.paths.dist + 'include/jquery.kb-event.js',
+ config.paths.dist + 'skins/admin/template-dialogs.js',
+ // loaded via requirejs
+ // config.paths.vendors + 'blueimp-load-image/js/load-image.js',
+ // config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js',
+ // config.paths.vendors + 'jquery-file-upload/js/jquery.fileupload.js',
+ config.paths.vendors + 'requirejs/require.js',
+ config.paths.dist + 'scripts/apps/admin/require.config.js',
+ config.paths.dist + 'scripts/apps/admin/main/main.js'
+ ];
+ utils.buildJsGroup(adminGroup, 'admin', 'admin/js');
+});
+
+gulp.task('build-report', function(){
+ var reportGroup = [
+ config.paths.dist + 'include/jslibs/jquery.print.js',
+ config.paths.dist + 'include/jslibs/jquery.cluetip.js',
+ config.paths.dist + 'include/jquery.nicoslider.js',
+ config.paths.dist + 'skins/report/report.js'
+ ];
+ return utils.buildJsGroup(reportGroup, 'report', 'report/js');
+});
+
+gulp.task('build-account', function(){
+ var accountGroup = [
+ config.paths.vendors + 'requirejs/require.js',
+ config.paths.dist + 'skins/account/account.js'
+ ];
+ return utils.buildJsGroup(accountGroup, 'account', 'account/js');
+});
+
+gulp.task('build-permaview', function(){
+ var permaviewGroup = [
+ config.paths.dist + 'include/jslibs/jquery.mousewheel.js',
+ config.paths.dist + 'include/jquery.image_enhancer.js',
+ config.paths.vendors + 'swfobject/swfobject/swfobject.js', // @TODO: should be moved away (embed-bundle)
+ config.paths.dist + 'include/jslibs/flowplayer/flowplayer-3.2.13.min.js' // @TODO: should be moved away (embed-bundle)
+ ];
+ return utils.buildJsGroup(permaviewGroup, 'permaview', 'permaview/js');
+});
+
+gulp.task('build-setup', function(){
+ var setupGroup = [
+ config.paths.vendors + 'jquery.cookie/jquery.cookie.js',
+ config.paths.dist + 'include/jslibs/jquery-validation/jquery.validate.js',
+ config.paths.dist + 'include/jslibs/jquery-validate.password/jquery.validate.password.js',
+ config.paths.dist + 'include/path_files_tests.jquery.js'
+ ];
+ return utils.buildJsGroup(setupGroup, 'setup', 'setup/js');
+});
+gulp.task('build-authentication', function(){
+ var authenticationGroup = [
+ config.paths.vendors + 'requirejs/require.js',
+ config.paths.dist + 'scripts/apps/login/home/config.js'
+ ];
+ return utils.buildJsGroup(authenticationGroup, 'authentication', 'authentication/js');
+});
+gulp.task('build', ['build-vendors'], function(){
+ gulp.start('build-common');
+ gulp.start('build-prod');
+ gulp.start('build-thesaurus');
+ gulp.start('build-uploadFlash');
+ gulp.start('build-lightbox');
+ gulp.start('build-admin');
+ gulp.start('build-report');
+ gulp.start('build-account');
+ gulp.start('build-permaview');
+ gulp.start('build-setup');
+ gulp.start('build-authentication');
+});
-
-var commonGroup = [
- // config.paths.dist + 'assets/bootstrap/js/bootstrap.js', // should append no conflict
- config.paths.dist + 'include/jslibs/jquery.mousewheel.js',
- // jquery ui date picker langs
- config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-ar.js',
- config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-de.js',
- config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-es.js',
- config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-fr.js',
- config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-nl.js',
- config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-en-GB.js',
- config.paths.vendors + 'jquery.cookie/jquery.cookie.js',
- config.paths.dist + 'include/jslibs/jquery.contextmenu_scroll.js',
- config.paths.dist + 'include/jquery.common.js',
- config.paths.dist + 'include/jquery.tooltip.js',
- config.paths.dist + 'skins/prod/jquery.Dialog.js',
- config.paths.vendors + 'swfobject/swfobject/swfobject.js', // @TODO: should be moved away (embed-bundle)
- config.paths.dist + 'include/jslibs/flowplayer/flowplayer-3.2.13.min.js' // @TODO: should be moved away (embed-bundle)
-];
-
-var accountGroup = [
- // '//include/jslibs/jquery.contextmenu_scroll.js',
- //'//assets/jquery.cookie/jquery.cookie.js',
- // '//include/jquery.common.js',
- config.paths.vendors + 'requirejs/require.js',
- config.paths.dist + 'skins/account/account.js'
-];
-
-var authenticationGroup = [
- config.paths.vendors + 'requirejs/require.js',
- config.paths.dist + 'scripts/apps/login/home/config.js'
-];
-
-var adminGroup = [
- config.paths.vendors + 'underscore-amd/underscore.js',
- config.paths.vendors + 'jquery.treeview/jquery.treeview.js',
- config.paths.dist + 'include/jquery.kb-event.js',
- config.paths.dist + 'skins/admin/template-dialogs.js',
- // loaded via requirejs
- // config.paths.vendors + 'blueimp-load-image/js/load-image.js',
- // config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js',
- // config.paths.vendors + 'jquery-file-upload/js/jquery.fileupload.js',
- config.paths.vendors + 'requirejs/require.js',
- config.paths.dist + 'scripts/apps/admin/require.config.js',
- config.paths.dist + 'scripts/apps/admin/main/main.js',
- // /assets/requirejs/require.js,/scripts/apps/admin/require.config.js,/scripts/apps/admin/main/main.js
-];
-
-var reportGroup = [
- config.paths.dist + 'include/jslibs/jquery.print.js',
- config.paths.dist + 'include/jslibs/jquery.cluetip.js',
- config.paths.dist + 'include/jquery.nicoslider.js',
- config.paths.dist + 'skins/report/report.js'
-];
-
-var thesaurusGroup = [
- config.paths.dist + 'skins/thesaurus/win.js',
- config.paths.dist + 'skins/thesaurus/xmlhttp.js',
- config.paths.dist + 'skins/thesaurus/thesaurus.js',
- config.paths.dist + 'skins/thesaurus/sprintf.js'
-];
-
-var lightboxGroup = [
- config.paths.dist + 'skins/lightbox/jquery.lightbox.js'
-];
-
-var lightboxIE6Group = [
- config.paths.dist + 'skins/lightbox/jquery.lightbox.ie6.js'
-];
-
-var uploadFlashGroup = [
- config.paths.dist + 'include/jslibs/SWFUpload/swfupload.js',
- config.paths.dist + 'include/jslibs/SWFUpload/plugins/swfupload.queue.js'
-];
-
-var prodGroup = [
- config.paths.vendors + 'underscore-amd/underscore.js',
- config.paths.dist + 'include/jslibs/colorpicker/js/colorpicker.js',
- config.paths.dist + 'include/jslibs/jquery.lazyload/jquery.lazyload.1.8.1.js',
- config.paths.vendors + 'humane-js/humane.js', // @TODO > extra files
- config.paths.vendors + 'blueimp-load-image/js/load-image.js', // @TODO > extra files
- config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js',
- config.paths.vendors + 'jquery-file-upload/js/jquery.fileupload.js',
- config.paths.dist + 'include/jslibs/jquery.form.2.49.js',
- config.paths.dist + 'include/jslibs/jquery.vertical.buttonset.js',
- config.paths.dist + 'include/js/jquery.Selection.js',
- config.paths.dist + 'include/js/jquery.Edit.js',
- config.paths.dist + 'include/js/jquery.lists.js',
- config.paths.dist + 'skins/prod/jquery.Prod.js',
- config.paths.dist + 'skins/prod/jquery.Feedback.js',
- config.paths.dist + 'skins/prod/jquery.Results.js',
- config.paths.dist + 'skins/prod/jquery.main-prod.js',
- config.paths.dist + 'skins/prod/jquery.WorkZone.js',
- config.paths.dist + 'skins/prod/jquery.Alerts.js',
- config.paths.dist + 'skins/prod/jquery.Upload.js',
- config.paths.dist + 'include/jslibs/pixastic.custom.js',
- config.paths.dist + 'skins/prod/ThumbExtractor.js',
- config.paths.dist + 'skins/prod/publicator.js',
- config.paths.dist + 'include/jslibs/jquery.sprintf.1.0.3.js',
- config.paths.dist + 'include/jquery.p4.preview.js',
- config.paths.dist + 'skins/prod/jquery.edit.js',
- config.paths.dist + 'include/jslibs/jquery.color.animation.js',
- config.paths.dist + 'include/jquery.image_enhancer.js',
- config.paths.vendors + 'jquery.treeview/jquery.treeview.js',
- config.paths.vendors + 'jquery.treeview/jquery.treeview.async.js',
- config.paths.vendors + 'fancytree/dist/jquery.fancytree-all.min.js'
-];
-
-var permaviewGroup = [
- config.paths.dist + 'include/jslibs/jquery.mousewheel.js',
- config.paths.dist + 'include/jquery.image_enhancer.js',
- config.paths.vendors + 'swfobject/swfobject/swfobject.js', // @TODO: should be moved away (embed-bundle)
- config.paths.dist + 'include/jslibs/flowplayer/flowplayer-3.2.13.min.js' // @TODO: should be moved away (embed-bundle)
-];
-
-
-var setupGroup = [
- config.paths.vendors + 'jquery.cookie/jquery.cookie.js',
- config.paths.dist + 'include/jslibs/jquery-validation/jquery.validate.js',
- config.paths.dist + 'include/jslibs/jquery-validate.password/jquery.validate.password.js',
- config.paths.dist + 'include/path_files_tests.jquery.js'
-]
-
-var buildJsGroup = function(srcGroup, name, dest){
- if( dest === undefined ) {
- dest = name;
- }
- // ensure all required files exists:
- srcGroup.forEach(fs.statSync); //will trow an error if file not found
- console.log('building group:', name, ' > ', config.paths.build + dest)
- return gulp.src(srcGroup)
- .pipe(concat(name + '.js', {newLine: ';'}))
- .pipe(gulp.dest( config.paths.build + dest))
- .pipe(uglify().on('error', config.errorHandler('UGLIFY ERROR'))) //util.log))
- .pipe(rename({ extname: '.min.js' }))
- .pipe(gulp.dest( config.paths.build + dest))
-};
-var buildCssGroup = function(srcGroup, name, dest){
- if( dest === undefined ) {
- dest = name;
- }
- // ensure all required files exists:
- srcGroup.forEach(fs.statSync); //will trow an error if file not found
- console.log('building group:', name, ' > ', config.paths.build + dest)
- return gulp.src(srcGroup)
- .pipe(sass().on('error', sass.logError))
- .pipe(rename(name + '.css'))
- .pipe(gulp.dest(config.paths.build + dest))
- .pipe(cssmin())
- .pipe(rename({suffix: '.min'}))
- .pipe(gulp.dest(config.paths.build + dest));
-};
-
-gulp.task('build', function(){
- //config.paths.dist + 'assets/json2/json2.js', jquery jquery ui
- buildJsGroup([
- config.paths.vendors + 'jquery/jquery.js'
- ], 'jquery', 'vendors/jquery');
-
- buildJsGroup([
- config.paths.vendors + 'jquery-ui/ui/jquery-ui.js'
- ], 'jquery-ui', 'vendors/jquery-ui');
-
- buildJsGroup([
- config.paths.vendors + 'json2/json2.js'
- ], 'json2', 'vendors/json2');
-
- buildJsGroup([
- config.paths.vendors + 'modernizr/modernizr.js'
- ], 'modernizr', 'vendors/modernizr');
-
-
- // build libraries loaded with require js:
- // LOGIN
- // login/home/config.js
- buildJsGroup([
- config.paths.vendors + 'backbone-amd/backbone.js'
- ], 'backbone', 'vendors/backbone');
- buildJsGroup([
- config.paths.vendors + 'underscore-amd/underscore.js'
- ], 'underscore', 'vendors/underscore');
- buildJsGroup([
- config.paths.vendors + 'i18next/release/i18next.amd-1.6.3.js'
- ], 'i18next', 'vendors/i18next');
- buildJsGroup([
- config.paths.vendors + 'bootstrap-multiselect/dist/js/bootstrap-multiselect.js'
- ], 'bootstrap-multiselect', 'vendors/bootstrap-multiselect');
- buildJsGroup([
- config.paths.vendors + 'geonames-server-jquery-plugin/jquery.geonames.js'
- ], 'jquery.geonames', 'vendors/jquery.geonames');
- // galleria.html.twig
- buildJsGroup([
- config.paths.vendors + 'jquery-galleria/src/galleria.js'
- ], 'galleria', 'vendors/jquery-galleria');
- buildJsGroup([
- config.paths.vendors + 'jquery-galleria/src/themes/classic/galleria.classic.js'
- ], 'galleria.classic', 'vendors/jquery-galleria');
- // copy css too:
- buildCssGroup([
- config.paths.vendors + 'jquery-galleria/src/themes/classic/galleria.classic.css'
- ], 'galleria.classic', 'vendors/jquery-galleria');
- // galleria.classic.css
-
-
- // ADMIN
- // scripts/apps/admin/require.config.js
- buildJsGroup([
- config.paths.vendors + 'jquery-file-upload/js/vendor/jquery.ui.widget.js'
- ], 'jquery.ui.widget', 'vendors/jquery-file-upload');
- buildJsGroup([
- config.paths.vendors + 'jquery.cookie/jquery.cookie.js'
- ], 'jquery.cookie', 'vendors/jquery.cookie');
- buildJsGroup([
- config.paths.vendors + 'jquery.treeview/jquery.treeview.js'
- ], 'jquery.treeview', 'vendors/jquery.treeview');
- buildJsGroup([
- config.paths.vendors + 'blueimp-load-image/js/load-image.js'
- ], 'load-image', 'vendors/blueimp-load-image');
- buildJsGroup([
- config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js'
- ], 'jquery.iframe-transport', 'vendors/jquery-file-upload');
- buildJsGroup([
- config.paths.vendors + 'jquery-file-upload/js/jquery.fileupload.js'
- ], 'jquery.fileupload', 'vendors/jquery-file-upload');
-
- // copy tinyMce:
- gulp.src([config.paths.vendors + 'tinymce/**'])
- .pipe(gulp.dest(config.paths.build + 'vendors/tinymce'));
-
- buildJsGroup([
- config.paths.vendors + 'zxcvbn/dist/zxcvbn.js'
- ], 'zxcvbn', 'vendors/zxcvbn');
-
- buildJsGroup([
- config.paths.vendors + 'requirejs/require.js'
- ], 'require', 'vendors/requirejs');
-
- //gulp.start('build-joyride');
- buildJsGroup(commonGroup, 'common', 'common/js');
- buildJsGroup(prodGroup, 'prod', 'prod/js');
- buildJsGroup(thesaurusGroup, 'thesaurus', 'thesaurus/js');
- buildJsGroup(uploadFlashGroup, 'uploadFlash', 'upload/js');
- buildJsGroup(lightboxGroup, 'lightbox', 'lightbox/js');
- buildJsGroup(lightboxIE6Group, 'lightboxIe6', 'lightbox/js');
- buildJsGroup(adminGroup, 'admin', 'admin/js');
- buildJsGroup(reportGroup, 'report', 'report/js');
- buildJsGroup(accountGroup, 'account', 'account/js');
- buildJsGroup(permaviewGroup, 'permaview', 'permaview/js');
- buildJsGroup(setupGroup, 'setup', 'setup/js');
- buildJsGroup(authenticationGroup, 'authentication', 'authentication/js');
-
- // build mobile group:
- buildJsGroup([
- config.paths.vendors + 'jquery-mobile-bower/js/jquery.mobile-1.3.2.js'
- ], 'jquery-mobile', 'vendors/jquery-mobile');
- buildCssGroup([
- config.paths.vendors + 'jquery-mobile-bower/css/jquery.mobile-1.3.2.css'
- ], 'jquery-mobile', 'vendors/jquery-mobile');
-
-
-
-
-
- // uploadflash
-});
\ No newline at end of file
+// standalone vendors used across application
+gulp.task('build-vendors', [
+ 'build-bootstrap',
+ 'build-jquery',
+ 'build-jquery-ui',
+ 'build-jquery-mobile',
+ 'build-jquery-galleria',
+ 'build-jquery-file-upload',
+ 'build-json2',
+ 'build-modernizr',
+ 'build-zxcvbn',
+ 'build-tinymce',
+ 'build-backbone',
+ 'build-i18next',
+ 'build-bootstrap-multiselect',
+ 'build-blueimp-load-image',
+ 'build-geonames-server-jquery-plugin',
+ 'build-jquery-cookie',
+ 'build-requirejs',
+ 'build-jquery-treeview'
+ ], function() {});
\ No newline at end of file
diff --git a/resources/gulp/components/backbone.js b/resources/gulp/components/backbone.js
new file mode 100644
index 0000000000..1cda470023
--- /dev/null
+++ b/resources/gulp/components/backbone.js
@@ -0,0 +1,17 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+
+
+
+gulp.task('build-underscore', function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'underscore-amd/underscore.js'
+ ], 'underscore', 'vendors/underscore');
+});
+gulp.task('build-backbone', ['build-underscore'], function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'backbone-amd/backbone.js'
+ ], 'backbone', 'vendors/backbone');
+});
diff --git a/resources/gulp/components/blueimp-load-image.js b/resources/gulp/components/blueimp-load-image.js
new file mode 100644
index 0000000000..11993521a4
--- /dev/null
+++ b/resources/gulp/components/blueimp-load-image.js
@@ -0,0 +1,9 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('build-blueimp-load-image', function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'blueimp-load-image/js/load-image.js'
+ ], 'load-image', 'vendors/blueimp-load-image');
+});
\ No newline at end of file
diff --git a/resources/gulp/components/bootstrap-multiselect.js b/resources/gulp/components/bootstrap-multiselect.js
new file mode 100644
index 0000000000..d13b5c1ed6
--- /dev/null
+++ b/resources/gulp/components/bootstrap-multiselect.js
@@ -0,0 +1,9 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('build-bootstrap-multiselect', function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'bootstrap-multiselect/dist/js/bootstrap-multiselect.js'
+ ], 'bootstrap-multiselect', 'vendors/bootstrap-multiselect');
+});
\ No newline at end of file
diff --git a/resources/gulp/components/bootstrap.js b/resources/gulp/components/bootstrap.js
new file mode 100644
index 0000000000..99820116f9
--- /dev/null
+++ b/resources/gulp/components/bootstrap.js
@@ -0,0 +1,51 @@
+var gulp = require('gulp');
+var sass = require('gulp-sass');
+var uglify = require('gulp-uglify');
+var cssmin = require('gulp-cssmin');
+var concat = require('gulp-concat');
+var rename = require('gulp-rename');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('bootstrap-js', function () {
+ var btSource = [
+ config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-transition.js',
+ config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-alert.js',
+ config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-modal.js',
+ config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-dropdown.js',
+ config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-scrollspy.js',
+ config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-tab.js',
+ config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-tooltip.js',
+ config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-popover.js',
+ config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-button.js',
+ config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-collapse.js',
+ config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-carousel.js',
+ config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-typeahead.js',
+ config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-affix.js'];
+
+ gulp.src(btSource)
+ .pipe(concat('bootstrap.js'))
+ .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/js'))
+ .pipe(uglify())
+ .pipe(rename({ extname: '.min.js' }))
+ .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/js'))
+});
+gulp.task('bootstrap-assets', function () {
+ gulp.src([config.paths.vendors + 'bootstrap-sass/vendor/assets/images/**/*'])
+ .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/img'));
+
+});
+gulp.task('build-bootstrap', ['bootstrap-assets', 'bootstrap-js'], function () {
+ gulp.src(config.paths.vendors + 'bootstrap-sass/vendor/assets/stylesheets/bootstrap.scss')
+ .pipe(sass().on('error', sass.logError))
+ .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css/'))
+ .pipe(cssmin())
+ .pipe(rename({ suffix: '.min' }))
+ .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css'));
+ gulp.src(config.paths.vendors + 'bootstrap-sass/vendor/assets/stylesheets/bootstrap-responsive.scss')
+ .pipe(sass().on('error', sass.logError))
+ .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css/'))
+ .pipe(cssmin())
+ .pipe(rename({ suffix: '.min' }))
+ .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css'));
+});
\ No newline at end of file
diff --git a/resources/gulp/components/geonames-server-jquery-plugin.js b/resources/gulp/components/geonames-server-jquery-plugin.js
new file mode 100644
index 0000000000..80f91df5b5
--- /dev/null
+++ b/resources/gulp/components/geonames-server-jquery-plugin.js
@@ -0,0 +1,9 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('build-geonames-server-jquery-plugin', function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'geonames-server-jquery-plugin/jquery.geonames.js'
+ ], 'jquery.geonames', 'vendors/jquery.geonames');
+});
\ No newline at end of file
diff --git a/resources/gulp/components/i18next.js b/resources/gulp/components/i18next.js
new file mode 100644
index 0000000000..5fc42d1f62
--- /dev/null
+++ b/resources/gulp/components/i18next.js
@@ -0,0 +1,9 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('build-i18next', function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'i18next/release/i18next.amd-1.6.3.js'
+ ], 'i18next', 'vendors/i18next');
+});
\ No newline at end of file
diff --git a/resources/gulp/components/jquery-cookie.js b/resources/gulp/components/jquery-cookie.js
new file mode 100644
index 0000000000..b72338925e
--- /dev/null
+++ b/resources/gulp/components/jquery-cookie.js
@@ -0,0 +1,9 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('build-jquery-cookie', function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'jquery.cookie/jquery.cookie.js'
+ ], 'jquery.cookie', 'vendors/jquery.cookie');
+});
\ No newline at end of file
diff --git a/resources/gulp/components/jquery-file-upload.js b/resources/gulp/components/jquery-file-upload.js
new file mode 100644
index 0000000000..5b252048bd
--- /dev/null
+++ b/resources/gulp/components/jquery-file-upload.js
@@ -0,0 +1,23 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+
+
+gulp.task('build-jquery-file-upload-widget', [], function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'jquery-file-upload/js/vendor/jquery.ui.widget.js'
+ ], 'jquery.ui.widget', 'vendors/jquery-file-upload');
+});
+
+gulp.task('build-jquery-file-transport', [], function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js'
+ ], 'jquery.iframe-transport', 'vendors/jquery-file-upload');
+});
+
+gulp.task('build-jquery-file-upload', ['build-jquery-file-transport', 'build-jquery-file-upload-widget'], function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'jquery-file-upload/js/jquery.fileupload.js'
+ ], 'jquery.fileupload', 'vendors/jquery-file-upload');
+});
\ No newline at end of file
diff --git a/resources/gulp/components/jquery-galleria.js b/resources/gulp/components/jquery-galleria.js
new file mode 100644
index 0000000000..a3ef85f063
--- /dev/null
+++ b/resources/gulp/components/jquery-galleria.js
@@ -0,0 +1,26 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('build-galleria-css', function(){
+ return utils.buildCssGroup([
+ config.paths.vendors + 'jquery-galleria/src/themes/classic/galleria.classic.css'
+ ], 'galleria.classic', 'vendors/jquery-galleria');
+});
+gulp.task('build-galleria-js-classic', function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'jquery-galleria/src/themes/classic/galleria.classic.js'
+ ], 'galleria.classic', 'vendors/jquery-galleria');
+});
+
+gulp.task('build-galleria-js', ['build-galleria-js-classic'], function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'jquery-galleria/src/galleria.js'
+ ], 'galleria', 'vendors/jquery-galleria');
+});
+
+gulp.task('build-jquery-galleria', ['build-galleria-js', 'build-galleria-css'], function(){
+ // copy jquery mobile assets
+ return gulp.src(config.paths.vendors + 'jquery-galleria/src/themes/classic/!(*.js|*.map|*.css|*.html)')
+ .pipe(gulp.dest( config.paths.build + 'vendors/jquery-galleria'));
+});
\ No newline at end of file
diff --git a/resources/gulp/components/jquery-mobile.js b/resources/gulp/components/jquery-mobile.js
new file mode 100644
index 0000000000..d57d5bf8a7
--- /dev/null
+++ b/resources/gulp/components/jquery-mobile.js
@@ -0,0 +1,21 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('build-jquery-mobile-css', function(){
+ return utils.buildCssGroup([
+ config.paths.vendors + 'jquery-mobile-bower/css/jquery.mobile-1.3.2.css'
+ ], 'jquery-mobile', 'vendors/jquery-mobile');
+});
+
+gulp.task('build-jquery-mobile-js', function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'jquery-mobile-bower/js/jquery.mobile-1.3.2.js'
+ ], 'jquery-mobile', 'vendors/jquery-mobile');
+});
+
+gulp.task('build-jquery-mobile', ['build-jquery-mobile-js', 'build-jquery-mobile-css'], function(){
+ // copy jquery mobile assets
+ return gulp.src(config.paths.vendors + 'jquery-mobile-bower/css/images/**/*')
+ .pipe(gulp.dest( config.paths.build + 'vendors/jquery-mobile/images'));
+});
\ No newline at end of file
diff --git a/resources/gulp/components/jquery-treeview.js b/resources/gulp/components/jquery-treeview.js
new file mode 100644
index 0000000000..58deb41d4b
--- /dev/null
+++ b/resources/gulp/components/jquery-treeview.js
@@ -0,0 +1,9 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('build-jquery-treeview', function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'jquery.treeview/jquery.treeview.js'
+ ], 'jquery.treeview', 'vendors/jquery.treeview');
+});
\ No newline at end of file
diff --git a/resources/gulp/components/jquery-ui.js b/resources/gulp/components/jquery-ui.js
new file mode 100644
index 0000000000..c7cb68e3c0
--- /dev/null
+++ b/resources/gulp/components/jquery-ui.js
@@ -0,0 +1,10 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('build-jquery-ui', [], function(){
+ // copy jquery ui assets
+ return utils.buildJsGroup([
+ config.paths.vendors + 'jquery-ui/ui/jquery-ui.js'
+ ], 'jquery-ui', 'vendors/jquery-ui');
+});
\ No newline at end of file
diff --git a/resources/gulp/components/jquery.js b/resources/gulp/components/jquery.js
new file mode 100644
index 0000000000..4ef4a448d8
--- /dev/null
+++ b/resources/gulp/components/jquery.js
@@ -0,0 +1,9 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('build-jquery', function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'jquery/jquery.js'
+ ], 'jquery', 'vendors/jquery');
+});
\ No newline at end of file
diff --git a/resources/gulp/components/json2.js b/resources/gulp/components/json2.js
new file mode 100644
index 0000000000..6fc9d06089
--- /dev/null
+++ b/resources/gulp/components/json2.js
@@ -0,0 +1,9 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('build-json2', [], function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'json2/json2.js'
+ ], 'json2', 'vendors/json2');
+});
\ No newline at end of file
diff --git a/resources/gulp/components/modernizr.js b/resources/gulp/components/modernizr.js
new file mode 100644
index 0000000000..df86da90c6
--- /dev/null
+++ b/resources/gulp/components/modernizr.js
@@ -0,0 +1,9 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('build-modernizr', [], function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'modernizr/modernizr.js'
+ ], 'modernizr', 'vendors/modernizr');
+});
\ No newline at end of file
diff --git a/resources/gulp/components/requirejs.js b/resources/gulp/components/requirejs.js
new file mode 100644
index 0000000000..2bbf31456b
--- /dev/null
+++ b/resources/gulp/components/requirejs.js
@@ -0,0 +1,9 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('build-requirejs', function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'requirejs/require.js'
+ ], 'require', 'vendors/requirejs');
+});
\ No newline at end of file
diff --git a/resources/gulp/components/tinymce.js b/resources/gulp/components/tinymce.js
new file mode 100644
index 0000000000..6676e55ef8
--- /dev/null
+++ b/resources/gulp/components/tinymce.js
@@ -0,0 +1,8 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('build-tinymce', [], function(){
+ return gulp.src([config.paths.vendors + 'tinymce/**'])
+ .pipe(gulp.dest(config.paths.build + 'vendors/tinymce'));
+});
\ No newline at end of file
diff --git a/resources/gulp/components/zxcvbn.js b/resources/gulp/components/zxcvbn.js
new file mode 100644
index 0000000000..37348aed18
--- /dev/null
+++ b/resources/gulp/components/zxcvbn.js
@@ -0,0 +1,9 @@
+var gulp = require('gulp');
+var config = require('../config.js');
+var utils = require('../utils.js');
+
+gulp.task('build-zxcvbn', [], function(){
+ return utils.buildJsGroup([
+ config.paths.vendors + 'zxcvbn/dist/zxcvbn.js'
+ ], 'zxcvbn', 'vendors/zxcvbn');
+});
\ No newline at end of file
diff --git a/resources/gulp/install.js b/resources/gulp/install.js
index 34fd91373a..c75bf9d541 100644
--- a/resources/gulp/install.js
+++ b/resources/gulp/install.js
@@ -14,234 +14,29 @@ var sass = require('gulp-sass');
var del = require('del');
var config = require('./config.js');
-// gulp.task('clean:vendors', function(done){
-// return del([config.paths.distVendors + '/**/*'], done);
-// });
-//
-//
-// var lib = require('bower-files')({
-// overrides: {
-// 'backbone-amd': {
-// main: ['./backbone.js', 'LICENSE']
-// },
-// 'font-awesome': {
-// main: ['css/*', 'font/*']
-// },
-// 'humane-js': {
-// main: ['humane.js', 'themes/libnotify.css']
-// },
-// 'jquery': {
-// main: 'jquery.js'
-// },
-// 'jquery.treeview': {
-// main: ['images/*',
-// 'jquery.treeview*']
-// },
-// 'jquery-mobile-bower': {
-// main: ['css/jquery.mobile-1.3.2.css', 'js/jquery.mobile-1.3.2.js']
-// },
-// 'json2': {
-// main: [/* ignore, will be copied manually in groups */]
-// },
-// 'modernizr': {
-// main: [/* ignore, will be copied manually in groups */]
-// },
-// 'tinymce': {
-// main: ['plugins/**',
-// 'skins/**',
-// 'themes/**',
-// '*.js',
-// 'changelog.txt',
-// 'license.txt']
-// },
-// 'underscore-amd': {
-// main: [/* ignore, will be copied manually in groups */]
-// },
-// zxcvbn: {
-// main: [/* ignore, will be copied manually for legacy code compatibility */]
-// },
-// 'jquery-galleria': {
-// main: [/* ignore, will be copied manually for legacy code compatibility */]
-// },
-// 'bootstrap-multiselect': {
-// main: [/* ignore, will be copied manually for legacy code compatibility */]
-// },
-// 'fancytree': {
-// main: [/* ignore, will be copied manually for legacy code compatibility */]
-// },
-// 'jquery-ui': {
-// main: [/* ignore, will be copied manually for legacy code compatibility */]
-// },
-// 'swfobject': {
-// main: [/* ignore, will be copied manually for legacy code compatibility */]
-// },
-// 'blueimp-load-image': {
-// main: [/* ignore, will be copied manually for legacy code compatibility */]
-// },
-// 'jquery-file-upload': {
-// main: [/* ignore, will be copied manually for legacy code compatibility */]
-// },
-// 'i18next': {
-// main: [/* ignore, will be copied manually for legacy code compatibility */]
-// }
-// }
-// });
-//
-// gulp.task('copy-dev-vendors', function(){
-// gulp.src(config.paths.vendors + 'chai/chai.js')
-// .pipe(gulp.dest( config.paths.distVendors + 'chai/'));
-//
-// gulp.src(config.paths.vendors + 'js-fixtures/fixtures.js')
-// .pipe(gulp.dest( config.paths.distVendors + 'js-fixtures/'));
-//
-// gulp.src([config.paths.vendors + 'mocha/mocha.js', config.paths.vendors + 'mocha/mocha.css'])
-// .pipe(gulp.dest( config.paths.distVendors + 'mocha/'));
-//
-// gulp.src(config.paths.vendors + 'sinon-chai/lib/sinon-chai.js')
-// .pipe(gulp.dest( config.paths.distVendors + 'sinon-chai/'));
-//
-// gulp.src(config.paths.vendors + 'sinonjs/sinon.js')
-// .pipe(gulp.dest( config.paths.distVendors + 'sinonjs/'));
-//
-// gulp.src(config.paths.vendors + 'squire/src/Squire.js')
-// .pipe(gulp.dest( config.paths.distVendors + 'squire/'));
-//
-// gulp.src([config.paths.vendors + 'qunit/qunit/qunit.js', config.paths.vendors + 'qunit/qunit/qunit.css'])
-// .pipe(gulp.dest( config.paths.distVendors + 'qunit/'));
-//
-// gulp.src(config.paths.vendors + 'qunit/addons/phantomjs/*')
-// .pipe(gulp.dest( config.paths.distVendors + 'qunit/addons/phantomjs'));
-// });
-//
-// gulp.task('copy-vendors-via-bower', function () {
-// var vendorConfig = {
-// 'jquery-mobile-bower/css': {
-// dirname: 'jquery-mobile'
-// },
-// 'jquery-mobile-bower/js': {
-// dirname: 'jquery-mobile'
-// }
-// };
-//
-// return gulp.src(lib.ext().files, { base: config.paths.vendors })
-// .pipe(rename(function (path) {
-// if( vendorConfig[path.dirname] !== undefined ) {
-// // console.log('reading path', path)
-// var cuConf = vendorConfig[path.dirname];
-// path.dirname = cuConf.dirname;
-// }
-// return path;
-// }))
-// .pipe(gulp.dest(config.paths.distVendors));
-// });
-//
-// // copy additionnal assets from vendors to match old legacy assets:
-// gulp.task('copy-vendors', ['copy-vendors-via-bower'],function () {
-// gulp.src([config.paths.vendors + 'fancytree/dist/skin-win8/**/*']) //, config.paths.vendors + 'fancytree/dist/jquery.fancytree-all.min
-// .pipe(gulp.dest( config.paths.distVendors + 'fancytree/dist/skin-win8'))
-//
-// gulp.src(config.paths.vendors + 'jquery-ui/ui/jquery-ui.js')
-// .pipe(gulp.dest( config.paths.distVendors + 'jquery.ui/'));
-//
-// gulp.src(config.paths.vendors + 'jquery-ui/themes/base/*.css')
-// .pipe(gulp.dest( config.paths.distVendors + 'jquery.ui/'));
-//
-// gulp.src(config.paths.vendors + 'jquery-ui/ui/i18n/*')
-// .pipe(gulp.dest( config.paths.distVendors + 'jquery.ui/i18n'));
-//
-// gulp.src(config.paths.vendors + 'jquery-ui/themes/base/images/*')
-// .pipe(gulp.dest( config.paths.distVendors + 'jquery.ui/images'));
-//
-// gulp.src(config.paths.vendors + 'swfobject/swfobject/swfobject.js')
-// .pipe(gulp.dest( config.paths.distVendors + 'swfobject'));
-//
-//
-// gulp.src([config.paths.vendors + 'jquery-file-upload/js/*', config.paths.vendors + 'jquery-file-upload/js/vendor/*', config.paths.vendors + 'jquery-file-upload/css/*'])
-// .pipe(gulp.dest( config.paths.distVendors + 'jquery-file-upload'));
-//
-// gulp.src(config.paths.vendors + 'blueimp-load-image/js/*.js')
-// .pipe(gulp.dest( config.paths.distVendors + 'blueimp-load-image'));
-//
-// gulp.src(config.paths.vendors + 'i18next/release/i18next.amd-1.6.3.js')
-// .pipe(gulp.dest( config.paths.distVendors + 'i18next'));
-//
-// gulp.src(config.paths.vendors + 'bootstrap-multiselect/dist/**/*')
-// .pipe(gulp.dest( config.paths.distVendors + 'bootstrap-multiselect'));
-//
-// gulp.src([config.paths.vendors + 'jquery-galleria/src/galleria.js', config.paths.vendors + 'jquery-galleria/src/themes/classic/*'])
-// .pipe(gulp.dest( config.paths.distVendors + 'jquery-galleria'));
-//
-// gulp.src(config.paths.vendors + 'zxcvbn/dist/zxcvbn.js')
-// .pipe(gulp.dest( config.paths.distVendors + 'zxcvbn'));
-//
-// gulp.start('copy-dev-vendors');
-// });
-
-gulp.task('bootstrap-js', function () {
- var btSource = [
- config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-transition.js',
- config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-alert.js',
- config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-modal.js',
- config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-dropdown.js',
- config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-scrollspy.js',
- config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-tab.js',
- config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-tooltip.js',
- config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-popover.js',
- config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-button.js',
- config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-collapse.js',
- config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-carousel.js',
- config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-typeahead.js',
- config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-affix.js'];
-
- gulp.src(btSource)
- .pipe(concat('bootstrap.js'))
- .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/js'))
- .pipe(uglify())
- .pipe(rename({ extname: '.min.js' }))
- .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/js'))
+gulp.task('clean:assetsPath', function(done){
+ return del([config.paths.build + '/**/*'], done);
});
-gulp.task('bootstrap-assets', function () {
- gulp.src([config.paths.vendors + 'bootstrap-sass/vendor/assets/images/**/*'])
- .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/img'));
-});
-gulp.task('build-bootstrap', ['bootstrap-assets', 'bootstrap-js'], function () {
- gulp.src(config.paths.vendors + 'bootstrap-sass/vendor/assets/stylesheets/bootstrap.scss')
- .pipe(sass().on('error', sass.logError))
- .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css/'))
- .pipe(cssmin())
- .pipe(rename({ suffix: '.min' }))
- .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css'));
- gulp.src(config.paths.vendors + 'bootstrap-sass/vendor/assets/stylesheets/bootstrap-responsive.scss')
- .pipe(sass().on('error', sass.logError))
- .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css/'))
- .pipe(cssmin())
- .pipe(rename({ suffix: '.min' }))
- .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css'));
-});
gulp.task('install-bower-dependencies', function(){
return gulp.src(['./bower.json'])
.pipe(install());
});
-gulp.task('install-dependencies', ['install-bower-dependencies'], function(done){
- gulp.start('copy-vendors');
- gulp.start('build-bootstrap');
-});
-
-gulp.task('deploy-dependencies', ['install-dependencies'], function(){
- //gulp.start('copy-vendors');
- //gulp.start('build-bootstrap');
+gulp.task('build-dependencies', ['install-bower-dependencies'], function(){
gulp.start('build');
-});
-
-
-gulp.task('install-assets', ['clean:vendors'], function(){
- gulp.start('deploy-dependencies');
-});
-
-gulp.task('install', function(){
- gulp.start('build-bootstrap');
gulp.start('build-css');
- gulp.start('build');
+});
+
+
+/**
+ * base commands: install, install-assets
+ */
+
+gulp.task('install-assets', function(){
+ gulp.start('install');
+});
+
+gulp.task('install', ['clean:assetsPath'], function(){
+ gulp.start('build-dependencies');
});
diff --git a/resources/gulp/styles.js b/resources/gulp/styles.js
index 53c18aba68..d9b2d62f57 100644
--- a/resources/gulp/styles.js
+++ b/resources/gulp/styles.js
@@ -1,30 +1,8 @@
var gulp = require('gulp');
-var util = require('gulp-util');
-var rename = require('gulp-rename');
-var concat = require('gulp-concat');
-var uglify = require('gulp-uglify');
-var cssmin = require('gulp-cssmin');
var config = require('./config.js');
-var debug = require('gulp-debug');
-var sass = require('gulp-sass');
-var fs = require('fs');
+var utils = require('./utils.js');
-var buildCssGroup = function(srcGroup, name, dest){
- if( dest === undefined ) {
- dest = name;
- }
- // ensure all required files exists:
- srcGroup.forEach(fs.statSync); //will trow an error if file not found
- console.log('building group:', name, ' > ', config.paths.build + dest)
- return gulp.src(srcGroup)
- .pipe(sass().on('error', sass.logError))
- .pipe(rename(name + '.css'))
- .pipe(gulp.dest(config.paths.build + dest))
- .pipe(cssmin())
- .pipe(rename({suffix: '.min'}))
- .pipe(gulp.dest(config.paths.build + dest));
-};
gulp.task('build-css', function () {
@@ -35,17 +13,24 @@ gulp.task('build-css', function () {
gulp.src([config.paths.vendors + 'font-awesome/css/font-awesome-ie7.min.css'])
.pipe(gulp.dest( config.paths.distVendors + 'common/css'));
- buildCssGroup([config.paths.src + 'common/main.scss'], 'common', 'common/css/');
- buildCssGroup([config.paths.src + 'admin/main.scss'], 'admin', 'admin/css/');
- buildCssGroup([config.paths.src + 'thesaurus/main.scss'], 'thesaurus', 'thesaurus/css/');
- buildCssGroup([config.paths.src + 'prod/main.scss'], 'prod', 'prod/css/');
- buildCssGroup([config.paths.src + 'prod/skin-000000.scss'], 'skin-000000', 'prod/css/');
- buildCssGroup([config.paths.src + 'prod/skin-959595.scss'], 'skin-959595', 'prod/css/');
- buildCssGroup([config.paths.src + 'setup/main.scss'], 'setup', 'setup/css/');
- buildCssGroup([config.paths.src + 'authentication/main.scss'], 'authentication', 'authentication/css/');
- buildCssGroup([config.paths.src + 'account/main.scss'], 'account', 'account/css/');
- buildCssGroup([config.paths.src + 'oauth/main.scss'], 'oauth', 'oauth/css/');
+ utils.buildCssGroup([config.paths.src + 'common/main.scss'], 'common', 'common/css/');
+ utils.buildCssGroup([config.paths.src + 'admin/main.scss'], 'admin', 'admin/css/');
+ utils.buildCssGroup([config.paths.src + 'thesaurus/main.scss'], 'thesaurus', 'thesaurus/css/');
+ utils.buildCssGroup([config.paths.src + 'prod/main.scss'], 'prod', 'prod/css/');
+ utils.buildCssGroup([config.paths.src + 'prod/skin-000000.scss'], 'skin-000000', 'prod/css/');
+ utils.buildCssGroup([config.paths.src + 'prod/skin-959595.scss'], 'skin-959595', 'prod/css/');
+ utils.buildCssGroup([config.paths.src + 'setup/main.scss'], 'setup', 'setup/css/');
+ utils.buildCssGroup([config.paths.src + 'authentication/main.scss'], 'authentication', 'authentication/css/');
+ utils.buildCssGroup([config.paths.src + 'account/main.scss'], 'account', 'account/css/');
+ utils.buildCssGroup([config.paths.src + 'oauth/main.scss'], 'oauth', 'oauth/css/');
- buildCssGroup([config.paths.src + 'vendors/jquery-ui/dark-hive.scss'], 'dark-hive', 'vendors/jquery-ui/css/');
- buildCssGroup([config.paths.src + 'vendors/jquery-ui/ui-lightness.scss'], 'ui-lightness', 'vendors/jquery-ui/css/');
+ utils.buildCssGroup([config.paths.src + 'report/main.scss'], 'report', 'report/css/');
+ utils.buildCssGroup([config.paths.src + 'report/main-print.scss'], 'print', 'report/css/');
+
+ utils.buildCssGroup([config.paths.src + 'lightbox/main.scss'], 'lightbox', 'lightbox/css/');
+ utils.buildCssGroup([config.paths.src + 'lightbox/main-ie6.scss'], 'lightbox-ie6', 'lightbox/css/');
+ utils.buildCssGroup([config.paths.src + 'lightbox/main-mobile.scss'], 'lightbox-mobile', 'lightbox/css/');
+
+ utils.buildCssGroup([config.paths.src + 'vendors/jquery-ui/dark-hive.scss'], 'dark-hive', 'vendors/jquery-ui/css/');
+ utils.buildCssGroup([config.paths.src + 'vendors/jquery-ui/ui-lightness.scss'], 'ui-lightness', 'vendors/jquery-ui/css/');
});
\ No newline at end of file
diff --git a/resources/gulp/utils.js b/resources/gulp/utils.js
new file mode 100644
index 0000000000..1726389b90
--- /dev/null
+++ b/resources/gulp/utils.js
@@ -0,0 +1,42 @@
+var gulp = require('gulp');
+var util = require('gulp-util');
+var rename = require('gulp-rename');
+var concat = require('gulp-concat');
+var uglify = require('gulp-uglify');
+var cssmin = require('gulp-cssmin');
+var sass = require('gulp-sass');
+var config = require('./config.js');
+var debug = require('gulp-debug');
+var fs = require('fs');
+
+
+exports.buildJsGroup = function(srcGroup, name, dest){
+ if( dest === undefined ) {
+ dest = name;
+ }
+ // ensure all required files exists:
+ srcGroup.forEach(fs.statSync); //will trow an error if file not found
+ // console.log('building group:', name, ' > ', config.paths.build + dest)
+ return gulp.src(srcGroup)
+ .pipe(concat(name + '.js', {newLine: ';'}))
+ .pipe(gulp.dest( config.paths.build + dest))
+ .pipe(uglify().on('error', config.errorHandler('UGLIFY ERROR'))) //util.log))
+ .pipe(rename({ extname: '.min.js' }))
+ .pipe(gulp.dest( config.paths.build + dest))
+};
+
+exports.buildCssGroup = function(srcGroup, name, dest){
+ if( dest === undefined ) {
+ dest = name;
+ }
+ // ensure all required files exists:
+ srcGroup.forEach(fs.statSync); //will trow an error if file not found
+ // console.log('building group:', name, ' > ', config.paths.build + dest)
+ return gulp.src(srcGroup)
+ .pipe(sass().on('error', sass.logError))
+ .pipe(rename(name + '.css'))
+ .pipe(gulp.dest(config.paths.build + dest))
+ .pipe(cssmin())
+ .pipe(rename({suffix: '.min'}))
+ .pipe(gulp.dest(config.paths.build + dest));
+};
\ No newline at end of file
diff --git a/www/skins/lightbox/jquery.validator.mobile.css b/resources/www/lightbox/jquery-mobile/_jquery-validator.scss
similarity index 76%
rename from www/skins/lightbox/jquery.validator.mobile.css
rename to resources/www/lightbox/jquery-mobile/_jquery-validator.scss
index 77b4e4a9f1..82ccf66e40 100644
--- a/www/skins/lightbox/jquery.validator.mobile.css
+++ b/resources/www/lightbox/jquery-mobile/_jquery-validator.scss
@@ -1,3 +1,4 @@
+$iconsPath: '../../../skins/icons/';
ul.image_set{
padding:0;
margin:0;
@@ -44,28 +45,28 @@ a.active_choice{
}
.valid_choice.agree{
- background-image: url(/skins/icons/ok.png);
+ background-image: url('#{$iconsPath}ok.png');
}
.valid_choice.disagree{
- background-image: url(/skins/icons/delete.png);
+ background-image: url('#{$iconsPath}delete.png');
}
.thumb_wrapper {
- text-align:center;
+ text-align:center;
}
@media screen and (orientation: landscape) {
- .thumb_wrapper img {
- width: 50%;
- }
+ .thumb_wrapper img {
+ width: 50%;
+ }
}
@media screen and (orientation: portrait) {
- .thumb_wrapper img {
- width: 100%;
- }
+ .thumb_wrapper img {
+ width: 100%;
+ }
}
diff --git a/resources/www/lightbox/main-ie6.scss b/resources/www/lightbox/main-ie6.scss
new file mode 100644
index 0000000000..8ae0f148a5
--- /dev/null
+++ b/resources/www/lightbox/main-ie6.scss
@@ -0,0 +1,552 @@
+$iconsPath: '../../../skins/icons/';
+$lightboxPath: '../../../skins/lightbox/';
+@import '../shared/jquery.contextmenu';
+
+body {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ background-color: #BFBFBF;
+ color: #212121;
+ /*font-size:11px;*/
+ font-family: Arial, Helvetica, sans-serif;
+}
+
+#mainMenu .title, #mainMenu a, #mainMenu b, #mainMenu span {
+ color: #212121;
+}
+
+a, a:hover, a:visited {
+ color: #BFBFBF;
+}
+
+ul {
+ list-style-type: none;
+}
+
+#mainContent {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ position: relative;
+}
+
+.left, .PNBleft {
+ width: 100%;
+ position: relative;
+ float: left;
+}
+
+.PNBleft {
+ height: 100%;
+}
+
+.record_display_box .lightbox_container {
+ overflow: hidden;
+}
+
+.record_display_box .header {
+ height: 30px;
+}
+
+.record_display_box .notes_wrapper {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ top: -100%;
+ left: 0;
+}
+
+.record_display_box .record {
+ max-width: none;
+ max-height: none;
+}
+
+.record_display_box .notes_overlay {
+ background-color: black;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ opacity: 0.70;
+ filter: alpha(opacity=70);
+ z-index: 100;
+}
+
+.record_display_box .note_wrapper {
+ background-color: white;
+ position: relative;
+ width: 300px;
+ margin: 0 auto;
+ margin: 20px 0;
+ padding: 5px;
+}
+
+.record_display_box .note_author,
+.record_display_box .note_content {
+ margin: 5px;
+ position: relative;
+}
+
+.record_display_box .note_wrapper.my_note {
+ background-color: #C9FFF7;
+}
+
+.record_display_box .notes {
+ position: relative;
+ margin: 0 auto;
+ width: 80%;
+ height: 80%;
+ max-width: 450px;
+ z-index: 110;
+ overflow-y: auto;
+ overflow-x: hidden;
+}
+
+.agreement_selector {
+ position: relative;
+ width: 100%;
+ bottom: 10px;
+ text-align: right;
+ z-index: 200;
+}
+
+.clickable {
+ cursor: pointer;
+}
+
+#agree_choices .wrapper,
+#disagree_choices .wrapper {
+ margin: 0 auto;
+ width: 180px;
+}
+
+#user_infos .big_box {
+ width: 110px;
+ margin: 0 auto;
+ padding: 10px;
+ height: 32px;
+ text-align: center;
+ opacity: 1;
+ filter: alpha(opacity=100);
+}
+
+#user_infos .big_box.agree {
+ border: 2px solid green;
+}
+
+#user_infos .big_box.disagree {
+ border: 2px solid red;
+}
+
+#user_infos .big_box.not_decided {
+ border: 2px solid white;
+}
+
+.big_box span {
+ font-weight: bold;
+ font-size: 14px;
+ margin: 0 10px;
+}
+
+li.userchoice {
+ margin: 5px 0 0px 20px;
+}
+
+.userchoice.disagree {
+ color: #DE1200;
+}
+
+.userchoice.agree {
+ color: #35AC00;
+}
+
+#sc_container {
+ position: relative;
+ height: 100%;
+}
+
+.basket_element_wrapper {
+ position: relative;
+ float: left;
+ padding: 0 5px;
+}
+
+.basket_element {
+ position: relative;
+ float: left;
+ width: 114px;
+ height: 130px;
+ border: 1px solid #212121;
+ text-align: left;
+ padding: 5px 8px;
+}
+
+.basket_element.selected {
+ background-color: #212121;
+}
+
+.basket_element .display_id {
+ top: 4px;
+ left: 8px;
+}
+
+#report .display_id {
+ top: -5px;
+ left: -5px;
+}
+
+#report .CHIM.diapo {
+ position: relative;
+ text-align: center;
+}
+
+.display_id {
+ background-color: #FFFFFF;
+ padding: 3px 6px;
+ font-weight: bold;
+ z-index: 99;
+ color: #212121;
+ -moz-border-radius: 50%;
+ -webkit-border-radius: 50%;
+ border-radius: 50%;
+ position: absolute;
+}
+
+.basket_element .agreement {
+ position: absolute;
+ top: 4px;
+ right: 8px;
+ z-index: 99;
+}
+
+.not_decided {
+ opacity: 0.30;
+ filter: alpha(opacity=30);
+}
+
+#sc_wrapper .not_decided {
+ display: none;
+}
+
+.basket_element .image {
+ position: relative;
+ z-index: 90;
+}
+
+.basket_element .previewTips {
+ background-image: url('#{$iconsPath}zoom.gif');
+ background-position: center center;
+ background-repeat: no-repeat;
+ cursor: help;
+ position: absolute;
+ bottom: 4px;
+ right: 8px;
+ height: 18px;
+ width: 18px;
+ z-index: 99;
+}
+
+.record_display_box .title {
+ margin: 0 10px;
+}
+
+#right_column {
+ color: #BFBFBF;
+}
+
+.right_column_wrapper_caption {
+ width: 215px;
+ margin: 10px 0 0 10px;
+}
+
+.right_column_title {
+ color: #BFBFBF;
+ font-weight: bold;
+ font-size: 15px;
+ text-align: center;
+ line-height: 25px;
+}
+
+.validate.highlight,
+.caption.highlight {
+ color: white;
+ text-decoration: underline;
+}
+
+#basket_infos {
+ height: 110px;
+ bottom: auto;
+}
+
+.record_display_box .display_id {
+ top: 5px;
+ margin: 0px;
+}
+
+#basket_infos {
+ overflow: hidden;
+ background-color: #1F1E1B;
+ color: #BFBFBF;
+}
+
+#basket_options {
+ height: 35px;
+ top: auto;
+ background-color: #1F1E1B;
+ text-align: center;
+}
+
+#basket_options .confirm_report {
+ margin: 5px auto;
+}
+
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text {
+ padding: 0.2em 1em 0.2em 2.1em;
+}
+
+/*******
+ *
+ * Index
+ *
+ * ******/
+
+#main_index {
+ position: relative;
+ width: 600px;
+ margin: 0 auto;
+}
+
+#main_wrapper {
+ width: 100%;
+}
+
+#main_wrapper h1 {
+ font-weight: bold;
+ font-size: 25px;
+}
+
+table th {
+ text-align: right;
+ vertical-align: bottom;
+ height: 60px;
+ border-bottom: 1px solid #8F8F8F;
+}
+
+table th.title {
+ text-align: left;
+}
+
+table th h1 {
+ margin-left: 20px;
+}
+
+table th i {
+ margin-right: 20px;
+}
+
+.ui-button.download_button {
+ margin: 0 5px 0 50px;
+}
+
+.ui-button.comment_button {
+ margin-left: 5px;
+}
+
+.basket_wrapper.hover {
+ background-color: #1F1E1B;
+ color: #BFBFBF;
+}
+
+.basket_wrapper {
+ margin: 10px;
+ height: 195px;
+}
+
+.basket_wrapper table {
+ top: 10px;
+ left: 10px;
+ width: 560px;
+ height: 175px;
+ position: relative;
+}
+
+.basket_description table {
+ margin: 0;
+ width: 100%;
+ text-align: left;
+}
+
+.basket_description table td.right {
+ text-align: right;
+ width: 120px;
+ font-style: italic;
+ vertical-align: top;
+}
+
+.basket_description {
+}
+
+.thumb_wrapper {
+ text-align: center;
+ position: relative;
+}
+
+.thumb_wrapper .thumb {
+ position: relative;
+}
+
+#sc_wrapper {
+ height: 166px;
+}
+
+#sc_wrapper .thumb_wrapper {
+ position: absolute;
+ top: 28px;
+}
+
+.record_display_box .notes_overlay {
+ background-color: #BFBFBF;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ opacity: 0.70;
+ filter: alpha(opacity=70);
+ z-index: 100;
+}
+
+.record_display_box h2 {
+ color: #BFBFBF;
+ font-size: 15px;
+ font-weight: bold;
+}
+
+.record_display_box .notes_wrapper {
+ position: absolute;
+ top: -100%;
+ height: 100%;
+ width: 100%;
+}
+
+.record_display_box .note_wrapper {
+ background-color: white;
+ position: relative;
+ max-width: 75%;
+ margin: 20px 0;
+ padding: 10px;
+ color: #212121;
+}
+
+.record_display_box .note_author {
+ font-size: 15px;
+ font-weight: bold;
+}
+
+.basket_thumbnail .image {
+ position: relative;
+}
+
+.basket_thumbnail {
+ width: 110px;
+ height: 110px;
+ float: left;
+ position: relative;
+}
+
+.record_display_box .note_wrapper.my_note {
+ background-color: #C9FFF7;
+}
+
+.record_display_box .notes {
+ position: relative;
+ margin: 0 auto;
+ width: 80%;
+ height: 90%;
+ max-width: 450px;
+ z-index: 110;
+ overflow-y: auto;
+ overflow-x: hidden;
+}
+
+.ui-state-default.note_closer, .ui-state-default.note_saver {
+ background-color: #353430;
+ padding: 5px;
+ margin: 0 10px;
+}
+
+.ui-state-default.note_saver {
+ background-color: #1F1E1B;
+}
+
+.record_display_box form .buttons {
+ margin: 5px;
+ text-align: right;
+}
+
+.record_display_box form {
+ margin: 15px 0;
+ width: 90%;
+}
+
+.record_display_box form textarea {
+ width: 100%;
+ height: 75px;
+}
+
+#navigation {
+ width: 200px;
+}
+
+.basket_downloader {
+ background-color: #1F1E1B;
+ margin: 0 10px;
+ padding: 2px;
+ border: 0;
+}
+
+hr {
+ width: 100%;
+ height: 1px;
+ background-color: #212121;
+}
+
+.report {
+ margin: 0 10px;
+ vertical-align: bottom;
+}
+
+/*
+ *
+ * Overrides JqueryUI
+ *
+ */
+
+.ui-button {
+ background: transparent;
+ border: none;
+ margin: 0;
+ padding: 0;
+}
+
+.ui-button-text-only .ui-button-text {
+ padding: 0.15em;
+}
+
+.ui-state-default,
+.ui-widget-content .ui-state-default,
+.ui-widget-header .ui-state-default {
+ color: #BFBFBF;
+ background-image: none;
+ border: none;
+ background-color: transparent;
+}
+
+.ui-widget-header {
+ background-color: #1F1E1B;
+ background-image: none;
+ border: none;
+}
+
+.left.choices {
+ margin: 0;
+ padding: 0;
+}
diff --git a/resources/www/lightbox/main-mobile.scss b/resources/www/lightbox/main-mobile.scss
new file mode 100644
index 0000000000..dafac5c02d
--- /dev/null
+++ b/resources/www/lightbox/main-mobile.scss
@@ -0,0 +1 @@
+@import './jquery-mobile/jquery-validator';
\ No newline at end of file
diff --git a/resources/www/lightbox/main.scss b/resources/www/lightbox/main.scss
new file mode 100644
index 0000000000..233131e2e7
--- /dev/null
+++ b/resources/www/lightbox/main.scss
@@ -0,0 +1,586 @@
+$iconsPath: '../../../skins/icons/';
+$lightboxPath: '../../../skins/lightbox/';
+@import '../shared/jquery.contextmenu';
+
+body {
+ background-color: #BFBFBF;
+ color: #212121;
+ /*font-size:11px;*/
+ font-family: Arial, Helvetica, sans-serif;
+}
+
+#mainContent {
+ top: 30px;
+}
+
+#mainMenu .title, #mainMenu a, #mainMenu b, #mainMenu span {
+ color: #212121;
+}
+
+a, a:hover, a:visited {
+ color: #BFBFBF;
+}
+
+#record_infos a,
+#record_infos a:hover,
+#record_infos a:visited {
+ color: #000000;
+}
+
+ul {
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+}
+
+img {
+ border: none;
+ vertical-align: middle;
+}
+
+#top_container {
+ bottom: 190px;
+}
+
+#bottom_container {
+ height: 200px;
+ top: auto;
+ bottom: -10px
+}
+
+.title15 {
+ font-size: 15px;
+ font-weight: bold;
+}
+
+.record_display_box table {
+ vertical-align: middle;
+ table-layout: fixed;
+}
+
+.record_display_box {
+ width: 100%;
+ height: 100%;
+ display: block;
+}
+
+.record_display_box .record {
+ position: relative;
+ max-width: none;
+ max-height: none;
+}
+
+.record_display_box .header .title {
+ overflow: hidden;
+ line-height: 20px;
+ height: 20px;
+}
+
+.record_display_box .header {
+ color: #BFBFBF;
+ height: 30px;
+ bottom: auto;
+ overflow: hidden;
+}
+
+.record_display_box .lightbox_container {
+ top: 30px;
+ overflow: hidden;
+}
+
+#sc_wrapper {
+ left: 20px;
+ right: 20px;
+ overflow-x: scroll;
+ overflow-y: hidden;
+}
+
+#sc_container {
+ position: relative;
+ height: 100%;
+}
+
+.basket_element_wrapper {
+ position: relative;
+ float: left;
+ padding: 0 5px;
+}
+
+.basket_element {
+ position: relative;
+ float: left;
+ width: 114px;
+ height: 130px;
+ border: 1px solid #212121;
+ text-align: left;
+ padding: 5px 8px;
+}
+
+.basket_element.selected {
+ background-color: #212121;
+}
+
+.basket_element .display_id {
+ top: 4px;
+ left: 8px;
+}
+
+#report .display_id {
+ top: -5px;
+ left: -5px;
+}
+
+#report .CHIM.diapo {
+ position: relative;
+ text-align: center;
+}
+
+.display_id {
+ background-color: #FFFFFF;
+ padding: 3px 6px;
+ font-weight: bold;
+ z-index: 99;
+ color: #212121;
+ -moz-border-radius: 50%;
+ -webkit-border-radius: 50%;
+ border-radius: 50%;
+ position: absolute;
+}
+
+.basket_element .agreement {
+ position: absolute;
+ top: 4px;
+ right: 8px;
+ z-index: 99;
+}
+
+.not_decided {
+ opacity: 0.30;
+ filter: alpha(opacity=30);
+}
+
+#sc_wrapper .not_decided {
+ display: none;
+}
+
+.basket_element .image {
+ position: relative;
+ z-index: 90;
+}
+
+.basket_element .previewTips {
+ background-image: url('#{$iconsPath}zoom.gif');
+ background-position: center center;
+ background-repeat: no-repeat;
+ cursor: help;
+ position: absolute;
+ bottom: 4px;
+ right: 8px;
+ height: 18px;
+ width: 18px;
+ z-index: 99;
+}
+
+.record_display_box .title {
+ margin: 0 10px;
+}
+
+.record_display_box .display_id {
+ top: 5px;
+ margin: 0 0 0 5px;
+}
+
+#right_scroller {
+ width: 30px;
+ right: -10px;
+ left: auto;
+ background-image: url('#{$lightboxPath}right_arrow.png');
+ background-position: center center;
+ background-repeat: no-repeat;
+}
+
+#left_scroller {
+ width: 30px;
+ left: -10px;
+ right: auto;
+ background-image: url('#{$lightboxPath}left_arrow.png');
+ background-position: center center;
+ background-repeat: no-repeat;
+}
+
+#basket_infos {
+ overflow: hidden;
+ background-color: #1F1E1B;
+ color: #BFBFBF;
+}
+
+#basket_options {
+ height: 35px;
+ top: auto;
+ background-color: #1F1E1B;
+ text-align: center;
+}
+
+#basket_options .confirm_report {
+ margin: 5px auto;
+}
+
+#basket_infos .user_infos {
+ height: 120px;
+ top: auto;
+}
+
+#basket_infos table {
+ width: 100%;
+ margin: 5px 0;
+}
+
+#basket_infos table .title {
+ width: 100%;
+}
+
+#basket_infos table .report_wrapper {
+ text-align: right;
+}
+
+#right_column {
+ left: auto;
+ right: 0;
+ width: 240px;
+}
+
+#right_column_validation_toggle {
+ bottom: 45px;
+ background-color: #1F1E1B;
+ height: 30px;
+ top: auto;
+ text-align: center;
+ display: none;
+ line-height: 25px;
+ color: #BFBFBF;
+}
+
+#right_column .right_column_title {
+ height: 30px;
+ bottom: auto;
+}
+
+#right_column .right_column_title img.expanded {
+ display: none;
+}
+
+#right_column .right_column_title img.collapsed {
+ display: inline;
+}
+
+#right_column .right_column_title.expanded img.expanded {
+ display: inline;
+}
+
+#right_column .right_column_title.expanded img.collapsed {
+ display: none;
+}
+
+#right_column .right_column_wrapper {
+ top: 30px;
+ bottom: 45px;
+}
+
+#right_column .right_column_wrapper.caption {
+ bottom: 85px;
+}
+
+#record_infos {
+ overflow-x: hidden;
+ overflow-y: auto;
+}
+
+#record_compare {
+ visibility: hidden;
+ top: auto;
+ left: auto;
+}
+
+#record_compare .header, #record_compare .lightbox_container {
+ left: 5px;
+}
+
+#record_wrapper.comparison #record_main .header, #record_wrapper.comparison #record_main .lightbox_container {
+ right: 5px;
+}
+
+.agreement_selector {
+ position: absolute;
+ bottom: 10px;
+ right: 10px;
+}
+
+.clickable {
+ cursor: pointer;
+}
+
+.big_box.agree {
+ border: 2px solid #35AC00;
+ background-color: #35AC00;
+}
+
+.big_box.disagree {
+ border: 2px solid #DE1200;
+ background-color: #DE1200;
+}
+
+.big_box, .big_box.not_decided {
+ width: 95px;
+ margin: 0 auto;
+ padding: 6px 10px;
+ height: 30px;
+ color: #1F1E1B;
+ background-color: #353430;
+ border: 2px solid #353430;
+ text-align: center;
+ opacity: 1;
+ filter: alpha(opacity=100);
+}
+
+.big_box span {
+ margin: 0 10px;
+}
+
+li.userchoice {
+ margin: 5px 0 0px 20px;
+}
+
+.userchoice.disagree {
+ color: #DE1200;
+}
+
+.userchoice.agree {
+ color: #35AC00;
+}
+
+.basket_report_user {
+ padding: 10px;
+}
+
+.basket_report_user_wrapper {
+ background-color: #1F1E1B;
+ margin: 0 0 5px;
+ color: #BEBEBE;
+}
+
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text {
+ padding: 0.2em 1em 0.2em 2.1em;
+}
+
+/*******
+ *
+ * Index
+ *
+ * ******/
+#main_index {
+ position: relative;
+ width: 600px;
+ margin: 0 auto;
+}
+
+#main_wrapper {
+ width: 100%;
+}
+
+#main_wrapper h1 {
+ font-weight: bold;
+ font-size: 25px;
+}
+
+table th {
+ text-align: right;
+ vertical-align: bottom;
+ height: 60px;
+ border-bottom: 1px solid #8F8F8F;
+}
+
+table th.title {
+ text-align: left;
+}
+
+table th h1 {
+ margin-left: 20px;
+}
+
+table th i {
+ margin-right: 20px;
+}
+
+.ui-button.download_button {
+ margin: 0 5px 0 50px;
+}
+
+.ui-button.comment_button {
+ margin-left: 5px;
+}
+
+.basket_wrapper.hover {
+ background-color: #1F1E1B;
+ color: #BFBFBF;
+}
+
+.basket_wrapper {
+ margin: 10px;
+}
+
+.basket_wrapper table {
+ margin: 10px;
+ width: 580px;
+}
+
+.basket_description table {
+ margin: 0;
+ width: 100%;
+ text-align: left;
+}
+
+.basket_description table td.right {
+ text-align: right;
+ width: 120px;
+ font-style: italic;
+ vertical-align: top;
+}
+
+.basket_description {
+}
+
+.thumb_wrapper {
+ text-align: center;
+}
+
+.thumb_wrapper .thumb {
+ position: relative;
+}
+
+#sc_wrapper .thumb_wrapper {
+ position: absolute;
+ top: 28px;
+}
+
+.record_display_box .notes_overlay {
+ background-color: #BFBFBF;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ opacity: 0.70;
+ filter: alpha(opacity=70);
+ z-index: 100;
+}
+
+.record_display_box .notes_wrapper {
+ position: absolute;
+ top: -100%;
+ height: 100%;
+ width: 100%;
+ left: 0px;
+}
+
+.record_display_box .note_wrapper {
+ background-color: white;
+ position: relative;
+ max-width: 75%;
+ margin: 20px 0;
+ padding: 10px;
+ color: #212121;
+}
+
+.record_display_box .note_wrapper.my_note {
+ background-color: #C9FFF7;
+}
+
+.record_display_box .notes h2 {
+ margin: 10px 0;
+}
+
+.record_display_box .notes {
+ position: relative;
+ margin: 0 auto;
+ width: 80%;
+ height: 90%;
+ max-width: 450px;
+ z-index: 110;
+ overflow-y: auto;
+ overflow-x: hidden;
+}
+
+.ui-state-default.note_closer, .ui-state-default.note_saver {
+ background-color: #353430;
+ padding: 5px;
+ margin: 0 10px;
+}
+
+.ui-state-default.note_saver {
+ background-color: #1F1E1B;
+}
+
+.record_display_box form .buttons {
+ margin: 5px;
+ text-align: right;
+}
+
+.record_display_box form {
+ margin: 15px 0;
+ width: 90%;
+}
+
+.record_display_box form textarea {
+ width: 100%;
+ height: 75px;
+}
+
+#navigation {
+ width: 200px;
+}
+
+.basket_downloader {
+ background-color: #1F1E1B;
+ margin: 0 10px;
+ padding: 2px;
+ border: 0;
+}
+
+hr {
+ width: 100%;
+ height: 1px;
+ background-color: #212121;
+ border: none;
+}
+
+.report {
+ margin: 0 10px;
+ vertical-align: bottom;
+}
+
+/*
+ *
+ * Overrides JqueryUI
+ *
+ */
+.ui-button {
+ background: transparent;
+ border: none;
+ margin: 0;
+ padding: 0;
+}
+
+.ui-button-text-only .ui-button-text {
+ padding: 0.15em;
+}
+
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+ color: #BFBFBF;
+ background-image: none;
+ border: none;
+ background-color: transparent;
+}
+
+.ui-widget-header {
+ background-color: #1F1E1B;
+ background-image: none;
+ border: none;
+}
diff --git a/www/skins/report/jquery.cluetip.css b/resources/www/report/_jquery-cluetip.scss
similarity index 75%
rename from www/skins/report/jquery.cluetip.css
rename to resources/www/report/_jquery-cluetip.scss
index 7123ed90b7..1a0bd4fdbe 100644
--- a/www/skins/report/jquery.cluetip.css
+++ b/resources/www/report/_jquery-cluetip.scss
@@ -13,7 +13,7 @@
width: 43px;
height: 11px;
position: absolute;
- background-image: url(images/wait.gif);
+ background-image: url(images/wait.gif); //@TODO fix url
}
.cluetip-arrows {
display: none;
@@ -37,15 +37,15 @@
}
#cluetip{
- background-color: #333;
- border: 1px solid #333;
+ background-color: #333;
+ border: 1px solid #333;
}
#cluetip table{
- border: 1px solid #333;
- border-collapse:collapse;
+ border: 1px solid #333;
+ border-collapse:collapse;
}
#cluetip thead th, #cluetip tfoot{
- background-color:white;
- color:white;
+ background-color:white;
+ color:white;
}
\ No newline at end of file
diff --git a/resources/www/report/_tables.scss b/resources/www/report/_tables.scss
new file mode 100644
index 0000000000..9c4ca72d01
--- /dev/null
+++ b/resources/www/report/_tables.scss
@@ -0,0 +1,537 @@
+.clearLeft {
+ clear: left;
+}
+
+#chart_detail {
+ cursor: pointer;
+}
+
+.form_csv {
+ width: 15px;
+ height: 16px;
+ margin-left: 10px;
+ margin-left: 5px;
+}
+
+/*hack tout sauf ie 6-7-8*/
+:root * > .form_csv {
+ margin-top: 6px;
+}
+
+.lt-ie9 .form_csv {
+ margin-top: -8px;
+}
+
+.lt-ie9 th {
+ height: 50px;
+}
+
+#query {
+ background: #555;
+ border: none;
+ color: #F3852B;
+}
+
+.form label {
+ display: inline-block;
+ vertical-align: baseline;
+ color: #FFF;
+}
+
+form.report_form input[type=text] {
+ width: 40px;
+}
+
+.form_csv input[name=submit] {
+
+ background: url(img/csv.gif) top right no-repeat;
+ width: 15px;
+ height: 16px;
+ cursor: pointer;
+ border: 0;
+}
+
+.left {
+ float: left;
+}
+
+iframe {
+ border: none;
+}
+
+.columnjson_title {
+ color: #555555;
+ font-weight: bolder;
+}
+
+.report_form fieldset {
+ margin: 0;
+ padding: 0;
+}
+
+.curfilter {
+ font-size: 12px;
+ color: #333;
+}
+
+.curfilter em {
+ font-size: 16px;
+ color: #333;
+}
+
+.columnjson_link_box {
+ margin: 2px;
+ width: 100px;
+ float: left;
+}
+
+.columnjson_link {
+ color: black;
+ margin: 2px;
+ font-size: 10px;
+ text-decoration: none;
+}
+
+.no_results {
+ margin-top: 50px;
+}
+
+.horizontal-scroller {
+ position: relative;
+ top: 0;
+ left: 0;
+}
+
+#mainTabs {
+ border: none;
+}
+
+.answers {
+ background-color: #F6F2F1;
+}
+
+.report-table tr.odd {
+ background-color: #CDCDCD;
+}
+
+.report-table tr.even {
+ background-color: #FFF;
+}
+
+.imgdash {
+ margin-bottom: 20px;
+}
+
+#holder {
+ height: 250px;
+ width: 800px;
+}
+
+#title_dash {
+ float: left;
+ font-size: 18px;
+ color: #f6f2f1;
+}
+
+#periode_dash {
+ float: right;
+ font-size: 18px;
+ color: #FF9000;
+ font-weight: bolder;
+}
+
+#liste_dash {
+ clear: both;
+ width: 100%;
+ border-top: 2px solid #212121;
+ font-weight: lighter;
+ font-size: x-small;
+ font-style: italic;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ color: white;
+}
+
+.report-table {
+ padding: 0 auto;
+ clear: both;
+ margin-bottom: 10px;
+ overflow: auto;
+}
+
+.report-table table {
+ border-collapse: collapse;
+ border-color: white;
+ font-family: "Trebuchet MS", "Lucida Sans Unicode", verdana, lucida, helvetica, sans-serif;
+ font-size: 0.8em;
+ margin: 0 auto;
+ width: 100%;
+ padding-top: 2px;
+}
+
+.orderby:hover {
+ cursor: pointer;
+}
+
+.report-table caption {
+ font-size: x-large;
+ font-weight: 900;
+ padding: 2px;
+ text-align: left;
+ background-color: #f6f2f1;
+ color: #202020;
+ border-bottom: 1px solid #9C9B99;
+ border-top: 1px solid #9C9B99;
+}
+
+.report-table th {
+ border: 1px solid white;
+ text-align: center;
+ font-weight: bolder;
+}
+
+.report-table td {
+ border: 1px solid white;
+ vertical-align: 4px;
+ text-align: center;
+ color: #202020;
+ min-width: 50px;
+ width: auto;
+ white-space: nowrap;
+}
+
+.report-table thead th {
+ text-align: center;
+ font-weight: bolder;
+ font-size: small;
+ border-bottom: 3px solid #f6f2f1;
+ border-top: 3px solid #f6f2f1;
+ background-color: #FF9000;
+ min-width: 50px;
+ width: auto;
+ white-space: nowrap;
+}
+
+.report-table tfoot td {
+ background-color: #FF9000;
+}
+
+.report-table tbody a {
+ color: #333;
+}
+
+.report-table tbody a:hover {
+ color: white;
+}
+
+.report-table tr:hover {
+ background-color: #FF9000;
+}
+
+.report-table tbody td a {
+ padding-right: 12px;
+}
+
+.report-table tfoot {
+ background-color: FF9000;
+ border: 1px solid #505050;
+}
+
+#dash .answers {
+ background-color: #555555;
+ min-height: 400px;
+}
+
+.spacer {
+ clear: both;
+}
+
+div.left {
+ float: left;
+ padding-left: 10px;
+}
+
+div.right {
+ float: right;
+ padding-right: 10px;
+}
+
+.jqprint {
+ margin-left: 10px;
+}
+
+.config {
+ margin-left: 10px;
+}
+
+.center {
+ margin: 0 auto;
+ text-align: center;
+}
+
+table.center {
+ margin: 0 auto;
+ text-align: center;
+}
+
+.current_filter {
+ color: #708090;
+ width: 100%;
+ clear: left;
+ text-align: center;
+ font-size: 12px;
+ font-style: italic;
+ padding-left: 45px;
+ padding-right: 45px;
+}
+
+.floatleft {
+ float: left;
+ padding: 20px 5px 20px 5px;
+}
+
+.leftControl {
+ float: left;
+ margin-right: 5px;
+ margin-top: 10px;
+ cursor: pointer;
+}
+
+.rightControl {
+ float: left;
+ margin-left: 5px;
+ margin-top: 10px;
+ cursor: pointer;
+}
+
+#dashboard.loading {
+ background: url('dash-ajax-loader.gif') #696969 no-repeat center center;
+}
+
+#dashboard-table table {
+ font: normal 76%/150% "Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif;
+ border: none;
+ color: #000;
+ width: 400px;
+}
+
+#dashboard-table caption {
+ font-size: medium;
+ text-align: center;
+ font-weight: bolder;
+ color: #FF9000;
+ padding: 3px;
+ border-top: 1px solid white;
+}
+
+#dashboard-table table a {
+ color: #523A0B;
+ text-decoration: none;
+ border-bottom: 1px dotted;
+}
+
+#dashboard-table table a:visited {
+ color: #444;
+ font-weight: normal;
+}
+
+#dashboard-table table a:hover {
+ border-bottom-style: solid;
+}
+
+#dashboard-table thead th, thead td {
+ border-top: 5px solid #555555;
+ border-left: none;
+ border-bottom: none;
+ border-right: none;
+ background: #FF9000;
+}
+
+#dashboard-table thead th.grey {
+ background: #555555;
+}
+
+#dashboard-table tbody tr:hover td, tbody tr:hover th {
+ background-color: #FF9000;
+}
+
+#dashboard-table tbody th, td {
+ text-align: center;
+ vertical-align: top;
+}
+
+#dashboard-table tbody td {
+ background-color: white;
+}
+
+#dashboard-table tbody th {
+ font-weight: normal;
+ white-space: nowrap;
+}
+
+#dashboard-table tbody th a:link, tbody th a:visited {
+ font-weight: bold;
+}
+
+#dashboard-table tbody td, tbody th {
+ border: 1px solid #fff;
+ border-width: 1px 0;
+}
+
+#dashboard-table tfoot td {
+ color: white;
+ border-left: none;
+ border-right: none;
+ border-top: none;
+}
+
+#mainTabs fieldset {
+ width: 400px;
+}
+
+#title_dash {
+ font-weight: bold;
+ font-size: x-large;
+}
+
+#dashboard-table {
+ padding-top: 30px;
+}
+
+div.form_titre {
+ padding-bottom: 2px;
+ font-size: large;
+ font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+ text-align: left;
+ color: #f6f2f1;
+ font-weight: bold;
+ border-bottom: 1px solid #323232;
+ margin-bottom: 3px;
+ margin-left: 10px;
+ margin-right: 10px;
+}
+
+.form1 {
+ float: left;
+ width: 140px;
+ padding: 3px;
+ border-right: 1px groove #454545;
+}
+
+.form2 {
+ float: left;
+ width: 400px;
+ padding: 3px;
+ border-right: 1px groove #454545;
+}
+
+.form3 {
+ float: left;
+ width: 420px;
+ padding: 3px;
+}
+
+input {
+ font-family: Verdana, sans-serif;
+ padding: 2px;
+ border: 1px solid #555555;
+}
+
+table.tablesorter tr th {
+ background-image: url('#{$iconsPath}bg.gif');
+ background-repeat: no-repeat;
+ background-position: center right;
+ cursor: pointer;
+ background-color: #777777
+}
+
+table.tablesorter tr th.SortUp {
+ background-image: url('#{$iconsPath}desc.gif');
+}
+
+table.tablesorter tr th.hover {
+ background-color: #376974;
+}
+
+table.tablesorter tr th.active {
+ background-color: #61bcd0;
+}
+
+table.tablesorter tr th.SortDown {
+ background-image: url('#{$iconsPath}asc.gif');
+}
+
+#mainContainer {
+ background-color: #212121;
+}
+
+#mainMenu {
+ background-color: black;
+}
+
+#form {
+ height: 150px;
+}
+
+.answers {
+ overflow-y: auto;
+ overflow-x: hidden;
+ clear: left;
+}
+
+#form-container {
+ width: 1000px;
+ margin: 0 auto;
+ background-color: transparent;
+}
+
+#navigation {
+ background-color: transparent;
+ border: none;
+ border-bottom: 1px solid black;
+ margin-top: 10px;
+}
+
+.content {
+ margin: -1px 45px;
+}
+
+.onload {
+ background-image: url('#{$iconsPath}ajax-loader.gif');
+ background-position: center center;
+ background-repeat: no-repeat;
+}
+
+.ui-tabs, .ui-tabs .ui-tabs-panel {
+ padding: 0;
+}
+
+.ui-widget-overlay {
+ opacity: 0.7;
+ filter: alpha(opacity=40);
+}
+
+.aroundTable {
+ width: 900px;
+ overflow: auto;
+}
+
+.imgdash table {
+ margin: auto;
+ margin-top: 15px;
+ margin-bottom: 15px;
+ width: 100%;
+}
+
+.imgdash td, .imgdash th {
+ border: 1px solid #bbb;
+ background: #ddd;
+ text-align: center;
+ border-radius: 0.5px;
+}
+
+.imgdash caption {
+ font-weight: bold;
+}
+
+
diff --git a/resources/www/report/jquery-ui/report-base.scss b/resources/www/report/jquery-ui/report-base.scss
new file mode 100644
index 0000000000..e430088276
--- /dev/null
+++ b/resources/www/report/jquery-ui/report-base.scss
@@ -0,0 +1,169 @@
+@import '../../vendors/jquery-ui/dark-hive';
+$reportImagesPath: '../../../../skins/report/jquery-ui-theme/report-base/images/';
+.ui-widget-content {
+ border: 1px solid #202020;
+ background: #555555 url('#{$reportImagesPath}ui-bg_flat_75_d2d1cf_40x100.png') 50% 50% repeat-x;
+ color: #ff9000;
+}
+.ui-widget-content a {
+ color: #ff9000;
+}
+.ui-widget-header {
+ border: 1px solid #202020;
+ background: #202020 url('#{$reportImagesPath}ui-bg_flat_75_d2d1cf_40x100.png') 50% 50% repeat-x;
+ color: #222222;
+ font-weight: bold;
+}
+.ui-widget-header a {
+ color: #222222;
+}
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default,
+.ui-widget-content .ui-state-default,
+.ui-widget-header .ui-state-default {
+ border: 1px solid #202020;
+ background: #313131 url('#{$reportImagesPath}ui-bg_flat_75_d2d1cf_40x100.png') 50% 50% repeat-x;
+ font-weight: bold;
+ color: #ffffff;
+}
+.ui-state-default a,
+.ui-state-default a:link,
+.ui-state-default a:visited {
+ color: #ffffff;
+ text-decoration: none;
+}
+.ui-state-hover,
+.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover,
+.ui-state-focus,
+.ui-widget-content .ui-state-focus,
+.ui-widget-header .ui-state-focus {
+ border: 1px solid #999999;
+ background: #dadada url('#{$reportImagesPath}ui-bg_glass_75_dadada_1x400.png') 50% 50% repeat-x;
+ font-weight: bold;
+ color: #212121;
+}
+.ui-state-hover a,
+.ui-state-hover a:hover,
+.ui-state-hover a:link,
+.ui-state-hover a:visited {
+ color: #212121;
+ text-decoration: none;
+}
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active {
+ border: 1px solid #202020;
+ background: #555555 url('#{$reportImagesPath}ui-bg_flat_75_d2d1cf_40x100.png') 50% 50% repeat-x;
+ font-weight: bold;
+ color: #ff9000;
+}
+.ui-state-active a,
+.ui-state-active a:link,
+.ui-state-active a:visited {
+ color: #ff9000;
+ text-decoration: none;
+}
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight,
+.ui-widget-content .ui-state-highlight,
+.ui-widget-header .ui-state-highlight {
+ border: 1px solid #fcefa1;
+ background: #fbf9ee url('#{$reportImagesPath}ui-bg_glass_55_fbf9ee_1x400.png') 50% 50% repeat-x;
+ color: #363636;
+}
+.ui-state-highlight a,
+.ui-widget-content .ui-state-highlight a,
+.ui-widget-header .ui-state-highlight a {
+ color: #363636;
+}
+.ui-state-error,
+.ui-widget-content .ui-state-error,
+.ui-widget-header .ui-state-error {
+ border: 1px solid #cd0a0a;
+ background: #fef1ec url('#{$reportImagesPath}ui-bg_inset-soft_95_fef1ec_1x100.png') 50% bottom repeat-x;
+ color: #cd0a0a;
+}
+.ui-state-error a,
+.ui-widget-content .ui-state-error a,
+.ui-widget-header .ui-state-error a {
+ color: #cd0a0a;
+}
+.ui-state-error-text,
+.ui-widget-content .ui-state-error-text,
+.ui-widget-header .ui-state-error-text {
+ color: #cd0a0a;
+}
+
+.ui-icon,
+.ui-widget-content .ui-icon {
+ background-image: url('#{$reportImagesPath}ui-icons_222222_256x240.png');
+}
+.ui-widget-header .ui-icon {
+ background-image: url('#{$reportImagesPath}ui-icons_222222_256x240.png');
+}
+.ui-state-default .ui-icon {
+ background-image: url('#{$reportImagesPath}ui-icons_888888_256x240.png');
+}
+.ui-state-hover .ui-icon,
+.ui-state-focus .ui-icon {
+ background-image: url('#{$reportImagesPath}ui-icons_454545_256x240.png');
+}
+.ui-state-active .ui-icon {
+ background-image: url('#{$reportImagesPath}ui-icons_454545_256x240.png');
+}
+.ui-state-highlight .ui-icon {
+ background-image: url('#{$reportImagesPath}ui-icons_2e83ff_256x240.png');
+}
+.ui-state-error .ui-icon,
+.ui-state-error-text .ui-icon {
+ background-image: url('#{$reportImagesPath}ui-icons_cd0a0a_256x240.png');
+}
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-left,
+.ui-corner-tl {
+ border-top-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-right,
+.ui-corner-tr {
+ border-top-right-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-left,
+.ui-corner-bl {
+ border-bottom-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-right,
+.ui-corner-br {
+ border-bottom-right-radius: 4px;
+}
+
+/* Overlays */
+.ui-widget-overlay {
+ background: #aaaaaa url('#{$reportImagesPath}ui-bg_flat_0_aaaaaa_40x100.png') 50% 50% repeat-x;
+ opacity: .3;
+ filter: Alpha(Opacity=30);
+}
+.ui-widget-shadow {
+ margin: -8px 0 0 -8px;
+ padding: 8px;
+ background: #aaaaaa url('#{$reportImagesPath}ui-bg_flat_0_aaaaaa_40x100.png') 50% 50% repeat-x;
+ opacity: .3;
+ filter: Alpha(Opacity=30);
+ border-radius: 8px;
+}
diff --git a/resources/www/report/jquery-ui/report-detailed.scss b/resources/www/report/jquery-ui/report-detailed.scss
new file mode 100644
index 0000000000..957eae58c9
--- /dev/null
+++ b/resources/www/report/jquery-ui/report-detailed.scss
@@ -0,0 +1,395 @@
+@import '../../vendors/jquery-ui/dark-hive';
+$reportImagesPath: '../../../../skins/report/jquery-ui-theme/report-detailed/images/';
+
+/* Component containers
+----------------------------------*/
+.answers .ui-widget {
+ font-family: Verdana,Arial,sans-serif;
+ font-size: 1.1em;
+}
+.answers .ui-widget .ui-widget {
+ font-size: 1em;
+}
+.answers .ui-widget input,
+.answers .ui-widget select,
+.answers .ui-widget textarea,
+.answers .ui-widget button {
+ font-family: Verdana,Arial,sans-serif;
+ font-size: 1em;
+}
+.answers .ui-widget-content {
+ border: 1px solid #f6f2f1;
+ background: #f6f2f1 url('#{$reportImagesPath}ui-bg_flat_75_f6f2f1_40x100.png') 50% 50% repeat-x;
+ color: #222222;
+}
+.answers .ui-widget-content a {
+ color: #222222;
+}
+.answers .ui-widget-header {
+ border: 1px solid #f6f2f1;
+ background: #f6f2f1 url('#{$reportImagesPath}ui-bg_flat_75_f6f2f1_40x100.png') 50% 50% repeat-x;
+ color: #222222;
+ font-weight: bold;
+}
+.answers .ui-widget-header a {
+ color: #222222;
+}
+
+/* Interaction states
+----------------------------------*/
+.answers .ui-state-default,
+.answers .ui-widget-content .ui-state-default,
+.answers .ui-widget-header .ui-state-default {
+ border: 1px solid #f6f2f1;
+ background: #d2d1cf url('#{$reportImagesPath}ui-bg_flat_75_d2d1cf_40x100.png') 50% 50% repeat-x;
+ font-weight: bold;
+ color: #9c9b99;
+}
+.answers .ui-state-default a,
+.answers .ui-state-default a:link,
+.answers .ui-state-default a:visited {
+ color: #9c9b99;
+ text-decoration: none;
+}
+.answers .ui-state-hover,
+.answers .ui-widget-content .ui-state-hover,
+.answers .ui-widget-header .ui-state-hover,
+.answers .ui-state-focus,
+.answers .ui-widget-content .ui-state-focus,
+.answers .ui-widget-header .ui-state-focus {
+ border: 1px solid #999999;
+ background: #dadada url('#{$reportImagesPath}ui-bg_glass_75_dadada_1x400.png') 50% 50% repeat-x;
+ font-weight: bold;
+ color: #212121;
+}
+.answers .ui-state-hover a,
+.answers .ui-state-hover a:hover,
+.answers .ui-state-hover a:link,
+.answers .ui-state-hover a:visited {
+ color: #212121;
+ text-decoration: none;
+}
+.answers .ui-state-active,
+.answers .ui-widget-content .ui-state-active,
+.answers .ui-widget-header .ui-state-active {
+ border: 1px solid #f6f2f1;
+ background: #ff9000 url('#{$reportImagesPath}ui-bg_flat_65_ff9000_40x100.png') 50% 50% repeat-x;
+ font-weight: bold;
+ color: #ffffff;
+}
+.answers .ui-state-active a,
+.answers .ui-state-active a:link,
+.answers .ui-state-active a:visited {
+ color: #ffffff;
+ text-decoration: none;
+}
+
+/* Interaction Cues
+----------------------------------*/
+.answers .ui-state-highlight,
+.answers .ui-widget-content .ui-state-highlight,
+.answers .ui-widget-header .ui-state-highlight {
+ border: 1px solid #fcefa1;
+ background: #fbf9ee url('#{$reportImagesPath}ui-bg_glass_55_fbf9ee_1x400.png') 50% 50% repeat-x;
+ color: #363636;
+}
+.answers .ui-state-highlight a,
+.answers .ui-widget-content .ui-state-highlight a,
+.answers .ui-widget-header .ui-state-highlight a {
+ color: #363636;
+}
+.answers .ui-state-error,
+.answers .ui-widget-content .ui-state-error,
+.answers .ui-widget-header .ui-state-error {
+ border: 1px solid #cd0a0a;
+ background: #fef1ec url('#{$reportImagesPath}ui-bg_inset-soft_95_fef1ec_1x100.png') 50% bottom repeat-x;
+ color: #cd0a0a;
+}
+.answers .ui-state-error a,
+.answers .ui-widget-content .ui-state-error a,
+.answers .ui-widget-header .ui-state-error a {
+ color: #cd0a0a;
+}
+.answers .ui-state-error-text,
+.answers .ui-widget-content .ui-state-error-text,
+.answers .ui-widget-header .ui-state-error-text {
+ color: #cd0a0a;
+}
+.answers .ui-priority-primary,
+.answers .ui-widget-content .ui-priority-primary,
+.answers .ui-widget-header .ui-priority-primary {
+ font-weight: bold;
+}
+.answers .ui-priority-secondary,
+.answers .ui-widget-content .ui-priority-secondary,
+.answers .ui-widget-header .ui-priority-secondary {
+ opacity: .7;
+ filter:Alpha(Opacity=70);
+ font-weight: normal;
+}
+.answers .ui-state-disabled,
+.answers .ui-widget-content .ui-state-disabled,
+.answers .ui-widget-header .ui-state-disabled {
+ opacity: .35;
+ filter:Alpha(Opacity=35);
+ background-image: none;
+}
+.answers .ui-state-disabled .ui-icon {
+ filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
+}
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.answers .ui-icon {
+ width: 16px;
+ height: 16px;
+}
+.answers .ui-icon,
+.answers .ui-widget-content .ui-icon {
+ background-image: url('#{$reportImagesPath}ui-icons_222222_256x240.png');
+}
+.answers .ui-widget-header .ui-icon {
+ background-image: url('#{$reportImagesPath}ui-icons_222222_256x240.png');
+}
+.answers .ui-state-default .ui-icon {
+ background-image: url('#{$reportImagesPath}ui-icons_888888_256x240.png');
+}
+.answers .ui-state-hover .ui-icon,
+.answers .ui-state-focus .ui-icon {
+ background-image: url('#{$reportImagesPath}ui-icons_454545_256x240.png');
+}
+.answers .ui-state-active .ui-icon {
+ background-image: url('#{$reportImagesPath}ui-icons_454545_256x240.png');
+}
+.answers .ui-state-highlight .ui-icon {
+ background-image: url('#{$reportImagesPath}ui-icons_2e83ff_256x240.png');
+}
+.answers .ui-state-error .ui-icon,
+.answers .ui-state-error-text .ui-icon {
+ background-image: url('#{$reportImagesPath}ui-icons_cd0a0a_256x240.png');
+}
+
+/* positioning */
+.answers .ui-icon-blank { background-position: 16px 16px; }
+.answers .ui-icon-carat-1-n { background-position: 0 0; }
+.answers .ui-icon-carat-1-ne { background-position: -16px 0; }
+.answers .ui-icon-carat-1-e { background-position: -32px 0; }
+.answers .ui-icon-carat-1-se { background-position: -48px 0; }
+.answers .ui-icon-carat-1-s { background-position: -64px 0; }
+.answers .ui-icon-carat-1-sw { background-position: -80px 0; }
+.answers .ui-icon-carat-1-w { background-position: -96px 0; }
+.answers .ui-icon-carat-1-nw { background-position: -112px 0; }
+.answers .ui-icon-carat-2-n-s { background-position: -128px 0; }
+.answers .ui-icon-carat-2-e-w { background-position: -144px 0; }
+.answers .ui-icon-triangle-1-n { background-position: 0 -16px; }
+.answers .ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.answers .ui-icon-triangle-1-e { background-position: -32px -16px; }
+.answers .ui-icon-triangle-1-se { background-position: -48px -16px; }
+.answers .ui-icon-triangle-1-s { background-position: -64px -16px; }
+.answers .ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.answers .ui-icon-triangle-1-w { background-position: -96px -16px; }
+.answers .ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.answers .ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.answers .ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.answers .ui-icon-arrow-1-n { background-position: 0 -32px; }
+.answers .ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.answers .ui-icon-arrow-1-e { background-position: -32px -32px; }
+.answers .ui-icon-arrow-1-se { background-position: -48px -32px; }
+.answers .ui-icon-arrow-1-s { background-position: -64px -32px; }
+.answers .ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.answers .ui-icon-arrow-1-w { background-position: -96px -32px; }
+.answers .ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.answers .ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.answers .ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.answers .ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.answers .ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.answers .ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.answers .ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.answers .ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.answers .ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.answers .ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.answers .ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.answers .ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.answers .ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.answers .ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.answers .ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.answers .ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.answers .ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.answers .ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.answers .ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.answers .ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.answers .ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.answers .ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.answers .ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.answers .ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.answers .ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.answers .ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.answers .ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.answers .ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.answers .ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.answers .ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.answers .ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.answers .ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.answers .ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.answers .ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.answers .ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.answers .ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.answers .ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.answers .ui-icon-arrow-4 { background-position: 0 -80px; }
+.answers .ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.answers .ui-icon-extlink { background-position: -32px -80px; }
+.answers .ui-icon-newwin { background-position: -48px -80px; }
+.answers .ui-icon-refresh { background-position: -64px -80px; }
+.answers .ui-icon-shuffle { background-position: -80px -80px; }
+.answers .ui-icon-transfer-e-w { background-position: -96px -80px; }
+.answers .ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.answers .ui-icon-folder-collapsed { background-position: 0 -96px; }
+.answers .ui-icon-folder-open { background-position: -16px -96px; }
+.answers .ui-icon-document { background-position: -32px -96px; }
+.answers .ui-icon-document-b { background-position: -48px -96px; }
+.answers .ui-icon-note { background-position: -64px -96px; }
+.answers .ui-icon-mail-closed { background-position: -80px -96px; }
+.answers .ui-icon-mail-open { background-position: -96px -96px; }
+.answers .ui-icon-suitcase { background-position: -112px -96px; }
+.answers .ui-icon-comment { background-position: -128px -96px; }
+.answers .ui-icon-person { background-position: -144px -96px; }
+.answers .ui-icon-print { background-position: -160px -96px; }
+.answers .ui-icon-trash { background-position: -176px -96px; }
+.answers .ui-icon-locked { background-position: -192px -96px; }
+.answers .ui-icon-unlocked { background-position: -208px -96px; }
+.answers .ui-icon-bookmark { background-position: -224px -96px; }
+.answers .ui-icon-tag { background-position: -240px -96px; }
+.answers .ui-icon-home { background-position: 0 -112px; }
+.answers .ui-icon-flag { background-position: -16px -112px; }
+.answers .ui-icon-calendar { background-position: -32px -112px; }
+.answers .ui-icon-cart { background-position: -48px -112px; }
+.answers .ui-icon-pencil { background-position: -64px -112px; }
+.answers .ui-icon-clock { background-position: -80px -112px; }
+.answers .ui-icon-disk { background-position: -96px -112px; }
+.answers .ui-icon-calculator { background-position: -112px -112px; }
+.answers .ui-icon-zoomin { background-position: -128px -112px; }
+.answers .ui-icon-zoomout { background-position: -144px -112px; }
+.answers .ui-icon-search { background-position: -160px -112px; }
+.answers .ui-icon-wrench { background-position: -176px -112px; }
+.answers .ui-icon-gear { background-position: -192px -112px; }
+.answers .ui-icon-heart { background-position: -208px -112px; }
+.answers .ui-icon-star { background-position: -224px -112px; }
+.answers .ui-icon-link { background-position: -240px -112px; }
+.answers .ui-icon-cancel { background-position: 0 -128px; }
+.answers .ui-icon-plus { background-position: -16px -128px; }
+.answers .ui-icon-plusthick { background-position: -32px -128px; }
+.answers .ui-icon-minus { background-position: -48px -128px; }
+.answers .ui-icon-minusthick { background-position: -64px -128px; }
+.answers .ui-icon-close { background-position: -80px -128px; }
+.answers .ui-icon-closethick { background-position: -96px -128px; }
+.answers .ui-icon-key { background-position: -112px -128px; }
+.answers .ui-icon-lightbulb { background-position: -128px -128px; }
+.answers .ui-icon-scissors { background-position: -144px -128px; }
+.answers .ui-icon-clipboard { background-position: -160px -128px; }
+.answers .ui-icon-copy { background-position: -176px -128px; }
+.answers .ui-icon-contact { background-position: -192px -128px; }
+.answers .ui-icon-image { background-position: -208px -128px; }
+.answers .ui-icon-video { background-position: -224px -128px; }
+.answers .ui-icon-script { background-position: -240px -128px; }
+.answers .ui-icon-alert { background-position: 0 -144px; }
+.answers .ui-icon-info { background-position: -16px -144px; }
+.answers .ui-icon-notice { background-position: -32px -144px; }
+.answers .ui-icon-help { background-position: -48px -144px; }
+.answers .ui-icon-check { background-position: -64px -144px; }
+.answers .ui-icon-bullet { background-position: -80px -144px; }
+.answers .ui-icon-radio-on { background-position: -96px -144px; }
+.answers .ui-icon-radio-off { background-position: -112px -144px; }
+.answers .ui-icon-pin-w { background-position: -128px -144px; }
+.answers .ui-icon-pin-s { background-position: -144px -144px; }
+.answers .ui-icon-play { background-position: 0 -160px; }
+.answers .ui-icon-pause { background-position: -16px -160px; }
+.answers .ui-icon-seek-next { background-position: -32px -160px; }
+.answers .ui-icon-seek-prev { background-position: -48px -160px; }
+.answers .ui-icon-seek-end { background-position: -64px -160px; }
+.answers .ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.answers .ui-icon-seek-first { background-position: -80px -160px; }
+.answers .ui-icon-stop { background-position: -96px -160px; }
+.answers .ui-icon-eject { background-position: -112px -160px; }
+.answers .ui-icon-volume-off { background-position: -128px -160px; }
+.answers .ui-icon-volume-on { background-position: -144px -160px; }
+.answers .ui-icon-power { background-position: 0 -176px; }
+.answers .ui-icon-signal-diag { background-position: -16px -176px; }
+.answers .ui-icon-signal { background-position: -32px -176px; }
+.answers .ui-icon-battery-0 { background-position: -48px -176px; }
+.answers .ui-icon-battery-1 { background-position: -64px -176px; }
+.answers .ui-icon-battery-2 { background-position: -80px -176px; }
+.answers .ui-icon-battery-3 { background-position: -96px -176px; }
+.answers .ui-icon-circle-plus { background-position: 0 -192px; }
+.answers .ui-icon-circle-minus { background-position: -16px -192px; }
+.answers .ui-icon-circle-close { background-position: -32px -192px; }
+.answers .ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.answers .ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.answers .ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.answers .ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.answers .ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.answers .ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.answers .ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.answers .ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.answers .ui-icon-circle-zoomin { background-position: -176px -192px; }
+.answers .ui-icon-circle-zoomout { background-position: -192px -192px; }
+.answers .ui-icon-circle-check { background-position: -208px -192px; }
+.answers .ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.answers .ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.answers .ui-icon-circlesmall-close { background-position: -32px -208px; }
+.answers .ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.answers .ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.answers .ui-icon-squaresmall-close { background-position: -80px -208px; }
+.answers .ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.answers .ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.answers .ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.answers .ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.answers .ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.answers .ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.answers .ui-corner-all,
+.answers .ui-corner-top,
+.answers .ui-corner-left,
+.answers .ui-corner-tl {
+ border-top-left-radius: 12px;
+}
+.answers .ui-corner-all,
+.answers .ui-corner-top,
+.answers .ui-corner-right,
+.answers .ui-corner-tr {
+ border-top-right-radius: 12px;
+}
+.answers .ui-corner-all,
+.answers .ui-corner-bottom,
+.answers .ui-corner-left,
+.answers .ui-corner-bl {
+ border-bottom-left-radius: 12px;
+}
+.answers .ui-corner-all,
+.answers .ui-corner-bottom,
+.answers .ui-corner-right,
+.answers .ui-corner-br {
+ border-bottom-right-radius: 12px;
+}
+
+/* Overlays */
+.answers .ui-widget-overlay {
+ background: #aaaaaa url('#{$reportImagesPath}ui-bg_flat_0_aaaaaa_40x100.png') 50% 50% repeat-x;
+ opacity: .3;
+ filter: Alpha(Opacity=30);
+}
+.answers .ui-widget-shadow {
+ margin: -8px 0 0 -8px;
+ padding: 8px;
+ background: #aaaaaa url('#{$reportImagesPath}ui-bg_flat_0_aaaaaa_40x100.png') 50% 50% repeat-x;
+ opacity: .3;
+ filter: Alpha(Opacity=30);
+ border-radius: 8px;
+}
diff --git a/resources/www/report/main-print.scss b/resources/www/report/main-print.scss
new file mode 100644
index 0000000000..6690e44085
--- /dev/null
+++ b/resources/www/report/main-print.scss
@@ -0,0 +1,264 @@
+
+html {
+ overflow-y: scroll;
+}
+
+#form-container {
+ background-color: white;
+}
+
+#mainmenu {
+ display: none;
+}
+
+#mainContainer {
+ background-color: white;
+}
+
+thead img {
+ display: none;
+}
+
+thead a {
+ display: none;
+}
+
+form {
+ display: none;
+}
+
+ul {
+ display: none;
+}
+
+.ui-tabs-nav {
+ display: none;
+}
+
+.config {
+ display: none;
+}
+
+.jqprint {
+ display: none;
+}
+
+.noprint {
+ display: none;
+}
+
+.ui-state-default {
+ display: none;
+}
+
+.ui-tabs-hide {
+ display: none;
+}
+
+.report-table table {
+ border-collapse: collapse;
+ border-color: white;
+ font-family: "Trebuchet MS", "Lucida Sans Unicode", verdana, lucida, helvetica, sans-serif;
+ font-size: 0.8em;
+ margin: 10px auto;
+ width: 100%;
+ padding-top: 10px;
+}
+
+.report-table caption {
+ font-size: x-large;
+ font-weight: 900;
+ padding: 5px, 5px, 2px, 5px;
+ text-align: left;
+ background-color: #f6f2f1;
+ /*color:#9C9B99;*/
+ color: #202020;
+ border-bottom: 1px solid #9C9B99;
+ border-top: 1px solid #9C9B99;
+
+}
+
+#dash .answers {
+ background-color: #555555;
+}
+
+.spacer {
+ clear: both;
+}
+
+p.left {
+ float: left;
+ padding-left: 10px;
+}
+
+p.right {
+ float: right;
+ padding-right: 10px;
+}
+
+.report-table th {
+ border: 1px solid black;
+ text-align: center;
+ font-weight: bolder;
+ padding: 0px;
+}
+
+.report-table td {
+ border: 1px solid black;
+ vertical-align: 4px;
+ text-align: center;
+ color: #202020;
+}
+
+.report-table thead th {
+ text-align: center;
+ background-color: #FF9000;
+ font-weight: bolder;
+ font-size: small;
+ color: #202020;
+ border-bottom: 3px solid black;
+ border-top: 3px solid black;
+}
+
+.report-table tfoot td {
+ background-color: #FF9000;
+}
+
+.report-table tbody tr:hover td, tbody tr:hover th {
+ /*background-color: #FF9000;*/
+}
+
+.report-table tr.odd td, tr.odd th {
+ background-color: #ddd;
+}
+
+.report-table tbody a {
+ color: #333;
+}
+
+.report-table tbody a:visited {
+ color: #999999;
+}
+
+.report-table tbody a:hover {
+ color: #FF9000;
+}
+
+.report-table tbody a:active {
+ color: #33c;
+}
+
+.report-table tbody td + td + td + td a {
+ padding-right: 12px;
+}
+
+.report-table tfoot th, tfoot td {
+ text-align: center;
+ color: #222;
+}
+
+.report-table tfoot {
+ background-color: FF9000;
+ border: 1px solid #505050;
+}
+
+.center {
+ margin: 0 auto;
+ text-align: center;
+}
+
+table .center {
+ margin: 0 auto;
+ text-align: center;
+}
+
+#dashboard-table table {
+ font: normal 76%/150% "Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif;
+ border-collapse: separate;
+ border-spacing: 0;
+ margin: 0 0 1em;
+ color: #000;
+}
+
+#dashboard-table table a {
+ color: #523A0B;
+ text-decoration: none;
+ border-bottom: 1px dotted;
+}
+
+#dashboard-table table a:visited {
+ color: #444;
+ font-weight: normal;
+}
+
+#dashboard-table table a:visited:after {
+ content: "\00A0\221A";
+}
+
+#dashboard-table table a:hover {
+ border-bottom-style: solid;
+}
+
+#dashboard-table thead th, thead td, tfoot th, tfoot td {
+ border: 1px solid #523A0B;
+ border-width: 1px 0;
+ background: #EBE5D9;
+}
+
+#dashboard-table th {
+ font-weight: bold;
+ line-height: normal;
+ padding: 0.25em 0.5em;
+ text-align: left;
+}
+
+#dashboard-table tbody th, td {
+ padding: 0.25em 0.5em;
+ text-align: left;
+ vertical-align: top;
+}
+
+#dashboard-table tbody th {
+ font-weight: normal;
+ white-space: nowrap;
+}
+
+#dashboard-table tbody th a:link, tbody th a:visited {
+ font-weight: bold;
+}
+
+#dashboard-table tbody td, tbody th {
+ border: 1px solid #fff;
+ border-width: 1px 0;
+}
+
+#title_dash {
+ font-weight: bold;
+ font-size: x-large;
+}
+
+#liste_dash {
+ font-weight: lighter;
+ font-size: x-small;
+ font-style: italic;
+ padding-bottom: 50px;
+}
+
+.img-dash {
+ float: left;
+ padding: 5px;
+}
+
+#dashboard-table {
+ clear: both;
+ width: 400px;
+ padding-top: 50px;
+}
+
+.answers {
+ clear: left;
+}
+
+#mainContainer {
+ background-color: #FF9000;
+}
diff --git a/resources/www/report/main.scss b/resources/www/report/main.scss
new file mode 100644
index 0000000000..a464431091
--- /dev/null
+++ b/resources/www/report/main.scss
@@ -0,0 +1,10 @@
+$skinsPath: '../../../skins/';
+$iconsPath: '../../../skins/icons/';
+@import '../shared/skin/main';
+@import '../shared/jquery.contextmenu';
+@import './tables';
+@import './jquery-cluetip';
+@import './jquery-ui/report-base';
+@import './jquery-ui/report-detailed';
+
+
diff --git a/resources/www/setup/main.scss b/resources/www/setup/main.scss
index db73ba0a71..cbeee86d16 100644
--- a/resources/www/setup/main.scss
+++ b/resources/www/setup/main.scss
@@ -1,17 +1,17 @@
$iconsPath: '../../../skins/icons/';
-body, html{
- font-family:Helvetica,Verdana,Arial,sans-serif;
- font-size:13px;
- color:white;
- background-color:#000000;
+body, html {
+ font-family: Helvetica, Verdana, Arial, sans-serif;
+ font-size: 13px;
+ color: white;
+ background-color: #000000;
}
-code{
+code {
border: 2px dotted #CCCCCC;
border-radius: 5px 5px 5px 5px;
display: block;
- font-family: 'Bitstream Vera Sans Mono','Courier',monospace;
+ font-family: 'Bitstream Vera Sans Mono', 'Courier', monospace;
margin: 10px;
padding: 10px 20px;
width: 70%;
@@ -19,126 +19,133 @@ code{
a,
a:hover,
-a:visited{
- color:#3CAADC;
+a:visited {
+ color: #3CAADC;
}
-.PNB10{
- position:absolute;
- top:10px;
- left:10px;
- right:10px;
- bottom:10px;
- overflow:auto;
+.PNB10 {
+ position: absolute;
+ top: 10px;
+ left: 10px;
+ right: 10px;
+ bottom: 10px;
+ overflow: auto;
}
-.PNB{
- position:absolute;
- top:0px;
- left:0px;
- right:0px;
- bottom:0px;
+.PNB {
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ right: 0px;
+ bottom: 0px;
}
-input,select{
- border:none;
- background:white;
- margin:2px;
- padding:2px;
- border-radius:4px;
-}
-.steps .wrapper
-{
- background-color:#111111;
- overflow:auto;
- height:410px;
- position:relative;
+input, select {
+ border: none;
+ background: white;
+ margin: 2px;
+ padding: 2px;
+ border-radius: 4px;
}
-.steps .wrapper .wrapper_left
-{
- right:240px;
- overflow-x:hidden;
+.steps .wrapper {
+ background-color: #111111;
+ overflow: auto;
+ height: 410px;
+ position: relative;
}
-.steps .buttons
-{
- background-color:#111111;
- height:40px;
+
+.steps .wrapper .wrapper_left {
+ right: 240px;
+ overflow-x: hidden;
}
-.steps .buttons table{
- width:80%;
- margin:0px auto;
+
+.steps .buttons {
+ background-color: #111111;
+ height: 40px;
}
-.steps
-{
- background-color:#414141;
- padding:10px;
- border-radius:10px;
- height:450px;
+
+.steps .buttons table {
+ width: 80%;
+ margin: 0px auto;
}
+
+.steps {
+ background-color: #414141;
+ padding: 10px;
+ border-radius: 10px;
+ height: 450px;
+}
+
.steps,
-.header
-{
- width:840px;
- position:relative;
- margin:0 auto;
+.header {
+ width: 840px;
+ position: relative;
+ margin: 0 auto;
}
-.header h1{
+
+.header h1 {
font-size: 3em;
font-weight: normal;
- color:#3CAADC;
-}
-.header h1 .version_number,
-.header h1 .version_name{
- font-size: 0.6em;
- font-weight: bold;
- color:#e41370;
-}
-.database_exists, .not_writable, .wrong_database{
- background-color:orange;
- color:black;
- padding:5px;
- font-wright:bold;
+ color: #3CAADC;
}
-.main_content_table{
- width:520px;
- margin:0 20px;
+.header h1 .version_number,
+.header h1 .version_name {
+ font-size: 0.6em;
+ font-weight: bold;
+ color: #e41370;
}
-.main_content_wrapper{
- width:100%;
- border:none;
- height:100%;
- vertical-align:middle;
+
+.database_exists, .not_writable, .wrong_database {
+ background-color: orange;
+ color: black;
+ padding: 5px;
+ font-wright: bold;
}
+
+.main_content_table {
+ width: 520px;
+ margin: 0 20px;
+}
+
+.main_content_wrapper {
+ width: 100%;
+ border: none;
+ height: 100%;
+ vertical-align: middle;
+}
+
p.error {
font-weight: bold;
- padding-top:5px;
- padding-bottom:5px;
+ padding-top: 5px;
+ padding-bottom: 5px;
vertical-align: center;
- border:1px dotted #EA1919;
- padding-left:20px;
+ border: 1px dotted #EA1919;
+ padding-left: 20px;
background: url('#{$iconsPath}delete.png') no-repeat left center;
}
-.main_content_wrapper td .warning{
- vertical-align:middle;
- padding-left:20px;
- padding-top:5px;
- padding-bottom:5px;
+.main_content_wrapper td .warning {
+ vertical-align: middle;
+ padding-left: 20px;
+ padding-top: 5px;
+ padding-bottom: 5px;
background: url('#{$iconsPath}alert.png') no-repeat left center;
}
-.section_title{
- height:50px;
- bottom:auto;
+.section_title {
+ height: 50px;
+ bottom: auto;
}
-.side_infos{
- width:220px;
- left:auto;
- overflow:hidden;
+
+.side_infos {
+ width: 220px;
+ left: auto;
+ overflow: hidden;
}
-.side_infos .table_wrapper{
+
+.side_infos .table_wrapper {
background: none repeat scroll 0 0 #414141;
border-radius: 10px 10px 10px 10px;
height: 380px;
@@ -147,77 +154,85 @@ p.error {
width: 100%;
font-size: 1.1em;
}
-.side_infos table{
- width:200px;
- height:350px;
- position:relative;
- left:10px;
- top:10px;
+
+.side_infos table {
+ width: 200px;
+ height: 350px;
+ position: relative;
+ left: 10px;
+ top: 10px;
}
-.side_infos table tr{
+
+.side_infos table tr {
vertical-align: middle;
}
-p{
- margin:10px 0;
- line-height:20px;
-}
-h2{
- text-align:left;
- font-size:1.4em;
- font-weight:bold;
-}
-.optional_ab_datas{
- display:none;
+
+p {
+ margin: 10px 0;
+ line-height: 20px;
}
-h3{
- font-size:1.2em;margin:10px 0;font-weight:bold
+h2 {
+ text-align: left;
+ font-size: 1.4em;
+ font-weight: bold;
}
-ul, dl{
- position:relative;
- float:left;
- width:360px;
- list-style-type:none;
- padding:0 0 0 40px;
- margin:5px 0;
- border:1px solid #404040;
-}
-li{
- margin:5px 0;
- padding:5px 5px 5px 30px;
- background-image:url('#{$iconsPath}ok.png');
- background-repeat:no-repeat;
- background-position:5px center;
-}
-li.non-blocker{
- background-image:url('#{$iconsPath}alert.png');
-}
-li.blocker{
- background-image:url('#{$iconsPath}delete.png');
+.optional_ab_datas {
+ display: none;
}
+h3 {
+ font-size: 1.2em;
+ margin: 10px 0;
+ font-weight: bold
+}
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default{
+ul, dl {
+ position: relative;
+ float: left;
+ width: 360px;
+ list-style-type: none;
+ padding: 0 0 0 40px;
+ margin: 5px 0;
+ border: 1px solid #404040;
+}
+
+li {
+ margin: 5px 0;
+ padding: 5px 5px 5px 30px;
+ background-image: url('#{$iconsPath}ok.png');
+ background-repeat: no-repeat;
+ background-position: 5px center;
+}
+
+li.non-blocker {
+ background-image: url('#{$iconsPath}alert.png');
+}
+
+li.blocker {
+ background-image: url('#{$iconsPath}delete.png');
+}
+
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
background-image: none;
}
-
-
-
-
.password-meter {
- position:relative;
+ position: relative;
width: 180px;
}
+
.password-meter-message {
text-align: right;
font-weight: bold;
color: #676767;
}
+
.password-meter-bg, .password-meter-bar {
height: 4px;
}
+
.password-meter-bg {
top: 8px;
background: #e0e0e0;
@@ -226,12 +241,15 @@ li.blocker{
.password-meter-message-very-weak {
color: #aa0033;
}
+
.password-meter-message-weak {
color: #f5ac00;
}
+
.password-meter-message-good {
color: #6699cc;
}
+
.password-meter-message-strong {
color: #008000;
}
@@ -240,14 +258,17 @@ li.blocker{
background: #aa0033;
width: 30px;
}
+
.password-meter-bg .password-meter-weak {
background: #f5ac00;
width: 60px;
}
+
.password-meter-bg .password-meter-good {
background: #6699cc;
width: 135px;
}
+
.password-meter-bg .password-meter-strong {
background: #008000;
width: 180px;
diff --git a/resources/www/shared/jquery.image_enhancer.scss b/resources/www/shared/jquery.image_enhancer.scss
index 74a188dc9e..89c08c3cbf 100644
--- a/resources/www/shared/jquery.image_enhancer.scss
+++ b/resources/www/shared/jquery.image_enhancer.scss
@@ -1,57 +1,53 @@
-
-.image_enhance_titlebar
-{
- width:100%;
- position:absolute;
- top:0;
- height:0;
+.image_enhance_titlebar {
+ width: 100%;
+ position: absolute;
+ top: 0;
+ height: 0;
}
.image_enhance_title_options,
-.image_enhance_title_bg
-{
- position:absolute;
- width:100%;
- height:100%;
- top:0;
- left:0;
- z-index:800;
- background-color:black;
+.image_enhance_title_bg {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ left: 0;
+ z-index: 800;
+ background-color: black;
}
-.image_enhance_title_options
-{
- background-color:transparent;
- z-index:900;
+.image_enhance_title_options {
+ background-color: transparent;
+ z-index: 900;
}
-.image_enhance_theatre
-{
- position:absolute;
- top:0;
- left:0;
- width:100%;
- height:100%;
- background:black;
- z-index:8000
+.image_enhance_theatre {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: black;
+ z-index: 8000
}
-.image_enhance_theatre_closer_wrapper{
- position:absolute;
- top:10px;
- right:10px;
- z-index:8200;
+.image_enhance_theatre_closer_wrapper {
+ position: absolute;
+ top: 10px;
+ right: 10px;
+ z-index: 8200;
}
-.image_enhance_theatre img
-{
- position:absolute;
- top:0;
- left:0;
- z-index:8100;
+
+.image_enhance_theatre img {
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 8100;
}
+
.image_enhance_title_options span {
- margin:2px 5px;
- float:right;
- cursor:pointer;
+ margin: 2px 5px;
+ float: right;
+ cursor: pointer;
}
\ No newline at end of file
diff --git a/resources/www/thesaurus/main.scss b/resources/www/thesaurus/main.scss
index 97be8373aa..68460e295c 100644
--- a/resources/www/thesaurus/main.scss
+++ b/resources/www/thesaurus/main.scss
@@ -1,230 +1,208 @@
-BODY, TD, INPUT
-{
+BODY, TD, INPUT {
FONT-FAMILY: Verdana, Arial, helvetica, sans-serif;
font-size: 12px;
}
-FORM
-{
- padding:0px;
- margin:0px;
+
+FORM {
+ padding: 0px;
+ margin: 0px;
}
-BODY.dialog
-{
- background-color:ButtonFace;
+
+BODY.dialog {
+ background-color: ButtonFace;
}
-BODY.dialog .x3Dbox
-{
- position:relative;
- top:0px;
- left:0px;
- text-align:left;
- padding:5px;
+
+BODY.dialog .x3Dbox {
+ position: relative;
+ top: 0px;
+ left: 0px;
+ text-align: left;
+ padding: 5px;
border-top: 1px solid #808080;
border-left: 1px solid #808080;
border-bottom: 1px solid #ffffff;
border-right: 1px solid #ffffff;
}
-BODY.dialog .x3Dbox .title
-{
- position:absolute;
- top:-9px;
- left:20px;
- background-color:ButtonFace;
- padding-left:4px;
- padding-right:4px;
-}
-INPUT.textNofocus
-{
- position:relative;
- top:1px;
- height:14px;
- padding:0px;
- margin:2px;
- border-top:1px solid #ffffff;
- border-left:1px solid #ffffff;
- border-right:1px solid #d0d0d0;
- border-bottom:1px solid #d0d0d0;
+
+BODY.dialog .x3Dbox .title {
+ position: absolute;
+ top: -9px;
+ left: 20px;
+ background-color: ButtonFace;
+ padding-left: 4px;
+ padding-right: 4px;
}
-INPUT.textFocus
-{
- position:relative;
- top:1px;
- height:14px;
- padding:0px;
- margin:0px;
- border:3px solid #99a2d0;
+INPUT.textNofocus {
+ position: relative;
+ top: 1px;
+ height: 14px;
+ padding: 0px;
+ margin: 2px;
+ border-top: 1px solid #ffffff;
+ border-left: 1px solid #ffffff;
+ border-right: 1px solid #d0d0d0;
+ border-bottom: 1px solid #d0d0d0;
}
-H3, H4
-{
+INPUT.textFocus {
+ position: relative;
+ top: 1px;
+ height: 14px;
+ padding: 0px;
+ margin: 0px;
+ border: 3px solid #99a2d0;
+}
+
+H3, H4 {
display: inline;
}
-DIV.thbox
-{
- BACKGROUND-COLOR:#ffffff;
- border-top:1px solid #d0d0d0;
- border-left:1px solid #d0d0d0;
- border-right:2px solid black;
- border-bottom:2px solid black;
- margin:0px;
- padding:0px;
- z-index:1;
+DIV.thbox {
+ BACKGROUND-COLOR: #ffffff;
+ border-top: 1px solid #d0d0d0;
+ border-left: 1px solid #d0d0d0;
+ border-right: 2px solid black;
+ border-bottom: 2px solid black;
+ margin: 0px;
+ padding: 0px;
+ z-index: 1;
}
-DIV.thbox .onglet
-{
- position:absolute;
+DIV.thbox .onglet {
+ position: absolute;
top: -22px;
- left:5px;
- height:20px;
- BACKGROUND-COLOR:#ffffff;
- border-top:1px solid #d0d0d0;
- border-left:1px solid #d0d0d0;
- border-right:2px solid black;
- border-bottom:1px solid #ffffff;
- margin:0px;
- padding:0px;
- padding-left:5px;
- padding-right:15px;
+ left: 5px;
+ height: 20px;
+ BACKGROUND-COLOR: #ffffff;
+ border-top: 1px solid #d0d0d0;
+ border-left: 1px solid #d0d0d0;
+ border-right: 2px solid black;
+ border-bottom: 1px solid #ffffff;
+ margin: 0px;
+ padding: 0px;
+ padding-left: 5px;
+ padding-right: 15px;
font-size: 14px;
- z-index:2;
+ z-index: 2;
}
-DIV.thbox HR
-{
- COLOR:#d0d0d0;
- height:1px;
- margin:0px;
- padding:0px;
+DIV.thbox HR {
+ COLOR: #d0d0d0;
+ height: 1px;
+ margin: 0px;
+ padding: 0px;
}
-
-DIV.glossaire
-{
- position:relative;
- left:4px;
+DIV.glossaire {
+ position: relative;
+ left: 4px;
white-space: nowrap;
}
-DIV.glossaire U
-{
- position:relative;
- left:1px;
+
+DIV.glossaire U {
+ position: relative;
+ left: 1px;
TEXT-DECORATION: none;
margin-right: 5px;
width: 9px;
- height:10px;
- text-align:center;
- display:inline-block;
+ height: 10px;
+ text-align: center;
+ display: inline-block;
font-size: 8px;
border: 1px solid #b0b0b0;
color: #000000;
- BACKGROUND-COLOR:#FFFFFF;
- cursor:pointer;
+ BACKGROUND-COLOR: #FFFFFF;
+ cursor: pointer;
}
-DIV.glossaire U.nots
-{
+DIV.glossaire U.nots {
border: 1px solid #F0F0F0;
- BACKGROUND-COLOR:#F0F0F0;
- cursor:default;
+ BACKGROUND-COLOR: #F0F0F0;
+ cursor: default;
}
-DIV.glossaire DIV.S_
-{
- cursor:pointer;
- BACKGROUND-COLOR:#99a2d0;
- COLOR:#FFFFFF;
+DIV.glossaire DIV.S_ {
+ cursor: pointer;
+ BACKGROUND-COLOR: #99a2d0;
+ COLOR: #FFFFFF;
}
-DIV.glossaire DIV.s_
-{
- cursor:pointer;
+
+DIV.glossaire DIV.s_ {
+ cursor: pointer;
}
-DIV.glossaire DIV.r0_
-{
+
+DIV.glossaire DIV.r0_ {
}
-DIV.glossaire DIV.r1_
-{
- COLOR:#FF4000;
+
+DIV.glossaire DIV.r1_ {
+ COLOR: #FF4000;
}
-DIV.glossaire DIV.OB
-{
- position:relative;
- top:0px;
- padding-top:0px;
- padding-left:8px;
- margin-left:6px;
+
+DIV.glossaire DIV.OB {
+ position: relative;
+ top: 0px;
+ padding-top: 0px;
+ padding-left: 8px;
+ margin-left: 6px;
border-left: 1px solid #cccccc;
border-bottom: 1px solid #cccccc;
}
-DIV.glossaire DIV.ob
-{
- display:none;
+
+DIV.glossaire DIV.ob {
+ display: none;
}
-DIV.glossaire DIV.hb
-{
- position:relative;
- top:0px;
- padding-top:0px;
- padding-left:8px;
- margin-left:6px;
+DIV.glossaire DIV.hb {
+ position: relative;
+ top: 0px;
+ padding-top: 0px;
+ padding-left: 8px;
+ margin-left: 6px;
border-left: 1px solid #cccccc;
border-bottom: 1px solid #cccccc;
}
-DIV.glossaire DIV.ctroot
-{
- position:relative;
- top:0px;
- padding:0px;
- border:none;
+
+DIV.glossaire DIV.ctroot {
+ position: relative;
+ top: 0px;
+ padding: 0px;
+ border: none;
}
-
-DIV.glossaire P.sy
-{
-}
-DIV.glossaire P.ta
-{
+DIV.glossaire P.sy {
}
-DIV.glossaire P.tc
-{
+DIV.glossaire P.ta {
}
-DIV.glossaire P.tce
-{
+DIV.glossaire P.tc {
}
-
-
-
-DIV.tableContainer
-{
- margin:2px;
- border:1px solid #000000;
- background-color:#ffffff;
+DIV.glossaire P.tce {
}
-DIV.tableContainerDragOver
-{
- margin:0px;
- border:3px solid #99a2d0;
+DIV.tableContainer {
+ margin: 2px;
+ border: 1px solid #000000;
+ background-color: #ffffff;
}
-DIV.tableContainer DIV.tbody
-{
- position:relative;
- overflow:auto;
+DIV.tableContainerDragOver {
+ margin: 0px;
+ border: 3px solid #99a2d0;
}
-DIV.tableContainer TABLE
-{
- table-layout:fixed;
+DIV.tableContainer DIV.tbody {
+ position: relative;
+ overflow: auto;
}
-DIV.tableContainer THEAD TH
-{
+
+DIV.tableContainer TABLE {
+ table-layout: fixed;
+}
+
+DIV.tableContainer THEAD TH {
background: #e0ece8;
border-left: 1px solid #ffffff;
border-right: 1px solid #c0ccc8;
@@ -234,109 +212,107 @@ DIV.tableContainer THEAD TH
padding-left: 2px;
padding-right: 2px;
text-align: left;
- cursor:pointer;
+ cursor: pointer;
margin: 0px;
}
-DIV.tableContainer TBODY TR.s_
-{
-}
-DIV.tableContainer TBODY TR.S_
-{
- BACKGROUND-COLOR:#99a2d0;
- COLOR:#FFFFFF;
+
+DIV.tableContainer TBODY TR.s_ {
}
-DIV.tableContainer TBODY TD
-{
+DIV.tableContainer TBODY TR.S_ {
+ BACKGROUND-COLOR: #99a2d0;
+ COLOR: #FFFFFF;
+}
+
+DIV.tableContainer TBODY TD {
border-left: 1px solid #ffffff;
border-right: 1px solid #cccccc;
font-weight: normal;
padding-left: 2px;
padding-right: 2px;
text-align: left;
- cursor:pointer;
+ cursor: pointer;
margin: 0px;
}
-DIV.menu
-{
+DIV.menu {
FONT-FAMILY: Arial, helvetica, sans-serif;
font-size: 12px;
border-left: 1px solid #ffffff;
border-top: 1px solid #ffffff;
border-right: 2px solid #000000;
border-bottom: 2px solid #000000;
- padding:0px;
- margin:0px;
- visibility:hidden;
- position:absolute;
- top:0px;
- left:0px;
- background-color:#d4d0c8;
+ padding: 0px;
+ margin: 0px;
+ visibility: hidden;
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ background-color: #d4d0c8;
}
-DIV.menu IMG
-{
- padding:0px;
- margin:0px;
- position:relative;
- left:-10px;
- top:2px;
+
+DIV.menu IMG {
+ padding: 0px;
+ margin: 0px;
+ position: relative;
+ left: -10px;
+ top: 2px;
}
-DIV.menu A
-{
+
+DIV.menu A {
font-size: 12px;
- display:block;
- position:relative;
+ display: block;
+ position: relative;
text-decoration: none;
- color:#000000;
- padding-top:1px;
- padding-bottom:1px;
- padding-left:13px;
- padding-right:3px;
- overflow:hidden;
- border:none 0px #FFFFFF;
- white-space:nowrap;
+ color: #000000;
+ padding-top: 1px;
+ padding-bottom: 1px;
+ padding-left: 13px;
+ padding-right: 3px;
+ overflow: hidden;
+ border: none 0px #FFFFFF;
+ white-space: nowrap;
}
-DIV.menu A:hover
-{
+
+DIV.menu A:hover {
font-size: 12px;
- display:block;
- position:relative;
+ display: block;
+ position: relative;
text-decoration: none;
- color:#ffffff;
- background-color:#000080;
+ color: #ffffff;
+ background-color: #000080;
}
-DIV.menu A.disabled
-{
+
+DIV.menu A.disabled {
font-size: 12px;
- display:block;
- position:relative;
+ display: block;
+ position: relative;
text-decoration: none;
- color:#A0A0A0;
- padding-top:1px;
- padding-bottom:1px;
- padding-left:13px;
- padding-right:3px;
- overflow:hidden;
+ color: #A0A0A0;
+ padding-top: 1px;
+ padding-bottom: 1px;
+ padding-left: 13px;
+ padding-right: 3px;
+ overflow: hidden;
}
-DIV.menu A.disabled:hover
-{
+
+DIV.menu A.disabled:hover {
font-size: 12px;
- display:block;
- position:relative;
+ display: block;
+ position: relative;
text-decoration: none;
- color:#A0A0A0;
- background-color:#d4d0c8;
+ color: #A0A0A0;
+ background-color: #d4d0c8;
}
-DIV.menu .line
-{
- display:block;
- position:relative;
- height:0px;
- overflow:hidden;
- margin-top:5px;
- margin-bottom:4px;
- padding:0px;
+
+DIV.menu .line {
+ display: block;
+ position: relative;
+ height: 0px;
+ overflow: hidden;
+ margin-top: 5px;
+ margin-bottom: 4px;
+ padding: 0px;
border-top: 1px solid #555555;
border-bottom: 1px solid #ffffff;
}
diff --git a/templates/mobile/lightbox/basket_element.html.twig b/templates/mobile/lightbox/basket_element.html.twig
index 7c97c69bbf..bb500ac40d 100644
--- a/templates/mobile/lightbox/basket_element.html.twig
+++ b/templates/mobile/lightbox/basket_element.html.twig
@@ -7,7 +7,7 @@
{% endblock %}
{% block stylesheet %}
-
+