Skip to content

Commit f847aad

Browse files
dedywahyudidedywahyudi
committed
fix: task 2
1 parent 49687fd commit f847aad

File tree

8 files changed

+170
-84
lines changed

8 files changed

+170
-84
lines changed

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

Lines changed: 53 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,6 @@ table.scorecard td.reviewerResp input {
874874
border-top-right-radius: 8px;
875875
}
876876

877-
.myInfoTable__body td,
878877
.timelineTable__body td,
879878
.phasesTable__body td,
880879
.resourcesTable__body td,
@@ -891,6 +890,23 @@ table.scorecard td.reviewerResp input {
891890
border-top: 2px solid var(--black-10);
892891
}
893892

893+
.myInfoTable__body td {
894+
padding: 18px 16px 16px 16px ;
895+
vertical-align: top;
896+
font-family: 'Roboto';
897+
font-style: normal;
898+
font-weight: 500;
899+
font-size: 14px;
900+
line-height: 22px;
901+
border-top: 2px solid var(--black-10);
902+
color: var(--black-100);
903+
}
904+
905+
.myInfoTable__body .roles__info td {
906+
padding: 0 16px 12px 0;
907+
border: none;
908+
}
909+
894910
.projectList__inner {
895911
margin-bottom: 32px;
896912
}
@@ -919,6 +935,7 @@ table.scorecard td.reviewerResp input {
919935
display: flex;
920936
flex-direction: column;
921937
width: 100%;
938+
gap: 8px;
922939
white-space: normal !important;
923940
}
924941

