Skip to content

Commit 7fc5707

Browse files
dedywahyudidedywahyudi
committed
fix: more than 1 submission
1 parent 7594b37 commit 7fc5707

File tree

4 files changed

+41
-32
lines changed

4 files changed

+41
-32
lines changed

‎src/main/resources/MessageResources.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,9 +548,9 @@ viewProjectDetails.box.Submission.ReviewResult=Review{0} Result
548548
viewProjectDetails.box.Submission.Download=Download Submission
549549
viewProjectDetails.box.Submission.Previous.UploadID=Previous upload:
550550
viewProjectDetails.box.Submission.icoShowMore.alt=View Previous Submissions
551-
viewProjectDetails.box.Submission.icoShowMore.img=/i/or/plus.gif
551+
viewProjectDetails.box.Submission.icoShowMore.img=/i/reskin/showMore.svg
552552
viewProjectDetails.box.Submission.icoShowLess.alt=
553-
viewProjectDetails.box.Submission.icoShowLess.img=/i/or/minus.gif
553+
viewProjectDetails.box.Submission.icoShowLess.img=/i/reskin/showMore.svg
554554
viewProjectDetails.box.Submission.icoTrash.alt=Remove this Submission
555555
viewProjectDetails.box.Submission.icoTrash.img=/i/or/icon_trash.gif
556556
viewProjectDetails.box.Submission.icoPassed.alt=Passed

