Remove enter event on checkboxes to avoid submitting the form

mtp_cashbook/assets-src/javascripts/modules/moj.select-all.js

@@ -18,13 +18,16 @@
       this.$body = $('body');
       this.$selectAll = $(this.selector);
       this.fieldName = this.$selectAll.data('name');
-      this.$checks = $('[name="' + this.fieldName + '"]');
+      this.checksSelector = '[name="' + this.fieldName + '"]';
+      this.$checks = $(this.checksSelector);
     },
 
     bindEvents: function () {
       moj.Events.on('SelectAll.render', this.render);
-      this.$body.on('change', this.selector, this.onSelectAllChange);
-      this.$body.on('change', this.$checks, this.onCheckChange);
+      this.$body
+        .on('change.SelectAll', this.selector, this.onSelectAllChange)
+        .on('change.SelectAll', this.checksSelector, this.onCheckChange)
+        .on('keypress.SelectAll', this.checksSelector + ', ' + this.selector, this.onCheckKeypress);
     },
 
     onSelectAllChange: function (e) {
@@ -53,6 +56,13 @@
       }
     },
 
+    onCheckKeypress: function (e) {
+      if (e.keyCode === 13) {
+        e.preventDefault();
+        return false;
+      }
+    },
+
     render: function () {
       this.$checks.each(function() {
         $(this).change();

mtp_cashbook/assets-src/stylesheets/elements/_checkbox.scss

@@ -44,10 +44,12 @@ $component: Checkbox;
     only screen and (min-device-pixel-ratio: 2) {
       + label {
         background-image: url(../images/box@2x.png);
+        background-size: 20px 20px;
       }
 
       &:checked + label {
         background-image: url(../images/tickbox@2x.png);
+        background-size: 20px 20px;
       }
     }
   }

mtp_cashbook/templates/cashbook/includes/batch_buttons.html

@@ -1,5 +1,5 @@
 {% load i18n %}
 <div>
   <button type="submit" name="submit" value="submit" class="button" id="tour-step6">{% trans "I've credited ticked payments in NOMIS" %}</button>
-  <button class="button button-secondary" name="cancel" value="cancel" id="tour-step7">{% trans "Back to start" %}</button>
+  <button type="cancel" class="button button-secondary" name="cancel" value="cancel" id="tour-step7">{% trans "Back to start" %}</button>
 </div>