Merge branch '1.1.x-dev'

* 1.1.x-dev: (147 commits)
  tidying up pre-merge 1.1.0
  Make it possible for a variant to be a short code.  #218
  Make variant/group properties protected instead of private in click render class #229
  Page search for page destiantion tests #228
  Load trial mode if possible #226
  Fix destination description display #227
  Fix setting of variant from cookie #225
  Fixing invalid tests
  Fix switch to stats view #221
  Fix untranslatable string in stats view #224 #wtf
  Fix pulling/setting cookies for destination testing #222
  Don't track sessions if not front-end. #219
  Don't create sessions in admin/api requests #219
  Fix session setup #220
  better setting of variant property for destination tests, click test in general #214
  fix types labels/ orders #215
  Add hooks for licensing API request #212
  Filter to turn on and off admin script loading #210
  Add hooks in main UI markup #209
  Move admin markup to partial with filterable path #208
  ...

Conflicts:
	ingot.php

Gruntfile.js

@@ -20,7 +20,14 @@ module.exports = function (grunt) {
                 'build/'
             ],
             pre_compress: [
-                'build/releases'
+                'build/ingot/vendor/ingot/mabandit/test',
+                'build/ingot/vendor/ingot/mabandit/vendor/phpunit',
+                'build/ingot/vendor/ingot/mabandit/vendor/symfony',
+                'build/ingot/vendor/jaybizzle/crawler-detect/tests',
+                'build/ingot/vendor/blainesch/prettyarray/examples',
+                'build/ingot/vendor/bin',
+                'build/releases',
+                'build/ingot/build'
             ]
         },
         run: {
@@ -52,7 +59,9 @@ module.exports = function (grunt) {
                     '!phpunit.xml',
                     '!tests/**',
                     '!bower_components/**',
-                    '!bin/**'
+                    '!bin/**',
+                    '!vendor/ingot/mabandit/vendor/bin/**'
+
                 ],
                 dest: 'build/<%= pkg.name %>/'
             }
@@ -128,7 +137,7 @@ module.exports = function (grunt) {
             frontend: {
                 files: {
                     'assets/front-end/js/ingot-click-test.min.js': [ 'assets/front-end/js/ingot-click-test.js' ],
-                    'assets/admin/js/ingot-admin-dependencies.min.js' : ['assets/admin/js/ingot-admin-dependencies.js' ]
+                    'assets/admin/js/ingot-post-editor.min.js' : ['assets/admin/js/ingot-post-editor.js' ]
                 }
             },
             admin:{
@@ -143,7 +152,32 @@ module.exports = function (grunt) {
                 'assets/front-end/js/ingot-click-test.js'
             ],
             tasks: ['default']
-        }
+        },
+        addtextdomain: {
+            options: {
+                textdomain: 'ignot',
+            },
+            target: {
+                files: {
+                    src: [ '*.php', '**/*.php', '!node_modules/**', '!tests/**', '!bin/**' ]
+                }
+            }
+        },
+        makepot: {
+            target: {
+                options: {
+                    domainPath: '/languages',
+                    mainFile: 'ingot.php',
+                    potFilename: 'ingot.pot',
+                    potHeaders: {
+                        poedit: true,
+                        'x-poedit-keywordslist': true
+                    },
+                    type: 'wp-plugin',
+                    updateTimestamp: true
+                }
+            }
+        },
 
     });
 
@@ -156,7 +190,8 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks( 'grunt-shell');
     grunt.loadNpmTasks( 'grunt-contrib-uglify');
     grunt.loadNpmTasks( 'grunt-contrib-watch');
-    grunt.loadNpmTasks( 'grunt-contrib-concat' );
+    grunt.loadNpmTasks( 'grunt-wp-i18n' );
+    grunt.registerTask( 'i18n', ['addtextdomain', 'makepot'] );
 
 
 