‎web/css/reskin-or/reskin.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ body {
143143
background-color: var(--black-10);
144144
position: fixed;
145145
top: var(--header-height);
146-
z-index: 999;
146+
z-index: 998;
147147
font-family: Barlow, sans-serif;
148148
text-transform: uppercase;
149149
font-weight: 600;
@@ -2613,4 +2613,8 @@ td.resourcesTable__empty {
26132613
width: 100%;
26142614
z-index: 999;
26152615
bottom: 0;
2616+
}
2617+
2618+
.checkPoint__chevron {
2619+
margin-left: 29px
26162620
}

‎web/i/reskin/showMore.svg

Lines changed: 3 additions & 0 deletions
Loading

‎web/includes/project/project_phase_reskin.jsp

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -981,15 +981,6 @@
981981
<tr>
982982
<%-- Checkpoint Submission ID --%>
983983
<td nowrap="nowrap">
984-
<c:if test="${not empty prevCheckpointSubmissions}">
985-
<a id="PrevSubm${submBoxIdx}_${submissionStatus.index}_plus" href="javascript:void(0)" onClick='return expandSubmissions(${submBoxIdx}, ${submissionStatus.index}, this)'><img
986-
class="Outline" border="0" src="<or:text key='viewProjectDetails.box.Submission.icoShowMore.img' />" alt="<or:text key='viewProjectDetails.box.Submission.icoShowMore.alt' />" /></a><a
987-
id="PrevSubm${submBoxIdx}_${submissionStatus.index}_minus" href="javascript:void(0)" onClick='return collapseSubmissions(${submBoxIdx}, ${submissionStatus.index}, this)' style="display:none;"><img
988-
class="Outline" border="0" src="<or:text key='viewProjectDetails.box.Submission.icoShowLess.img' />" alt="<or:text key='viewProjectDetails.box.Submission.icoShowLess.alt' />" /></a>
989-
</c:if>
990-
<c:if test="${(empty prevCheckpointSubmissions) and (not empty prevCheckpointSubm)}">
991-
<img class="Outline" border="0" src="<or:text key='viewProjectDetails.box.Submission.icoShowMore.img' />" style="display:none;" />
992-
</c:if>
993984
<c:set var="placement" value="" />
994985
<c:if test="${not empty submission}">
995986
<c:set var="placement" value='${submission.placement}' />
@@ -1229,40 +1220,51 @@
12291220
<%-- Checkpoint Review Results --%>
12301221
<td>
12311222
<c:if test="${not failedScreening}">
1232-
1233-
<c:choose>
1234-
<c:when test="${not empty review and review.committed}">
1235-
<c:choose>
1236-
<c:when test="${isSubmitter and not group.checkpointReviewFinished}">
1237-
<!--@-->
1238-
</c:when>
1239-
<c:when test="${not failedReview}">
1240-
<or:text key="viewProjectDetails.box.CheckpointReview.Passed"/>
1241-
</c:when>
1242-
<c:otherwise>
1243-
<or:text key="viewProjectDetails.box.CheckpointReview.Failed"/>
1244-
</c:otherwise>
1245-
</c:choose>
1246-
</c:when>
1247-
<c:otherwise><!--@--></c:otherwise>
1248-
</c:choose>
1223+
<c:choose>
1224+
<c:when test="${not empty review and review.committed}">
1225+
<c:choose>
1226+
<c:when test="${isSubmitter and not group.checkpointReviewFinished}">
1227+
<!--@-->
1228+
</c:when>
1229+
<c:when test="${not failedReview}">
1230+
<or:text key="viewProjectDetails.box.CheckpointReview.Passed"/>
1231+
</c:when>
1232+
<c:otherwise>
1233+
<or:text key="viewProjectDetails.box.CheckpointReview.Failed"/>
1234+
</c:otherwise>
1235+
</c:choose>
1236+
</c:when>
1237+
<c:otherwise><!--@--></c:otherwise>
1238+
</c:choose>
1239+
</c:if>
1240+
<c:if test="${not empty prevCheckpointSubmissions}">
1241+
<a id="PrevSubm${submBoxIdx}_${submissionStatus.index}_plus" href="javascript:void(0)" onClick='return expandSubmissions(${submBoxIdx}, ${submissionStatus.index}, this)'><img
1242+
class="Outline checkPoint__chevron" border="0" src="<or:text key='viewProjectDetails.box.Submission.icoShowMore.img' />" alt="<or:text key='viewProjectDetails.box.Submission.icoShowMore.alt' />" /></a><a
1243+
id="PrevSubm${submBoxIdx}_${submissionStatus.index}_minus" href="javascript:void(0)" onClick='return collapseSubmissions(${submBoxIdx}, ${submissionStatus.index}, this)' style="display:none;"><img
1244+
class="Outline checkPoint__chevron" border="0" src="<or:text key='viewProjectDetails.box.Submission.icoShowLess.img' />" alt="<or:text key='viewProjectDetails.box.Submission.icoShowLess.alt' />" /></a>
1245+
</c:if>
1246+
<c:if test="${(empty prevCheckpointSubmissions) and (not empty prevCheckpointSubm)}">
1247+
<img class="Outline" border="0" src="<or:text key='viewProjectDetails.box.Submission.icoShowMore.img' />" style="display:none;" />
12491248
</c:if>
12501249
</td>
12511250
</tr>
12521251

12531252

12541253
<c:forEach items="${prevCheckpointSubmissions}" var="pastSubmission" varStatus="pastSubmissionStatus">
12551254
<tr id="PrevSubm${submBoxIdx}_${submissionStatus.index}" style="display:none;">
1256-
<td colspan="2" nowrap="nowrap">
1255+
<td colspan="1" nowrap="nowrap">
12571256
<img border="0" src="<or:text key='viewProjectDetails.box.Submission.icoShowMore.img' />" class="Outline" style="display:none;" />
1257+
<c:if test="${(not empty placement) and (not failedReview)}">
1258+
<span class="phasesTable__placements">&nbsp;</span>
1259+
</c:if>
12581260
<c:if test="${project.projectCategory.projectType.id ne 3}">
12591261
<a href="<or:url value='/actions/DownloadContestSubmission?uid=${pastSubmission.id}' />"
1260-
title="<or:text key='viewProjectDetails.box.Submission.Previous.UploadID' />">${pastSubmission.id}</a>
1262+
title="<or:text key='viewProjectDetails.box.Submission.Previous.UploadID' />">${pastSubmission.id}</a>
12611263
</c:if>
12621264
<c:if test="${project.projectCategory.projectType.id eq 3}">
12631265
<!-- <a href="http://<%=ApplicationServer.STUDIO_SERVER_NAME%>/?module=DownloadSubmission&sbmid=${pastSubmission.id}&sbt=original" title="<or:text key='viewProjectDetails.box.Submission.Previous.UploadID' />">${pastSubmission.id}</a> -->
12641266
<a href="<or:url value='/actions/DownloadContestSubmission?uid=${pastSubmission.id}' />"
1265-
title="<or:text key='viewProjectDetails.box.Submission.Previous.UploadID' />">${pastSubmission.id}</a>
1267+
title="<or:text key='viewProjectDetails.box.Submission.Previous.UploadID' />">${pastSubmission.id}</a>
12661268
</c:if>
12671269
</td>
12681270
<td>${orfn:displayDate(pageContext.request, pastSubmission.creationTimestamp)}</td>

0 commit comments

Comments
 (0)