From 0253d4251f2a5a81087fe139f2301bc7ec14da5f Mon Sep 17 00:00:00 2001 From: Gerben Rienk Date: Tue, 2 May 2023 15:57:11 +0200 Subject: [PATCH 1/3] fix issue #374 --- .../webapp/WEB-INF/jsp/managestudy/findSubjects.jsp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp b/web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp index 764d134f4c..fa172c8240 100755 --- a/web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp @@ -5,8 +5,8 @@ - + @@ -15,9 +15,7 @@ -<%-- --%> - From 2248991dd51e2cb564927ddf52fc06e6cf1efcdb Mon Sep 17 00:00:00 2001 From: Gerben Rienk Date: Tue, 9 May 2023 14:27:58 +0200 Subject: [PATCH 2/3] new subject hourglass plus layout --- .../WEB-INF/jsp/managestudy/findSubjects.jsp | 78 ++++++------- .../jsp/submit/addNewSubjectExpressNew.jsp | 107 +++++++++--------- 2 files changed, 90 insertions(+), 95 deletions(-) diff --git a/web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp b/web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp index fa172c8240..de348530b7 100755 --- a/web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp @@ -6,6 +6,7 @@ + @@ -29,61 +30,60 @@ 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() { + jQuery.blockUI({message: jQuery('#addSubjectForm'), css:{left: "300px", top:"10px", cursor:"default"}}); + }); + // 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 + + jQuery.blockUI({ message: jQuery('#addSubjectForm'), css:{left: "300px", top:"10px", cursor:"default"}}); + + }); - - - - - - -
- -
- - - + + + +
+ - - - - - - - + + + + + + + -

-
- - ${findSubjectsHtml} -
+
+ + ${findSubjectsHtml} +
+ + -
- +
+ + \ No newline at end of file diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/addNewSubjectExpressNew.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/addNewSubjectExpressNew.jsp index 185f5e9404..df8ad0149d 100644 --- a/web/src/main/webapp/WEB-INF/jsp/submit/addNewSubjectExpressNew.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/addNewSubjectExpressNew.jsp @@ -1,11 +1,3 @@ -<%-- - User: Hamid - Date: May 8, 2009 - Time: 8:29:31 PM - To change this template use File | Settings | File Templates. ---%> - - <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> @@ -17,7 +9,6 @@ - @@ -73,38 +64,33 @@
-
- - - - - +
+

+

 
+ - @@ -112,14 +98,16 @@ @@ -128,7 +116,7 @@
: - - - - - - - - - -
- - - " size="45" class="formfield" disabled> - "> - - - " size="50" class="formfieldXL"> - - -
*
+ 		+
+ + + + " class="formfieldS" disabled> + "> + + + " class="formfieldS"> + + +   + * + +
+ +
: - +
- + + + + -
" size="50" class="formfieldXL">
**
: - +
" size="50" class="formfieldXL"> @@ -153,12 +141,13 @@ :
- +
@@ -181,7 +170,7 @@
- +
" class="formfieldM" id="enrollmentDateField" /> +
@@ -166,8 +155,8 @@ - - * +   + *
: - +
@@ -228,10 +218,11 @@ @@ -255,10 +246,11 @@
+
- * + *
: - +
- +
" class="formfieldM" id="dobField" /> +
@@ -241,7 +232,7 @@ * *
: - +
@@ -307,7 +299,7 @@
" class="formfieldM" /> +
() *
: - +
- + @@ -379,7 +371,7 @@
**
: - +
@@ -396,16 +388,19 @@
- " class="button" /> -   - " class="button"/> +
- +
+ " class="button" /> +   + " class="button"/> +
+   \ No newline at end of file From 831df9cd52a0ab4d709079ae18715246702e4e3d Mon Sep 17 00:00:00 2001 From: Gerben Rienk Date: Tue, 9 May 2023 14:42:06 +0200 Subject: [PATCH 3/3] hourglass plus inline stylesheets --- .../WEB-INF/jsp/managestudy/findSubjects.jsp | 1 - .../jsp/submit/addNewSubjectExpressNew.jsp | 537 ++++++++---------- 2 files changed, 238 insertions(+), 300 deletions(-) diff --git a/web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp b/web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp index de348530b7..639e903fa8 100755 --- a/web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/managestudy/findSubjects.jsp @@ -1,4 +1,3 @@ -<%@ page contentType="text/html; charset=UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> diff --git a/web/src/main/webapp/WEB-INF/jsp/submit/addNewSubjectExpressNew.jsp b/web/src/main/webapp/WEB-INF/jsp/submit/addNewSubjectExpressNew.jsp index df8ad0149d..36ad92bc87 100644 --- a/web/src/main/webapp/WEB-INF/jsp/submit/addNewSubjectExpressNew.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/submit/addNewSubjectExpressNew.jsp @@ -1,3 +1,4 @@ +<%@ page contentType="text/html; charset=UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> @@ -9,6 +10,7 @@ + @@ -60,347 +62,284 @@ - +
-
-

