Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit 7165546

Browse files
skyhitskyhit
authored
Merge pull request #393 from liuliquan/points-prize-type
points feature should only be available when there are groups selected
2 parents 41364e6 + f405313 commit 7165546

File tree

8 files changed

+177
-146
lines changed

8 files changed

+177
-146
lines changed

‎src/web/WEB-INF/includes/launch/orderReview.jsp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<%--
22
- Author: TCSASSEMBER, Ghost_141
3-
- Version: 1.3
4-
- Copyright (C) 2010 - 2018 TopCoder Inc., All Rights Reserved.
3+
- Version: 1.3
4+
- Copyright (C) 2010 - 2018 TopCoder Inc., All Rights Reserved.
55
-
66
- Description: order review page for studio contest page.
77
-
@@ -11,9 +11,9 @@
1111
-
1212
- Version 1.2 - Release Assembly - TopCoder Cockpit Direct UI Text and Layout Bugs Termination 1.0 Change Note
1313
- - Fix multiple bugs.
14-
-
15-
- Version 1.3 - Topcoder - Support Points Prize Type For Challenges
16-
- - Add "Challenge Points" section.
14+
-
15+
- Version 1.3 - Topcoder - Support Points Prize Type For Challenges
16+
- - Add "Challenge Points" section.
1717
--%>
1818
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
1919

@@ -65,10 +65,10 @@
6565
<div class="contestDetails">
6666

6767
<h2 class="sectionHead">Challenge Details</h2>
68-
<h3>Challenge Points</h3>
69-
<table class="prizesTable" id="orPointsTable">
70-
<tbody><tr></tr></tbody>
71-
</table>
68+
<h3 class="points">Challenge Points</h3>
69+
<table class="prizesTable points" id="orPointsTable">
70+
<tbody><tr></tr></tbody>
71+
</table>
7272
<h3>Challenge Prizes</h3>
7373
<table class="prizesTable">
7474
<tr id='orPrizesTR'>
@@ -129,4 +129,4 @@
129129
<a href="javascript:;" class="specrev-goto">Go to my Spec Review</a>
130130
<p></p>
131131
<br /><br /><br />
132-
</div>
132+
</div>

‎src/web/WEB-INF/includes/launch/orderReviewAlgorithm.jsp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<%--
2-
- Author: bugbuka, TCSASSEMBER
3-
- Version: 1.1
4-
- Copyright (C) 2013 - 2018 TopCoder Inc., All Rights Reserved.
2+
- Author: bugbuka, TCSASSEMBER
3+
- Version: 1.1
4+
- Copyright (C) 2013 - 2018 TopCoder Inc., All Rights Reserved.
55
-
66
- Description: order review page for marathon match contest page.
7-
-
8-
- Version 1.1 - Topcoder - Support Points Prize Type For Challenges
9-
- - Add "Challenge Points" section.
7+
-
8+
- Version 1.1 - Topcoder - Support Points Prize Type For Challenges
9+
- - Add "Challenge Points" section.
1010
--%>
1111
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
1212

@@ -54,10 +54,10 @@
5454
<div class="contestDetails">
5555

5656
<h2 class="sectionHead">Challenge Details</h2>
57-
<h3>Challenge Points</h3>
58-
<table class="prizesTable" id="alorPointsTable">
59-
<tbody><tr></tr></tbody>
60-
</table>
57+
<h3 class="points">Challenge Points</h3>
58+
<table class="prizesTable points" id="alorPointsTable">
59+
<tbody><tr></tr></tbody>
60+
</table>
6161
<h3>Challenge Prizes</h3>
6262
<table class="prizesTable">
6363
<tr id='alorPrizesTR'>
@@ -106,4 +106,4 @@
106106
<a href="javascript:;" class="specrev-goto">Go to my Spec Review</a>
107107
<p></p>
108108
<br /><br /><br />
109-
</div>
109+
</div>

‎src/web/WEB-INF/includes/launch/orderReviewSoftware.jsp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<%--
2-
- Author: Ghost_141, GreatKevin, TCSASSEMBER
3-
- Version: 1.5
4-
- Copyright (C) 2010 - 2018 TopCoder Inc., All Rights Reserved.
2+
- Author: Ghost_141, GreatKevin, TCSASSEMBER
3+
- Version: 1.5
4+
- Copyright (C) 2010 - 2018 TopCoder Inc., All Rights Reserved.
55
-
66
- Description: order review page for software contest page.
77
-
@@ -16,9 +16,9 @@
1616
-
1717
- Version 1.4 - Module Assembly - TC Cockpit Launch F2F contest
1818
- - Mark the prizes not needed for the First2Finish contest, they can be hidden in F2F mode
19-
-
20-
- Version 1.5 - Topcoder - Support Points Prize Type For Challenges
21-
- - Add "Challenge Points" section.
19+
-
20+
- Version 1.5 - Topcoder - Support Points Prize Type For Challenges
21+
- - Add "Challenge Points" section.
2222
--%>
2323
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
2424

