diff --git a/bower.json b/bower.json index 8a6becc8e..c40777b90 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "exi-ui", - "version": "5.4.5", + "version": "5.5.0.3", "homepage": "https://github.com/ispyb/EXI", "description": "Extended ISPyB User Interface", "main": "mx/index.html", diff --git a/templates/core/shipping.form.information.template.js b/templates/core/shipping.form.information.template.js index 4f448f0f6..94413d05d 100644 --- a/templates/core/shipping.form.information.template.js +++ b/templates/core/shipping.form.information.template.js @@ -1,5 +1,5 @@
-
+
@@ -23,7 +23,14 @@
Name
-
+ + +
@@ -36,22 +43,28 @@
-{@gt key=nbReimbDewars value=0} -
- According to the A-form for this experiment, you are allowed to have {.nbReimbDewars} parcels reimbursed by the ESRF. Please use the Reimburse button to select/unselect the parcels to be reimbursed. -
- {/gt} +
+ + +
+ {@gt key=nbReimbDewars value=0} +
+ According to the A-form, you are allowed to have {.nbReimbDewars} parcels reimbursed by the ESRF. Please use the Reimburse button to select/unselect the parcels to be reimbursed. +
+ {/gt} +
+
-
-
+
+
- +
From {.shipment.sendingLabContactVO.cardName}
Return address:sReturn address {?shipment.returnLabContactVO} {shipment.returnLabContactVO.cardName} @@ -65,18 +78,18 @@
+ - -
Courier company {.shipment.returnLabContactVO.defaultCourrierCompany}
Billing Reference {.shipment.returnLabContactVO.billingReference}
+
- -
+ +
Allowed Reimb. parcels