- - - - -
- - - : -
- +
+

+ + + + + + + + + + + - - - - - - - + + + + - - - - + + + + - "> + "> - - - + + - + + + + + + + - - - - - - + + - - - - - - - - - - - - - - - + + + - - - - - - - + + + + + + + + + - - - - - - - + + + - - - + + - - + - - - - - - - - - - - + + + + + + + + - - - - - + + + + + - + - - - - +
+ + + : + +
- " class="formfieldS" disabled> + " class="formfieldL" disabled> "> - " class="formfieldS"> + " class="formfieldL">  -   - * - + * +
+ +
+
+ : + +
+ " class="formfieldL">  + *
- -
-
: - - - - - - - - -
- " size="50" class="formfieldXL"> -
*
-
: - - - - - - - - -
- " size="50" class="formfieldXL"> -
 
-
+ : + +
+ " class="formfieldL">  +
+ +
+
: - - - - - - - - -
- -
- " class="formfieldM" id="enrollmentDateField" /> -
- 		- - <fmt:message key=" title="" border="0" id="enrollmentDateTrigger" /> - -   - * -
+ 		+
+ " class="formfieldM" id="enrollmentDateField" />  + + <fmt:message key=" title="" border="0" id="enrollmentDateTrigger" /> + +   + * +
+ +
+ : + +
+   + + + * + + +
+ +
+
: - - - - - -
- -
- 		- - - * - - -
-
: - - - - - - -
- " class="formfieldM" id="dobField" /> -
- 		- - <fmt:message key=" title="" border="0" id="dobTrigger" /> - - - *
+ 		+ :
+
+ " class="formfieldM" id="dobField" /> + + <fmt:message key=" title="" border="0" id="dobTrigger" /> + +   + * +
+
+ +
: - - - - - -
- " class="formfieldM" /> -
- 		() *
-
+ : + +
+ " class="formfieldM" />  + ()  + * + +
+
: - - - - - - - - - - - - - -
-
- - - 		*
-
+ : + +
+ + +   +   + + * + +
+ + + +
+
: - - - - - - - - -
-
- -
- 		*
+
+ : + +
+   + * +
+ +
+
: - - - - - - - - - -
-
- " class="formfieldM" id="enrollmentDateField2" /> -
- - <fmt:message key=" title="" border="0" id="enrollmentDateTrigger2"/>* - -
-
: - - - - - -
- " class="formfieldXL"> -
*
-
+
+ " class="formfieldM" id="enrollmentDateField2" /> + + <fmt:message key=" title="" border="0" id="enrollmentDateTrigger2"/> + + +   + * +
+ +
+
+ : + +
+ " class="formfieldXL">  + * +
+ +
+
: - - - - - -
- -
 
-
+ : + +
+ " class="formfieldXL">  +
+ +
+
- + -
-
-
- " class="button" /> -   - " class="button"/> -
-   + 
+
+ " class="button" />   + " class="button"/>
- - \ No newline at end of file +
  + +