@@ -66,19 +66,19 @@
6666
<div class="contestDetails">
6767

6868
<h2 class="sectionHead">Challenge Details</h2>
69-
<h3>Challenge Points</h3>
70-
<table class="prizesTable" id="sworPointsTable">
71-
<tbody><tr></tr></tbody>
72-
</table>
69+
<h3 class="points">Challenge Points</h3>
70+
<table class="prizesTable points" id="sworPointsTable">
71+
<tbody><tr></tr></tbody>
72+
</table>
7373
<h3>Challenge Prizes</h3>
74-
<table class="prizesTable" id="sworPrizesTable">
75-
<tbody><tr class="hide"></tr><tr>
76-
<td>First Place Cost : $<span id="sworFirstPlaceCost"></span> </td>
77-
<td class="topcoderPrize">Second Place Cost : $<span id="sworSecondPlaceCost"></span> </td>
78-
<td class="topcoderPrize drHide">DR points : $<span id="sworDRPoints"></span> </td>
79-
<td class="topcoderPrize">Reliability Bonus Cost : $<span id="sworReliabilityBonusCost"></span> </td>
80-
<td><a href="javascript:showPage('overviewSoftwarePage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
81-
<td class="last">$<span id="sworContestPrizeCost"></span></td>
74+
<table class="prizesTable" id="sworPrizesTable">
75+
<tbody><tr class="hide"></tr><tr>
76+
<td>First Place Cost : $<span id="sworFirstPlaceCost"></span> </td>
77+
<td class="topcoderPrize">Second Place Cost : $<span id="sworSecondPlaceCost"></span> </td>
78+
<td class="topcoderPrize drHide">DR points : $<span id="sworDRPoints"></span> </td>
79+
<td class="topcoderPrize">Reliability Bonus Cost : $<span id="sworReliabilityBonusCost"></span> </td>
80+
<td><a href="javascript:showPage('overviewSoftwarePage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
81+
<td class="last">$<span id="sworContestPrizeCost"></span></td>
8282
</tr></tbody>
8383
</table>
8484
<div id="orswCheckpointPrizesDiv">
@@ -90,11 +90,11 @@
9090
<h3>Additional Costs:</h3>
9191
<table class="prizesTable">
9292
<tr>
93-
<td>Challenge Fee : $<span id="sworAdminFee"></span> </td>
94-
<td class="topcoderPrize">Specification Review : $<span id="sworSpecificationReviewPayment"></span> </td>
95-
<td>Review : $<span id="sworReviewPayment"></span> </td>
96-
<td>Copilot Fee : $<span id="sworCopilotFee"></span> </td>
97-
<td><a href="javascript:showPage('overviewSoftwarePage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
93+
<td>Challenge Fee : $<span id="sworAdminFee"></span> </td>
94+
<td class="topcoderPrize">Specification Review : $<span id="sworSpecificationReviewPayment"></span> </td>
95+
<td>Review : $<span id="sworReviewPayment"></span> </td>
96+
<td>Copilot Fee : $<span id="sworCopilotFee"></span> </td>
97+
<td><a href="javascript:showPage('overviewSoftwarePage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
9898
<td class="last">$<span id="sworAdditionalCosts"></span></td>
9999
</tr>
100100
</table>

