Skip to content

Commit

Permalink
Merge pull request #184 from delageniere/issue176
Browse files Browse the repository at this point in the history 
Fixes issue#176
  • Loading branch information
@delageniere
delageniere authored Oct 30, 2017
2 parents 421d545 + 5c8b688 commit ec8bb86
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 19 deletions.
4 changes: 3 additions & 1 deletion ispyb-ui/src/main/webapp/tiles/bodies/biosaxs/welcome.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"; %>

<h2>In case of problems when creating shipments/samples, <a href="<%=targetUpdateDB%>" >update ISPyB database</a> (this may take a few minutes).

<h2>In case of problems when creating shipments/samples, <a href="<%=toUpdateDB%>" >update ISPyB database</a> (this may take a few minutes).
</h2>
<br>
<div class='container'>
Expand Down
13 changes: 7 additions & 6 deletions ispyb-ui/src/main/webapp/tiles/bodies/common/help/mxcubeHelp.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" %>

<html>
<title>Help page for MxCube</title>
Expand All @@ -33,25 +34,25 @@ Contributors : S. Delageniere, R. Leal, L. Launer, K. Levik, S. Veyrier, P. Bren

<%-- 1) Select shipment --%>
<span class="greyText">
1- Select the dewars</a> you want for processing.<br>
1- Select the dewars you want for processing.<br>
</span>

<%-- 2) Fill Sample changer --%>
<span class="greyText">
<c:if test="${SITE_ATTRIBUTE eq 'ESRF'}">
2- Fill the sample changer</a>: assign a location for your containers (only required if not using Damatrix codes)<br>
2- Fill the sample changer: assign a location for your containers (only required if not using Damatrix codes)<br>
</c:if>
<c:if test="${SITE_ATTRIBUTE eq 'DLS'}">
2- Fill the sample changer</a>: assign a location for your containers<br>
2- Fill the sample changer: assign a location for your containers<br>
</c:if>
<c:if test="${SITE_ATTRIBUTE eq 'EMBL'}">
2- Fill the sample changer</a>: assign a location for your containers<br>
2- Fill the sample changer: assign a location for your containers<br>
</c:if>
<c:if test="${SITE_ATTRIBUTE eq 'MAXIV'}">
2- Fill the sample changer</a>: assign a location for your containers<br>
2- Fill the sample changer: assign a location for your containers<br>
</c:if>
<c:if test="${SITE_ATTRIBUTE eq 'SOLEIL'}">
2- Fill the sample changer</a>: assign a location for your containers<br>
2- Fill the sample changer: assign a location for your containers<br>
</c:if>
</span>

Expand Down
16 changes: 9 additions & 7 deletions ispyb-ui/src/main/webapp/tiles/bodies/common/help/prepareHelp.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" %>

<html>
<title>Help page for Prepare Experiment</title>
<body>
Expand All @@ -29,25 +31,25 @@ Contributors : S. Delageniere, R. Leal, L. Launer, K. Levik, S. Veyrier, P. Bren

<%-- 1) Select shipment --%>
<span class="greyText">
1- Select the dewars</a> you want for processing.<br>
1- Select the dewars you want for processing.<br>
</span>

<%-- 2) Fill Sample changer --%>
<span class="greyText">
<c:if test="${SITE_ATTRIBUTE eq 'ESRF'}">
2- Fill the sample changer</a>: assign a location for your containers (only required if not using Damatrix codes)<br>
2- Fill the sample changer: assign a location for your containers (only required if not using Damatrix codes)<br>
</c:if>
<c:if test="${SITE_ATTRIBUTE eq 'DLS'}">
2- Fill the sample changer</a>: assign a location for your containers<br>
2- Fill the sample changer: assign a location for your containers<br>
</c:if>
<c:if test="${SITE_ATTRIBUTE eq 'EMBL'}">
2- Fill the sample changer</a>: assign a location for your containers<br>
2- Fill the sample changer: assign a location for your containers<br>
</c:if>
<c:if test="${SITE_ATTRIBUTE eq 'MAXIV'}">
2- Fill the sample changer</a>: assign a location for your containers<br>
2- Fill the sample changer: assign a location for your containers<br>
</c:if>
<c:if test="${SITE_ATTRIBUTE eq 'SOLEIL'}">
2- Fill the sample changer</a>: assign a location for your containers<br>
2- Fill the sample changer: assign a location for your containers<br>
</c:if>
</span>

Expand All @@ -66,7 +68,7 @@ Contributors : S. Delageniere, R. Leal, L. Launer, K. Levik, S. Veyrier, P. Bren
<img src="<%=request.getContextPath()%>/images/Previous_disabled-16x16.png" border=0>
<a href="<%=request.getContextPath()%>/user/prepareExp.do?reqCode=selectDewar" title="Select the dewars">
<img src="<%=request.getContextPath()%>/images/Next-16x16.png" border=0></a>
<input type=button value='First step: Select the dewars' onclick="parent.location='<%=request.getContextPath()%>/user/prepareExp.do?reqCode=selectDewar'"">
<input type=button value='First step: Select the dewars' onclick="parent.location='<%=request.getContextPath()%>/user/prepareExp.do?reqCode=selectDewar'">

</p>

Expand Down
12 changes: 7 additions & 5 deletions ispyb-ui/src/main/webapp/tiles/bodies/mx/prepare/fillSampleChanger.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
%>
Expand All @@ -42,25 +44,25 @@ Contributors : S. Delageniere, R. Leal, L. Launer, K. Levik, S. Veyrier, P. Bren

<%-- 1) Select shipment --%>
<span class="greyText">
1- Select the dewars</a> you want for processing.<br>
1- Select the dewars you want for processing.<br>
</span>

<%-- 2) Fill Sample changer --%>
<b>
<c:if test="${SITE_ATTRIBUTE eq 'ESRF' or SITE_ATTRIBUTE eq 'EMBL'}">
2- Fill the sample changer</a>: assign a location for your containers (only required if not using Damatrix codes)<br>
2- Fill the sample changer: assign a location for your containers (only required if not using Damatrix codes)<br>
</c:if>

<c:if test="${SITE_ATTRIBUTE eq 'DLS'}">
2- Fill the sample changer</a>: assign a location for your containers<br>
2- Fill the sample changer: assign a location for your containers<br>
</c:if>

<c:if test="${SITE_ATTRIBUTE eq 'MAXIV'}">
2- Fill the sample changer</a>: assign a location for your containers<br>
2- Fill the sample changer: assign a location for your containers<br>
</c:if>

<c:if test="${SITE_ATTRIBUTE eq 'SOLEIL'}">
2- Fill the sample changer</a>: assign a location for your containers<br>
2- Fill the sample changer: assign a location for your containers<br>
</c:if>
</b>

Expand Down

0 comments on commit ec8bb86

Please sign in to comment.