@@ -927,7 +944,7 @@ table.scorecard td.reviewerResp input {
927944
font-style: normal;
928945
font-weight: 700;
929946
font-size: 12px;
930-
line-height: 22px;
947+
line-height: 16px;
931948
text-transform: uppercase;
932949
color: var(--black-60);
933950
text-align: left;
@@ -989,6 +1006,28 @@ table.scorecard td.reviewerResp input {
9891006
width: unset;
9901007
}
9911008

1009+
.reviewers__section .value,
1010+
.reviewers__section .reviewer {
1011+
padding: 0 16px 16px 16px;
1012+
font-family: 'Roboto';
1013+
font-weight: 500;
1014+
font-size: 14px;
1015+
color: var(--black-100);
1016+
line-height: 22px;
1017+
}
1018+
1019+
.reviewer p {
1020+
font-family: 'Roboto';
1021+
font-weight: 500;
1022+
font-size: 14px;
1023+
line-height: 22px;
1024+
margin: 0;
1025+
}
1026+
1027+
.reviewer span {
1028+
margin-right: 2px;
1029+
}
1030+
9921031
.myInfoTable a,
9931032
.timelineTable a,
9941033
.timelineTable a:hover,
@@ -1378,7 +1417,7 @@ td.resourcesTable__empty {
13781417
line-height: 22px;
13791418
padding: 0;
13801419
margin-bottom: 4px;
1381-
color: var(--black-100);
1420+
color: #7f7f7f;
13821421
border: none;
13831422
resize: none;
13841423
width: 100%;
@@ -1399,13 +1438,18 @@ td.resourcesTable__empty {
13991438
border-color: var(--turq-160);
14001439
}
14011440

1402-
.support__contact .support__inputText:focus-within ,
1441+
.support__contact .support__inputText:focus-within,
14031442
.support__message:focus-within {
14041443
border-width: 2px;
14051444
padding: 7px 9px 0;
14061445
border-color: var(--turq-160);
14071446
}
14081447

1448+
.support__contact .support__inputText:focus-within input,
1449+
.support__message:focus-within textarea {
1450+
color: var(--black-100);
1451+
}
1452+
14091453
.lateDeliverables__inputText input:focus,
14101454
.support__inputText input:focus,
14111455
.support__message textarea:focus,
@@ -1442,15 +1486,12 @@ td.resourcesTable__empty {
14421486
letter-spacing: 0.008em;
14431487
text-transform: uppercase;
14441488
cursor: pointer;
1445-
14461489
display: flex;
14471490
justify-content: center;
14481491
align-items: center;
14491492
padding: 12px 24px;
1450-
14511493
width: 110px;
14521494
height: 48px;
1453-
14541495
border-radius: 50px;
14551496
text-decoration: none !important;
14561497
}
@@ -1866,13 +1907,14 @@ td.resourcesTable__empty {
18661907
align-items: center;
18671908
transition: opacity 1s ease;
18681909
opacity: 1;
1910+
visibility: hidden;
18691911
z-index: 99999;
18701912
}
18711913

18721914
.spinner {
18731915
position: absolute;
1874-
width: 60px;
1875-
height: 60px;
1916+
width: 100px;
1917+
height: 100px;
18761918
margin: auto;
18771919
border: 4px solid #2196f3;
18781920
border-radius: 100%;
@@ -1897,13 +1939,9 @@ td.resourcesTable__empty {
18971939
}
18981940
}
18991941

1900-
.loading-spinner.hide {
1901-
opacity: 0;
1942+
.loading-spinner.isLoading {
1943+
visibility: visible;
19021944
pointer-events: none;
1903-
}
1904-
1905-
.loading-spinner.show {
1906-
opacity: 1;
19071945
}
19081946

19091947

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

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#toast {
22
position: fixed;
3-
top: 32px;
4-
right: 32px;
3+
top: 22px;
4+
right: 22px;
55
z-index: 999999;
66
}
77

@@ -16,22 +16,46 @@
1616
font-family: sans-serif;
1717
box-shadow: 0 5px 8px rgba(0, 0, 0, 0.08);
1818
transition: all linear 0.3s;
19+
min-height: 64px;
20+
max-height: 800px;
21+
}
22+
23+
.t-progress-bar {
24+
display: block;
25+
position: absolute;
26+
bottom: 0;
27+
left: 0;
28+
height: 6px;
29+
width: 100%;
30+
border-radius: 0 0 0 0.5rem;
31+
background-color: #07bc0c;
32+
animation: progress-bar-animation linear forwards var(--toast-duration, 4000ms);
33+
transform-origin: left;
1934
}
2035

2136
@keyframes slideInLeft {
2237
from {
2338
opacity: 0;
24-
transform: translateX(calc(100% + 32px));
39+
transform: translateX(calc(100% + 22px));
2540
}
2641
to {
2742
opacity: 1;
2843
transform: translateX(0);
2944
}
3045
}
3146

32-
@keyframes fadeOut {
47+
@keyframes slideOut {
48+
0% {
49+
transform: translateX(0%);
50+
}
51+
100% {
52+
transform: translateX(calc(100% + 22px));
53+
}
54+
}
55+
56+
@keyframes progress-bar-animation {
3357
to {
34-
opacity: 0;
58+
transform: scaleX(0);
3559
}
3660
}
3761

@@ -80,6 +104,8 @@
80104
flex: 1 1 auto;
81105
margin: auto 0;
82106
padding: 6px;
107+
margin-top: 10px;
108+
margin-bottom: 10px;
83109
}
84110

85111
.toast__title {
@@ -91,6 +117,7 @@
91117
.toast__msg {
92118
font-size: 16px;
93119
font-weight: 500;
120+
margin: 0;
94121
}
95122

96123
.toast__close {

‎web/includes/inc_footer_reskin.jsp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
trigger.addEventListener("click", function (event) {
1111
event.preventDefault();
1212
const modal = document.getElementById(trigger.dataset.modal);
13+
initValidate();
1314
modal.classList.add("show");
1415
const exits = modal.querySelectorAll(".modal__exit");
1516
exits.forEach(function (exit) {
@@ -56,7 +57,7 @@
5657
</div>
5758
</div>
5859
</footer>
59-
<div class="loading-spinner hide">
60+
<div class="loading-spinner">
6061
<div class="spinner"></div>
6162
</div>
6263

‎web/includes/project/project_list_reskin.jsp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@
112112
<c:set var="phase" value="${phases[idxrProject.index]}" />
113113
<c:if test="${!(empty phase)}">
114114
<td nowrap="nowrap"><or:text key="ProjectPhase.${fn:replace(phase[0].phaseType.name, ' ', '')}" /></td>
115-
<td nowrap="nowrap">${orfn:displayDateBr(pageContext.request, phaseEndDates[idxrProject.index])}</td>
116-
<td nowrap="nowrap">${orfn:displayDateBr(pageContext.request, projectEndDates[idxrProject.index])}</td>
115+
<td nowrap="nowrap">${orfn:displayDate(pageContext.request, phaseEndDates[idxrProject.index])}</td>
116+
<td nowrap="nowrap">${orfn:displayDate(pageContext.request, projectEndDates[idxrProject.index])}</td>
117117
<c:if test="${isMyProjects}">
118-
<td nowrap="nowrap">${myDeliverables[idxrProject.index]}</td>
118+
<td nowrap="nowrap">${not empty myDeliverables[idxrProject.index] ? myDeliverables[idxrProject.index] : '-'}</td>
119119
</c:if>
120120
</c:if>
121121
<c:if test="${empty phase}">

‎web/includes/project/project_myrole_reskin.jsp

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,19 @@
2525
</thead>
2626
<tbody class="myInfoTable__body">
2727
<tr>
28-
<td>
29-
<c:forEach items="${requestScope.myPayment}" var="rolePayment">
30-
<c:set var="roleName" value="${rolePayment.key.name}"/>
31-
<c:out value="${roleName}"/>
32-
</c:forEach>
28+
<td align="left">
29+
<table cellpadding="0" cellspacing="0" border="0">
30+
<tbody class="roles__info">
31+
<c:forEach items="${requestScope.myPayment}" var="rolePayment">
32+
<c:set var="roleName" value="${rolePayment.key.name}"/>
33+
<tr>
34+
<td nowrap="nowrap">
35+
<c:out value="${roleName}"/>
36+
</td>
37+
</tr>
38+
</c:forEach>
39+
</tbody>
40+
</table>
3341
</td>
3442

3543
<td nowrap="nowrap">

‎web/includes/project/project_phase_reskin.jsp

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,11 @@
362362
<c:if test="${not isAllowedToEditHisReviews}">
363363
<c:set var="colSpan" value="${colSpan + 1}" />
364364
</c:if>
365-
<tr>
365+
<tr class="reviewers__section">
366+
<td class="value" colspan="${(isAllowedToEditHisReviews) ? 2 : 3}"><!-- @ --></td>
366367
<c:forEach items="${group.reviewers}" var="reviewer">
367-
<td colspan="2" nowrap="nowrap">
368-
<b><or:text key='ResourceRole.${fn:replace(reviewer.resourceRole.name, " ", "")}' />:</b>
368+
<td class="reviewer" colspan="2" nowrap="nowrap">
369+
<or:text key='ResourceRole.${fn:replace(reviewer.resourceRole.name, " ", "")}' />:
369370
<tc-webtag:handle coderId='${reviewer.allProperties["External Reference ID"]}' context="${orfn:getHandlerContext(pageContext.request)}" />
370371
<c:set var="testCase" value="" />
371372
<c:forEach items="${group.testCases}" var="curTestCase">
@@ -393,19 +394,17 @@
393394
</td>
394395
</c:forEach>
395396
</tr>
396-
<thead class="phasesTable__header">
397-
<tr>
398-
<th nowrap="nowrap"><or:text key="viewProjectDetails.box.Submission.ID" /></th>
399-
<th><or:text key="viewProjectDetails.box.Review.Date" arg0="${group.groupIndex}" /></th>
400-
<c:if test="${isAllowedToEditHisReviews != true}">
401-
<th><or:text key="viewProjectDetails.box.Review.Score" arg0="${group.groupIndex}" /></th>
402-
</c:if>
403-
<c:forEach items="${group.reviewers}" var="reviewer">
404-
<th><or:text key="viewProjectDetails.box.Review.Score.short" /></th>
405-
<th><or:text key="viewProjectDetails.box.Review.Appeals" /></th>
406-
</c:forEach>
407-
</tr>
408-
</thead>
397+
<tr class="phasesTable__header">
398+
<th nowrap="nowrap"><or:text key="viewProjectDetails.box.Submission.ID" /></th>
399+
<th><or:text key="viewProjectDetails.box.Review.Date" arg0="${group.groupIndex}" /></th>
400+
<c:if test="${isAllowedToEditHisReviews != true}">
401+
<th><or:text key="viewProjectDetails.box.Review.Score" arg0="${group.groupIndex}" /></th>
402+
</c:if>
403+
<c:forEach items="${group.reviewers}" var="reviewer">
404+
<th><or:text key="viewProjectDetails.box.Review.Score.short" /></th>
405+
<th><or:text key="viewProjectDetails.box.Review.Appeals" /></th>
406+
</c:forEach>
407+
</tr>
409408
<tbody class="phasesTable__body">
410409
<c:if test="${empty group.submissions}">
411410
<tr>
@@ -475,7 +474,7 @@
475474
(<tc-webtag:handle coderId='${submitter.allProperties["External Reference ID"]}' context="${orfn:getHandlerContext(pageContext.request)}" />)
476475
</c:if>
477476
</td>
478-
<td>${orfn:displayDateBr(pageContext.request, group.reviewDates[submissionStatus.index])}</td>
477+
<td>${orfn:displayDate(pageContext.request, group.reviewDates[submissionStatus.index])}</td>
479478
<c:if test="${not isAllowedToEditHisReviews}">
480479
<c:if test="${not empty submission}">
481480
<c:set var="finalScore" value='${submission.finalScore}' />

0 commit comments

Comments
 (0)