Merge pull request #6 from plentymarkets/plenty_dev

Plenty dev
plentymarkets · Jan 21, 2016 · 8a21a4d · 8a21a4d
2 parents 9aa35aa + c38f3dd
commit 8a21a4d
Show file tree

Hide file tree

Showing 27 changed files with 555 additions and 408 deletions.
diff --git a/GruntFile.js b/GruntFile.js
@@ -1,11 +1,12 @@
-module.exports = function(grunt) {
+module.exports = function( grunt )
+{
 
-    grunt.initConfig({
-        pkg: grunt.file.readJSON('package.json'),
+    grunt.initConfig( {
+        pkg: grunt.file.readJSON( 'package.json' ),
 
         clean: {
             debug: ['debug'],
-            doc: ['doc'],
+            doc  : ['doc'],
             build: ['dist']
         },
 
@@ -21,49 +22,50 @@ module.exports = function(grunt) {
                 // - PhantomJS
                 // - IE (only Windows)
                 // CLI --browsers Chrome,Firefox,Safari
-                browsers: ['PhantomJS'],
-                verbose: true,
-                logLevel: 'WARN'
+                browsers  : ['PhantomJS'],
+                verbose   : true,
+                logLevel  : 'WARN'
             }
         },
 
         htmlConvert: {
-            options: {
-                base: 'src/partials/',
+            options  : {
+                base  : 'src/partials/',
                 module: 'TemplateCache'
             },
             templates: {
-                src: ['src/partials/**/*.html'],
+                src : ['src/partials/**/*.html'],
                 dest: 'tmp/templates.js'
             }
         },
 
         concat: {
             debug: {
-                src: [ 'libs/mustache.min.js', 'src/helpers/*.js', 'tmp/templates.js', 'src/plentyFramework.js', 'src/partials/**/*.js', 'src/factories/*.js', 'src/services/*.js', 'src/directives/*.js', 'src/plentyFrameworkCompiler.js'],
+                src : ['libs/mustache.min.js', 'src/helpers/*.js', 'tmp/templates.js', 'src/plentyFramework.js', 'src/partials/**/*.js', 'src/factories/*.js', 'src/services/*.js', 'src/directives/*.js', 'src/plentyFrameworkCompiler.js'],
                 dest: 'debug/<%= pkg.name %>-<%= pkg.version %>.js'
             }
         },
 
         uglify: {
-            compress:{
-                "pure_funcs": [ 'console.log' ],
-                unused: true,
-                "join_vars": true
+            compress: {
+                "pure_funcs": ['console.log'],
+                unused      : true,
+                "join_vars" : true
             },
-            options: {
-                banner:  '/**\n * Licensed under AGPL v3\n * (https://github.com/plentymarkets/plenty-cms-library/blob/master/LICENSE)\n * =====================================================================================\n * @copyright   Copyright (c) 2015, plentymarkets GmbH (http://www.plentymarkets.com)\n * @author      Felix Dausch <[email protected]>\n * =====================================================================================\n*/'
+            options : {
+                sourceMap: true,
+                banner   : '/**\n * Licensed under AGPL v3\n * (https://github.com/plentymarkets/plenty-cms-library/blob/master/LICENSE)\n * =====================================================================================\n * @copyright   Copyright (c) 2015, plentymarkets GmbH (http://www.plentymarkets.com)\n * @author      Felix Dausch <[email protected]>\n * =====================================================================================\n*/'
             },
-            build: {
-                src: 'debug/<%= pkg.name %>-<%= pkg.version %>.js',
+            build   : {
+                src : 'debug/<%= pkg.name %>-<%= pkg.version %>.js',
                 dest: 'dist/<%= pkg.name %>-<%= pkg.version %>.min.js'
             }
         },
 
         yuidoc: {
             doc: {
                 options: {
-                    paths: 'src/',
+                    paths : 'src/',
                     outdir: 'doc/'
                 }
             }
@@ -72,30 +74,30 @@ module.exports = function(grunt) {
         copy: {
             debug: {
                 expand: true,
-                src: 'lang/*',
-                dest: 'debug/'
+                src   : 'lang/*',
+                dest  : 'debug/'
             },
             build: {
                 expand: true,
-                cwd: 'debug/',
-                src: '**',
-                dest: 'dist/'
+                cwd   : 'debug/',
+                src   : '**',
+                dest  : 'dist/'
             }
         }
-    });
+    } );
 
-    grunt.loadNpmTasks('grunt-contrib-clean');
-    grunt.loadNpmTasks('grunt-contrib-concat');
-    grunt.loadNpmTasks('grunt-contrib-uglify');
-    grunt.loadNpmTasks('grunt-contrib-yuidoc');
-    grunt.loadNpmTasks('grunt-contrib-copy');
-    grunt.loadNpmTasks('grunt-karma');
-    grunt.loadNpmTasks('grunt-html-convert');
+    grunt.loadNpmTasks( 'grunt-contrib-clean' );
+    grunt.loadNpmTasks( 'grunt-contrib-concat' );
+    grunt.loadNpmTasks( 'grunt-contrib-uglify' );
+    grunt.loadNpmTasks( 'grunt-contrib-yuidoc' );
+    grunt.loadNpmTasks( 'grunt-contrib-copy' );
+    grunt.loadNpmTasks( 'grunt-karma' );
+    grunt.loadNpmTasks( 'grunt-html-convert' );
 
-    grunt.registerTask('debug', ['clean:debug', 'copy:debug', 'htmlConvert', 'concat:debug']);
-    grunt.registerTask('doc', ['clean:doc', 'yuidoc:doc']);
-    grunt.registerTask('build', ['debug', 'doc', 'karma', 'clean:build', 'uglify:build', 'copy:build']);
-    grunt.registerTask('build-skip-tests', ['debug', 'doc', 'clean:build', 'uglify:build', 'copy:build']);
-    grunt.registerTask('default', ['debug']);
+    grunt.registerTask( 'debug', ['clean:debug', 'copy:debug', 'htmlConvert', 'concat:debug'] );
+    grunt.registerTask( 'doc', ['clean:doc', 'yuidoc:doc'] );
+    grunt.registerTask( 'build', ['debug', 'doc', 'karma', 'clean:build', 'uglify:build', 'copy:build'] );
+    grunt.registerTask( 'build-skip-tests', ['debug', 'doc', 'clean:build', 'uglify:build', 'copy:build'] );
+    grunt.registerTask( 'default', ['debug'] );
 
 };
diff --git a/dist/lang/de_DE.json b/dist/lang/de_DE.json
@@ -1,4 +1,5 @@
 {
+  "OK": "OK",
   "Close": "Schließen",
   "Cancel": "Abbrechen",
   "Confirm": "Bestätigen",
@@ -9,5 +10,7 @@
   "Select order parameters": "Bestellmerkmale wählen",
   "Edit order parameters": "Bestellmerkmale ändern",
   "Packstations and post offices in your area": "Packstationen und Postfilialen in der Nähe",
-  "Please enter a ZIP code and/or a city.": "Bitte geben Sie eine Postleitzahl und/oder einen Ort an."
+  "Please enter a ZIP code and/or a city.": "Bitte geben Sie eine Postleitzahl und/oder einen Ort an.",
+  "Your session has expired.": "Sie sind nicht mehr angemeldet.",
+  "Please log in again to continue shopping.": "Bitte melden Sie sich erneut an, um weiter einzukaufen."
 }
diff --git a/dist/lang/en_EN.json b/dist/lang/en_EN.json
@@ -1,4 +1,5 @@
 {
+  "OK": "OK",
   "Close": "Close",
   "Cancel": "Cancel",
   "Confirm": "Confirm",
@@ -9,5 +10,7 @@
   "Select order parameters": "Select order parameters",
   "Edit order parameters": "Edit order parameters",
   "Packstations and post offices in your area": "Packstations and post offices in your area",
-  "Please enter a ZIP code and/or a city.": "Please enter a ZIP code and/or a city."
+  "Please enter a ZIP code and/or a city.": "Please enter a ZIP code and/or a city.",
+  "Your session has expired.": "Your session has expired.",
+  "Please log in again to continue shopping.": "Please log in again to continue shopping."
 }
diff --git a/dist/plentymarketsCMStools-1.0.3.min.js b/dist/plentymarketsCMStools-1.0.3.min.js