Merge pull request #2567 from AndreaJenisSaroni/DS-4377-6_x

DS-4377 Fix Sherpa RoMEO layout
This commit is contained in:
kshepherd
2020-02-19 23:52:53 +13:00
committed by GitHub

View File

@@ -345,8 +345,22 @@
</form>
<iframe id="uploadFormIFrame" name="uploadFormIFrame" style="display: none"> </iframe>
<% } %>
<form id="uploadForm" <%= bSherpa?"class=\"sherpa col-md-8\"":"" %> method="post"
<% if (bSherpa) { %>
<div class="col-md-3">
<div id="sherpaBox" class="panel panel-info">
<div class="panel-heading">
<span id="ui-id-1"><fmt:message key="jsp.sherpa.title" /></span>
</div>
<div id="sherpaContent" class="panel-body">
<fmt:message key="jsp.sherpa.loading">
<fmt:param value="<%=request.getContextPath()%>" />
</fmt:message>
</div>
</div>
</div>
<% } %>
<div class="col-md-<%= bSherpa?"9":"12" %>">
<form id="uploadForm" <%= bSherpa?"class=\"sherpa\"":"" %> method="post"
action="<%= request.getContextPath() %>/submit" enctype="multipart/form-data"
onkeydown="return disableEnterKey(event);">
@@ -608,20 +622,7 @@
%>
<input class="btn btn-primary col-md-<%= 12 / (col + 2) %>" type="submit" name="<%=UploadStep.SUBMIT_UPLOAD_BUTTON%>" value="<fmt:message key="jsp.submit.general.next"/>" />
</div>
</div>
</form>
<% if (bSherpa) { %>
<div class="col-md-4">
<div id="sherpaBox" class="panel panel-info">
<div class="panel-heading">
<span id="ui-id-1"><fmt:message key="jsp.sherpa.title" /></span>
</div>
<div id="sherpaContent" class="panel-body">
<fmt:message key="jsp.sherpa.loading">
<fmt:param value="<%=request.getContextPath()%>" />
</fmt:message>
</div>
</div>
</div>
<% } %>
</div>
</dspace:layout>