Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LC layout addnewsubject #390

Merged
merged 11 commits into from
Feb 13, 2024
Merged

LC layout addnewsubject #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0253d42
fix issue #374
GerbenRienk May 2, 2023
2248991
new subject hourglass plus layout
GerbenRienk May 9, 2023
831df9c
hourglass plus inline stylesheets
GerbenRienk May 9, 2023
5141173
Resolve conflict with lc-layout-addnewsubject
toskrip May 12, 2023
2e95b3a
GerbenRienk-layout_addnewsubject
toskrip May 12, 2023
13605bd
css changes for blockUI
GerbenRienk May 23, 2023
167c874
Merge branch 'lc-layout-addnewsubject' into layout_addnewsubject
toskrip May 23, 2023
4c00d8d
Merge pull request #379 from GerbenRienk/layout_addnewsubject
toskrip May 23, 2023
318586e
fixed position for add new subject express
GerbenRienk May 25, 2023
c57eed7
fixed position for overlay
GerbenRienk May 25, 2023
718d7dd
Merge pull request #380 from GerbenRienk/layout_addnewsubject
toskrip Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 41 additions & 47 deletions web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
<fmt:setBundle basename="org.akaza.openclinica.i18n.words" var="resword"/>
<fmt:setBundle basename="org.akaza.openclinica.i18n.notes" var="restext"/>


<jsp:include page="../include/submit-header.jsp"/>
<!-- start of managestudy/findSubjects.jsp -->

<!-- move the alert message to the sidebar-->
<jsp:include page="../include/sideAlert.jsp"/>

Expand All @@ -15,9 +16,7 @@
<script type="text/JavaScript" language="JavaScript" src="includes/jmesa/jquery.min.js"></script>
<script type="text/JavaScript" language="JavaScript" src="includes/jmesa/jquery.jmesa.js"></script>
<script type="text/JavaScript" language="JavaScript" src="includes/jmesa/jmesa.js"></script>
<%-- <script type="text/JavaScript" language="JavaScript" src="includes/jmesa/jmesa-original.js"></script> --%>
<script type="text/javascript" language="JavaScript" src="includes/jmesa/jquery.blockUI.js"></script>

<script type="text/javascript" language="JavaScript" src="includes/jmesa/jquery-migrate-1.1.1.js"></script>

<script type="text/javascript">
Expand All @@ -31,67 +30,62 @@
var parameterString = createParameterStringForLimit(id);
location.href = '${pageContext.request.contextPath}/ListStudySubjects?'+ parameterString;
}

jQuery(document).ready(function() {
jQuery('#addSubject').click(function() {
jQuery.blockUI({ message: jQuery('#addSubjectForm'), css:{left: "300px", top:"10px" } });
});

jQuery('#cancel').click(function() {
jQuery.unblockUI();
return false;
});
});
$.noConflict(); // to avoid conflicts with prototype.js
jQuery(document).ready(function() {
// add a listener to the add subject link
jQuery('#addSubject').click(function() {
// this prepares the overlay that is displayed when clickking add new subject; use 'css: etc' for overridin the default appearance of the div
jQuery.blockUI({message: jQuery('#addSubjectForm'), css:{left: "300px", top:"10px", width:"", padding:"1em", cursor:"default"}});
// defaults can be found inline in includes/jmesa/jquery.blockUI.js
});
// add a listerner to the cancel button in submit/addNewSubjectExpressNew.jsp
jQuery('#cancel').click(function() {
jQuery.unblockUI();
return false;
});
// show the overlay with the add-new-subject-dialog when there were errors with the submission
<c:if test="${showOverlay}">
jQuery.blockUI({ message: jQuery('#addSubjectForm'), css:{left: "300px", top:"10px", cursor:"default"}});
</c:if>
});
</script>

<!-- then instructions-->
<tr id="sidebar_Instructions_open" style="display: none">
<td class="sidebar_tab">

<a href="javascript:leftnavExpand('sidebar_Instructions_open'); leftnavExpand('sidebar_Instructions_closed');"><img src="images/sidebar_collapse.gif" border="0" align="right" hspace="10"></a>

<b><fmt:message key="instructions" bundle="${resword}"/></b>

<div class="sidebar_tab_content">

</div>

</td>

<td class="sidebar_tab">
<a href="javascript:leftnavExpand('sidebar_Instructions_open'); leftnavExpand('sidebar_Instructions_closed');"><img src="images/sidebar_collapse.gif" class="sidebar_collapse_expand"></a>
<b><fmt:message key="instructions" bundle="${resword}"/></b>
<div class="sidebar_tab_content"></div>
</td>
</tr>
<tr id="sidebar_Instructions_closed" style="display: all">
<td class="sidebar_tab">

<a href="javascript:leftnavExpand('sidebar_Instructions_open'); leftnavExpand('sidebar_Instructions_closed');"><img src="images/sidebar_expand.gif" border="0" align="right" hspace="10"></a>

<b><fmt:message key="instructions" bundle="${resword}"/></b>

</td>
<tr id="sidebar_Instructions_closed" style="display: all">
<td class="sidebar_tab">
<a href="javascript:leftnavExpand('sidebar_Instructions_open'); leftnavExpand('sidebar_Instructions_closed');"><img src="images/sidebar_expand.gif" class="sidebar_collapse_expand"></a>
<b><fmt:message key="instructions" bundle="${resword}"/></b>
</td>
</tr>

<!-- include study/site info -->
<jsp:include page="../include/sideInfo.jsp"/>

<jsp:useBean scope='session' id='userBean' class='org.akaza.openclinica.bean.login.UserAccountBean'/>
<jsp:useBean scope='request' id='crf' class='org.akaza.openclinica.bean.admin.CRFBean'/>


<h1><span class="title_manage"><fmt:message key="view_subjects_in" bundle="${restext}"/> <c:out value="${study.name}"/></span></h1>

<div id="findSubjectsDiv">
<form action="${pageContext.request.contextPath}/ListStudySubjects">
<input type="hidden" name="module" value="admin">
${findSubjectsHtml}
</form>
<form action="${pageContext.request.contextPath}/ListStudySubjects">
<input type="hidden" name="module" value="admin">
${findSubjectsHtml}
</form>
</div>

<!-- compose the overlay to add new subject, but don't show it-->
<div id="addSubjectForm" style="display:none;">
<c:import url="../submit/addNewSubjectExpressNew.jsp">
</c:import>
<c:import url="../submit/addNewSubjectExpressNew.jsp"></c:import>
</div>

<br>
<jsp:include page="../include/footer.jsp"/>
<br />

<script type="text/javascript">
<c:if test="${showOverlay}">
jQuery.blockUI({ message: jQuery('#addSubjectForm'), css:{left: "300px", top:"10px" } });
</c:if>
</script>
<jsp:include page="../include/footer.jsp"/>
Loading