‎src/web/css/direct/dashboard.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1992,6 +1992,7 @@ DIV.notif-div{
19921992
padding-top:10px;
19931993
padding-right:10px;
19941994
padding-bottom:20px;
1995+
background-color:#f5f5f5;
19951996
}
19961997
.detailsContent_det_prize{
19971998
padding-left:40px;
@@ -2005,6 +2006,7 @@ DIV.notif-div{
20052006
padding-top:10px;
20062007
padding-right:10px;
20072008
padding-bottom:20px;
2009+
background-color:#f5f5f5;
20082010
}
20092011

20102012
.detailsContent_det_round{
@@ -2020,7 +2022,6 @@ DIV.notif-div{
20202022
padding-top:10px;
20212023
padding-right:10px;
20222024
padding-bottom:20px;
2023-
background-color:#f5f5f5;
20242025
}
20252026

20262027
.detailsContent_det_round_edit{

‎src/web/css/direct/screen.css‎

Lines changed: 53 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
*
3939
* TC Direct Rebranding Assembly Dashboard and Admin related pages
4040
* - Rebranding the dashboard and admin realted pages
41-
*
42-
* - Topcoder - Support Points Prize Type For Challenges
43-
* - Add points related css
41+
*
42+
* - Topcoder - Support Points Prize Type For Challenges
43+
* - Add points related css
4444
*/
4545
html, body {
4646
width: 100%;
@@ -265,11 +265,11 @@ a:hover, a:active, a:focus, a:active {
265265
/*margin-top:10px;*/
266266
}
267267

268-
.contest_point_edit {
269-
border: #F00 solid 1px;
270-
/*margin-top:10px;*/
271-
}
272-
268+
.contest_point_edit {
269+
border: #F00 solid 1px;
270+
/*margin-top:10px;*/
271+
}
272+
273273
.contest_round {
274274
/*margin-top:10px;*/
275275
}
@@ -355,14 +355,14 @@ a:hover, a:active, a:focus, a:active {
355355

356356
}
357357

358-
.cancel_text_point {
359-
color: #616161;
360-
text-decoration: underline;
361-
padding-left: 10px;
362-
float: right;
363-
364-
}
365-
358+
.cancel_text_point {
359+
color: #616161;
360+
text-decoration: underline;
361+
padding-left: 10px;
362+
float: right;
363+
364+
}
365+
366366
.cancel_text_round {
367367
color: #616161;
368368
text-decoration: underline;
@@ -475,14 +475,18 @@ A.delete {
475475

476476
}
477477

478-
.no_details .caption_det_point {
478+
.no_details .caption_det_point {
479479
/* help popup titles */
480480
/*background: url(../../images/title_bg.png) repeat-x;*/
481-
}
482481

483-
.no_details .caption_det_files {
484-
/* help popup titles */
485-
/*background: url(../../images/title_bg.png) repeat-x;*/
482+
background-color: #f5f5f5;
483+
}
484+
485+
.no_details .caption_det_files {
486+
/* help popup titles */
487+
/*background: url(../../images/title_bg.png) repeat-x;*/
488+
489+
background-color: #f5f5f5;
486490
}
487491

488492
.no_details .caption_det_round {
@@ -494,7 +498,6 @@ A.delete {
494498
.no_details .caption_det_spec {
495499
/* help popup titles */
496500
/*background: url(../../images/title_bg.png) repeat-x;*/
497-
background-color: #f5f5f5;
498501
}
499502

500503
.details .caption .captionLeft {
@@ -521,10 +524,10 @@ A.delete {
521524
height: 35px;
522525
}
523526

524-
.no_details .caption_det_point .captionInner {
525-
height: 35px;
526-
}
527-
527+
.no_details .caption_det_point .captionInner {
528+
height: 35px;
529+
}
530+
528531
.no_details .caption_det_type_edit .captionInner {
529532
height: 35px;
530533
}
@@ -533,10 +536,10 @@ A.delete {
533536
height: 35px;
534537
}
535538

536-
.no_details .caption_det_point_edit .captionInner {
537-
height: 35px;
538-
}
539-
539+
.no_details .caption_det_point_edit .captionInner {
540+
height: 35px;
541+
}
542+
540543
.no_details .caption_det_round .captionInner {
541544
height: 35px;
542545
}
@@ -590,16 +593,16 @@ A.delete {
590593

591594
}
592595

593-
.no_details .caption_det_point .captionInner H2 {
594-
margin: 0;
595-
padding: 0;
596-
font-family: "Source Sans Pro", Arial, Helvetica, sans-serif;
597-
font-size: 16px;
598-
padding-top: 8px;
599-
padding-left: 10px;
600-
601-
}
602-
596+
.no_details .caption_det_point .captionInner H2 {
597+
margin: 0;
598+
padding: 0;
599+
font-family: "Source Sans Pro", Arial, Helvetica, sans-serif;
600+
font-size: 16px;
601+
padding-top: 8px;
602+
padding-left: 10px;
603+
604+
}
605+
603606
.no_details .caption_det_round .captionInner H2 {
604607
margin: 0;
605608
padding: 0;
@@ -650,16 +653,16 @@ A.delete {
650653

651654
}
652655

653-
.no_details .caption_det_point_edit .captionInner H2 {
654-
margin: 0;
655-
padding: 0;
656-
font-family: "Source Sans Pro", Arial, Helvetica, sans-serif;
657-
font-size: 16px;
658-
padding-top: 8px;
659-
padding-left: 10px;
660-
661-
}
662-
656+
.no_details .caption_det_point_edit .captionInner H2 {
657+
margin: 0;
658+
padding: 0;
659+
font-family: "Source Sans Pro", Arial, Helvetica, sans-serif;
660+
font-size: 16px;
661+
padding-top: 8px;
662+
padding-left: 10px;
663+
664+
}
665+
663666
.no_details .caption_det_round_edit .captionInner H2 {
664667
margin: 0;
665668
padding: 0;

0 commit comments

Comments
 (0)