From 5c8b688387d39b9d6012265d013f7a487bcb04e9 Mon Sep 17 00:00:00 2001 From: delageniere Date: Mon, 30 Oct 2017 15:53:54 +0100 Subject: [PATCH] fixes #176 --- .../main/webapp/tiles/bodies/biosaxs/welcome.jsp | 4 +++- .../tiles/bodies/common/help/mxcubeHelp.jsp | 13 +++++++------ .../tiles/bodies/common/help/prepareHelp.jsp | 16 +++++++++------- .../bodies/mx/prepare/fillSampleChanger.jsp | 12 +++++++----- 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/ispyb-ui/src/main/webapp/tiles/bodies/biosaxs/welcome.jsp b/ispyb-ui/src/main/webapp/tiles/bodies/biosaxs/welcome.jsp index 37f289009..bd9e8d15c 100644 --- a/ispyb-ui/src/main/webapp/tiles/bodies/biosaxs/welcome.jsp +++ b/ispyb-ui/src/main/webapp/tiles/bodies/biosaxs/welcome.jsp @@ -91,8 +91,10 @@ <% String targetDataAcquisitions = request.getContextPath() + "/user/viewProjectList.do?reqCode=display"; %> <% String targetListShipment = request.getContextPath() + "/user/viewProjectList.do?reqCode=display&menu=list_shipment"; %> <% String targetPrepareExperiment = request.getContextPath() + "/user/viewProjectList.do?reqCode=display&menu=prepareexperiment"; %> +<% String toUpdateDB = request.getContextPath() + "/updateDB.do?reqCode=updateProposal"; %> -

In case of problems when creating shipments/samples, update ISPyB database (this may take a few minutes). + +

In case of problems when creating shipments/samples, update ISPyB database (this may take a few minutes).


diff --git a/ispyb-ui/src/main/webapp/tiles/bodies/common/help/mxcubeHelp.jsp b/ispyb-ui/src/main/webapp/tiles/bodies/common/help/mxcubeHelp.jsp index 7c010e569..2f9bc3f28 100644 --- a/ispyb-ui/src/main/webapp/tiles/bodies/common/help/mxcubeHelp.jsp +++ b/ispyb-ui/src/main/webapp/tiles/bodies/common/help/mxcubeHelp.jsp @@ -18,6 +18,7 @@ Contributors : S. Delageniere, R. Leal, L. Launer, K. Levik, S. Veyrier, P. Bren --------------------------------------------------------------------------------------------------%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@page import="ispyb.common.util.Constants"%> +<%@ page isELIgnored="false" %> Help page for MxCube @@ -33,25 +34,25 @@ Contributors : S. Delageniere, R. Leal, L. Launer, K. Levik, S. Veyrier, P. Bren <%-- 1) Select shipment --%> - 1- Select the dewars you want for processing.
+ 1- Select the dewars you want for processing.
 <%-- 2) Fill Sample changer --%> - 2- Fill the sample changer: assign a location for your containers (only required if not using Damatrix codes)
+ 2- Fill the sample changer: assign a location for your containers (only required if not using Damatrix codes)
 - 2- Fill the sample changer: assign a location for your containers
+ 2- Fill the sample changer: assign a location for your containers
 - 2- Fill the sample changer: assign a location for your containers
+ 2- Fill the sample changer: assign a location for your containers
 - 2- Fill the sample changer: assign a location for your containers
+ 2- Fill the sample changer: assign a location for your containers
 - 2- Fill the sample changer: assign a location for your containers
+ 2- Fill the sample changer: assign a location for your containers
 diff --git a/ispyb-ui/src/main/webapp/tiles/bodies/common/help/prepareHelp.jsp b/ispyb-ui/src/main/webapp/tiles/bodies/common/help/prepareHelp.jsp index e265a0fac..633193999 100644 --- a/ispyb-ui/src/main/webapp/tiles/bodies/common/help/prepareHelp.jsp +++ b/ispyb-ui/src/main/webapp/tiles/bodies/common/help/prepareHelp.jsp @@ -19,6 +19,8 @@ Contributors : S. Delageniere, R. Leal, L. Launer, K. Levik, S. Veyrier, P. Bren <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@page import="ispyb.common.util.Constants"%> +<%@ page isELIgnored="false" %> + Help page for Prepare Experiment @@ -29,25 +31,25 @@ Contributors : S. Delageniere, R. Leal, L. Launer, K. Levik, S. Veyrier, P. Bren <%-- 1) Select shipment --%> - 1- Select the dewars you want for processing.
+ 1- Select the dewars you want for processing.
 <%-- 2) Fill Sample changer --%> - 2- Fill the sample changer: assign a location for your containers (only required if not using Damatrix codes)
+ 2- Fill the sample changer: assign a location for your containers (only required if not using Damatrix codes)
 - 2- Fill the sample changer: assign a location for your containers
+ 2- Fill the sample changer: assign a location for your containers
 - 2- Fill the sample changer: assign a location for your containers
+ 2- Fill the sample changer: assign a location for your containers
 - 2- Fill the sample changer: assign a location for your containers
+ 2- Fill the sample changer: assign a location for your containers
 - 2- Fill the sample changer: assign a location for your containers
+ 2- Fill the sample changer: assign a location for your containers
 @@ -66,7 +68,7 @@ Contributors : S. Delageniere, R. Leal, L. Launer, K. Levik, S. Veyrier, P. Bren - +

diff --git a/ispyb-ui/src/main/webapp/tiles/bodies/mx/prepare/fillSampleChanger.jsp b/ispyb-ui/src/main/webapp/tiles/bodies/mx/prepare/fillSampleChanger.jsp index a799d3335..6f31ef7a4 100644 --- a/ispyb-ui/src/main/webapp/tiles/bodies/mx/prepare/fillSampleChanger.jsp +++ b/ispyb-ui/src/main/webapp/tiles/bodies/mx/prepare/fillSampleChanger.jsp @@ -25,6 +25,8 @@ Contributors : S. Delageniere, R. Leal, L. Launer, K. Levik, S. Veyrier, P. Bren <%@page import="ispyb.common.util.Constants"%> +<%@ page isELIgnored="false" %> + <% String buttonLabel = "Next step: Link Samples in " + Constants.BCM_NAME; %> @@ -42,25 +44,25 @@ Contributors : S. Delageniere, R. Leal, L. Launer, K. Levik, S. Veyrier, P. Bren <%-- 1) Select shipment --%> - 1- Select the dewars you want for processing.
+ 1- Select the dewars you want for processing.
 <%-- 2) Fill Sample changer --%> - 2- Fill the sample changer: assign a location for your containers (only required if not using Damatrix codes)
+ 2- Fill the sample changer: assign a location for your containers (only required if not using Damatrix codes)
 - 2- Fill the sample changer: assign a location for your containers
+ 2- Fill the sample changer: assign a location for your containers
 - 2- Fill the sample changer: assign a location for your containers
+ 2- Fill the sample changer: assign a location for your containers
 - 2- Fill the sample changer: assign a location for your containers
+ 2- Fill the sample changer: assign a location for your containers