From b5bf17f1f7a644b6a4864ef34ae722b8a3cb99ca Mon Sep 17 00:00:00 2001 From: lunarkid Date: Tue, 24 Jan 2023 11:51:38 +0700 Subject: [PATCH 01/13] fix: footer buttons wo about --- web/css/reskin-or/reskin.css | 3 +-- web/jsp/viewProjectDetails.jsp | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/web/css/reskin-or/reskin.css b/web/css/reskin-or/reskin.css index 2f69270f5f..2e102bcb8a 100644 --- a/web/css/reskin-or/reskin.css +++ b/web/css/reskin-or/reskin.css @@ -825,7 +825,6 @@ table.scorecard td.reviewerResp input { .cta { position: fixed; width: 100%; - bottom: var(--footer-height); background-color: #fff; z-index: 99; box-shadow: 0 0 16px 16px rgb(42 42 42 / 10%); @@ -2752,7 +2751,7 @@ td.resourcesTable__empty { } .ctaOpen { - bottom: 386px; + bottom: 386px !important; } .approvalRadioBtn { display: flex; diff --git a/web/jsp/viewProjectDetails.jsp b/web/jsp/viewProjectDetails.jsp index 0777e00197..5b66b54e4a 100644 --- a/web/jsp/viewProjectDetails.jsp +++ b/web/jsp/viewProjectDetails.jsp @@ -190,7 +190,16 @@ diff --git a/web/jsp/viewProjectManagementConsole.jsp b/web/jsp/viewProjectManagementConsole.jsp index ba1a7ec5cb..5c08547b81 100644 --- a/web/jsp/viewProjectManagementConsole.jsp +++ b/web/jsp/viewProjectManagementConsole.jsp @@ -55,15 +55,17 @@ let id = with_forum?.[0]?.id; if (id !== undefined) { let forumLinkEl = document.querySelector('.projectInfo__forumLink'); - return forumLinkEl.href = "https://<%=ApplicationServer.FORUMS_SERVER_NAME%>/categories/" + id; + if(forumLinkEl){ + forumLinkEl.classList.add("enabled"); + forumLinkEl.href = "https://<%=ApplicationServer.FORUMS_SERVER_NAME%>/categories/" + id; + } } }); } + let projectId = ${project.id}; + updateForumLink(projectId); document.addEventListener("DOMContentLoaded", function(){ - let projectId = ${project.id}; - updateForumLink(projectId); - let avatar = document.querySelector('.webHeader__avatar a'); let avatarImage = document.createElement('div'); avatarImage.className = "webHeader__avatarImage"; diff --git a/web/jsp/viewProjectPayments.jsp b/web/jsp/viewProjectPayments.jsp index 2d75f9f38e..2cb5592d65 100644 --- a/web/jsp/viewProjectPayments.jsp +++ b/web/jsp/viewProjectPayments.jsp @@ -44,14 +44,17 @@ let id = with_forum?.[0]?.id; if (id !== undefined) { let forumLinkEl = document.querySelector('.projectInfo__forumLink'); - return forumLinkEl.href = "https://<%=ApplicationServer.FORUMS_SERVER_NAME%>/categories/" + id; + if(forumLinkEl){ + forumLinkEl.classList.add("enabled"); + forumLinkEl.href = "https://<%=ApplicationServer.FORUMS_SERVER_NAME%>/categories/" + id; + } } }); } - document.addEventListener("DOMContentLoaded", function(){ - let projectId = ${project.id}; - updateForumLink(projectId); + let projectId = ${project.id}; + updateForumLink(projectId); + document.addEventListener("DOMContentLoaded", function(){ let avatar = document.querySelector('.webHeader__avatar a'); let avatarImage = document.createElement('div'); avatarImage.className = "webHeader__avatarImage"; From bdac9baaf156aefd7104420bcda76e8ed31ef033 Mon Sep 17 00:00:00 2001 From: lunarkid Date: Fri, 27 Jan 2023 19:14:28 +0700 Subject: [PATCH 10/13] fix: generic scorecard --- web/jsp/editLateDeliverable.jsp | 2 +- web/jsp/editSpecificationReview.jsp | 176 +++++++++++++++++++++------- 2 files changed, 133 insertions(+), 45 deletions(-) diff --git a/web/jsp/editLateDeliverable.jsp b/web/jsp/editLateDeliverable.jsp index bacad396a1..3d3ce348ab 100644 --- a/web/jsp/editLateDeliverable.jsp +++ b/web/jsp/editLateDeliverable.jsp @@ -311,8 +311,8 @@ - + + + From 2462398beca57d7da13bbe87370048d60e1c8b63 Mon Sep 17 00:00:00 2001 From: lunarkid Date: Mon, 30 Jan 2023 21:45:52 +0700 Subject: [PATCH 11/13] fix: iterative review breaking --- web/includes/project/project_phase_reskin.jsp | 1075 ++++++++--------- 1 file changed, 486 insertions(+), 589 deletions(-) diff --git a/web/includes/project/project_phase_reskin.jsp b/web/includes/project/project_phase_reskin.jsp index d70411381b..0cad75868a 100644 --- a/web/includes/project/project_phase_reskin.jsp +++ b/web/includes/project/project_phase_reskin.jsp @@ -123,246 +123,196 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${submission.id} - - - ${submission.id} - - - - - ${submission.id} - - - ${submission.id} - - - - () - - - - ${submission.id} - - () - - - - - ${orfn:displayDate(pageContext.request, submission.upload.creationTimestamp)} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${orfn:displayScore(pageContext.request, review.score)} - - - ${orfn:displayScore(pageContext.request, review.score)} - - - - - - - - - - - () - - - - - - - - - - - - - - - - - - - - - <or:text key='viewProjectDetails.box.Submission.icoShowMore.alt' /> - - - - - - - - - - - - - -   - - - - ${pastSubmission.id} - - - ${pastSubmission.id} - - - ${orfn:displayDate(pageContext.request, pastSubmission.creationTimestamp)} - - - - - - - - - - + + + + + + + + + + + + ${submission.id} + + + ${submission.id} + + + + + ${submission.id} + + + ${submission.id} + + + + () + + + + ${submission.id} + + () + + + + + ${orfn:displayDate(pageContext.request, submission.upload.creationTimestamp)} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${orfn:displayScore(pageContext.request, review.score)} + + + ${orfn:displayScore(pageContext.request, review.score)} + + + + + + + + + + + () + + + + + + + + + + + + + + + + + + + + + <or:text key='viewProjectDetails.box.Submission.icoShowMore.alt' /> + + + + + + + + + + + + +   + + + + ${pastSubmission.id} + + + ${pastSubmission.id} + + + ${orfn:displayDate(pageContext.request, pastSubmission.creationTimestamp)} + + + + + + + + + + - + + \ No newline at end of file From 8784818cf80c06fa3179f6b2b8fa0744b53441a8 Mon Sep 17 00:00:00 2001 From: lunarkid Date: Tue, 31 Jan 2023 14:49:08 +0700 Subject: [PATCH 12/13] fix: overlap back button --- web/css/reskin-or/reskin.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/css/reskin-or/reskin.css b/web/css/reskin-or/reskin.css index fb0cbf60fa..761057e9fb 100644 --- a/web/css/reskin-or/reskin.css +++ b/web/css/reskin-or/reskin.css @@ -770,6 +770,10 @@ table.scorecard td.headerT { text-decoration: none !important; } +.backToHome { + margin-bottom: 32px; +} + .editPaymentBtn { margin-right: 12px; } From b8453071897dd13d584901b350418678d5dda9a3 Mon Sep 17 00:00:00 2001 From: lunarkid Date: Wed, 1 Feb 2023 22:17:12 +0700 Subject: [PATCH 13/13] fix: AdvanceFailedScreeningSubmission --- ...onfirmAdvanceFailedScreeningSubmission.jsp | 103 ++++++++---------- 1 file changed, 45 insertions(+), 58 deletions(-) diff --git a/web/jsp/confirmAdvanceFailedScreeningSubmission.jsp b/web/jsp/confirmAdvanceFailedScreeningSubmission.jsp index b8118f3988..f116259d7f 100644 --- a/web/jsp/confirmAdvanceFailedScreeningSubmission.jsp +++ b/web/jsp/confirmAdvanceFailedScreeningSubmission.jsp @@ -13,59 +13,52 @@ <%@ taglib prefix="or" uri="/or-tags" %> + + + + + - - - - - + + + - - - - - + + + - - - - + + + + - -
- -
- - - - - -
+ + + +
+
+ + + +
+
- -
- - - - - - -
${rootCatalogName} - ${project.allProperties["Project Name"]} - - - ${project.allProperties["Project Version"]} - -
-

- - @@ -73,23 +66,17 @@ -
+



- -
- <or:text key='confirmAdvanceFailedScreeningSubmission.btnConfirm.alt' />  - - <or:text key='btnCancel.alt' /> + +
+ + + -

- +
- - - +
- -
- - + +