@@ -165,9 +200,9 @@ module.exports = function (grunt) {
 
     //release tasks
     grunt.registerTask( 'version_number', [ 'replace:core_file' ] );
-    grunt.registerTask( 'pre_vcs', [ 'shell:composer', 'shell:bower', 'version_number', 'copy', 'compress' ] );
+    grunt.registerTask( 'pre_vcs', [ 'shell:activate', 'version_number', 'copy', 'clean:pre_compress', 'compress' ] );
     grunt.registerTask( 'do_git', [ 'gitadd', 'gitcommit', 'gittag', 'gitpush' ] );
-    grunt.registerTask( 'just_build', [  'shell:composer', 'copy', 'compress' ] );
+    grunt.registerTask( 'just_build', [  'shell:composer', 'copy', 'clean:pre_compress', 'compress' ] );
     grunt.registerTask( 'install', [ 'shell:activate' ] );
 
     grunt.registerTask( 'release', [ 'pre_vcs', 'do_git', 'clean:post_build' ] );

assets/admin/css/admin-app-meta.css

@@ -0,0 +1,57 @@
+/**
+* Content Test Listing
+*/
+
+.group-panel-wrapper {
+    margin-bottom: 20px;
+    white-space: nowrap;
+}
+.group-panel-wrapper * {
+    box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+}
+
+#poststuff .group-panel-wrapper h2 {
+    border-bottom: 1px solid black;
+    font-size: 20px;
+    margin-bottom: 20px;
+    padding: 10px 0;
+
+
+}
+.group-panel {
+    border: 1px solid #CCC;
+    border-radius: 3px;
+    box-shadow: 0 0 5px rgba( 0,0,0,0.1 );
+    display: inline-block;
+    padding: 20px;
+    margin: 0 2.5%;
+    white-space: normal;
+    width: 45%;
+}
+.group-panel h5 {
+    font-size: 22px;
+    margin: 0 0 10px 0;
+}
+
+.group-panel code {
+    display: inline-block;
+    padding: 5px 10px;
+}
+
+.group-icons a {
+    display: inline-block;
+    font-size: 20px;
+    text-align: center;
+    width: 30%;
+}
+.group-icons a.edit { color: black; }
+
+.paginate {
+    padding: 10px 20px;
+}
+.paginate a {
+    display: inline-block;
+    margin-left: 10px;
+}

assets/admin/css/admin-app.css

@@ -1,5 +1,33 @@
 @import url('font-awesome.min.css');
 
+ul.nav li.active,
+ul.nav li.active a {
+    background-color: #A8CE75 !important;
+    color: #FFF !important;
+}
+
+.welcome-jumbotron{
+    background-image: url('ingot-logo-m.png');
+    background-position-x: 100%;
+    background-position-y: 0%;
+    background-repeat: no-repeat;
+    background-size: 25% 25%
+
+}
+
+img.nav-logo {
+    max-width: 50px;
+    height: auto;
+}
+
+.nav ul li a {
+    color: #000;
+}
+
+.navbar-default {
+    background-color: #D3E7BA;
+}
+
 .btn-primary a {
     color: white;
 }
@@ -150,9 +178,9 @@ a.add-new-test { margin: 10px 0; }
 .progress-indicator > li.completed { color: #65d074; }
 .progress-indicator > li.completed .bubble { background-color: #65d074; color: #65d074; border-color: #247830; }
 .progress-indicator > li.completed .bubble:before, .progress-indicator > li.completed .bubble:after { background-color: #65d074; border-color: #247830; }
-.progress-indicator > li.active { color: #337AB7; }
-.progress-indicator > li.active .bubble { background-color: #337AB7; color: #337AB7; border-color: #122a3f; }
-.progress-indicator > li.active .bubble:before, .progress-indicator > li.active .bubble:after { background-color: #337AB7; border-color: #122a3f; }
+.progress-indicator > li.active { background: none; color: #72386A; }
+.progress-indicator > li.active .bubble { background-color: #72386A; color: #72386A; border-color: #122a3f; }
+.progress-indicator > li.active .bubble:before, .progress-indicator > li.active .bubble:after { background-color: #72386A; border-color: #122a3f; }
 .progress-indicator > li a:hover .bubble { background-color: #5671d0; color: #5671d0; border-color: #1f306e; }
 .progress-indicator > li a:hover .bubble:before, .progress-indicator > li a:hover .bubble:after { background-color: #5671d0; border-color: #1f306e; }
 .progress-indicator > li.danger .bubble { background-color: #d3140f; color: #d3140f; border-color: #440605; }
@@ -168,4 +196,14 @@ a.add-new-test { margin: 10px 0; }
 
 @media handheld, screen and (max-width: 400px) { .progress-indicator { font-size: 60%; } }
 
-/*# sourceMappingURL=progress-wizard.min.css.map */
+.btn-primary {
+    color: #fff;
+    background-color: #72386A;
+    border-color: #a8ce75;
+}
+
+.btn-primary:hover {
+    color: #fff;
+    background-color: #A8CE75;
+    border-color: #72386A;
+}