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

Commit a1d1d06

Browse files
deedeedeedee
committed
merge with latest dev
2 parents 5a8d6bc + 78b1148 commit a1d1d06

File tree

16 files changed

+221
-76
lines changed

16 files changed

+221
-76
lines changed

‎src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,12 +529,12 @@ public class SaveDraftContestAction extends ContestAction {
529529
* Checkpoint date of the contest if any.
530530
* </p>
531531
*/
532-
private Date checkpointDate = new Date();
532+
private Date checkpointDate = null;
533533

534534
/**
535535
* The registration end date
536536
*/
537-
private Date regEndDate = new Date();
537+
private Date regEndDate = null;
538538

539539
/**
540540
* <p>

‎src/web/WEB-INF/includes/contest/editTab.jsp‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,20 @@
803803

804804
<div class="bottom_spec">
805805
</div>
806+
807+
<div>
808+
<p class="det_font">
809+
<span class="name"><strong>Environment </strong></span>
810+
<br />
811+
<span class="small_info_spec" id="rswEnvironment"></span>
812+
<br /><br/>
813+
<span class="name"><strong>Code repo </strong> </span>
814+
<br />
815+
<span class="small_info_spec" id="rswRepo"></span>
816+
</p>
817+
<div class="bottom_spec"></div>
818+
</div>
819+
806820
<p class="det_font">
807821
<span class="name"><strong>Final Deliverables</strong></span>
808822
<br />
@@ -869,6 +883,12 @@
869883

870884
</div>
871885
<!-- end .guidelines -->
886+
<div class="envRepo">
887+
<h3>Environment</h3>
888+
<input class="environmentEdit" name="environmentEdit" type="text" maxlength="500"/>
889+
<h3>Code Repo</h3>
890+
<input type="text" class="repoEdit" maxlength="500" />
891+
</div>
872892
</div> <!-- end .contestDetail -->
873893
<div class="deliverables">
874894
<h3><span class="icon">Final Deliverables:</span><a href="javascript:;" class="helpIcon"><span class="hide">Help</span></a></h3>

‎src/web/WEB-INF/includes/contest/editTabMarathon.jsp‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@
260260
<span class="name fixWidthName" title="Enter challenge groups"><strong>Group(s):</strong></span>
261261
<div id="groupDiv"><div id="groups"></div></div>
262262
</div>
263-
<br/><br/>
263+
<br /><br />
264264
<span class="name fixWidthName"><strong>Created By</strong></span>
265265
<span class ='small_info_spec' id="challegneCreatorLabel"></span>
266266
<br/>
@@ -529,6 +529,19 @@
529529
</span>
530530
</div>
531531
</p>
532+
<div class="bottom_spec"></div>
533+
<div>
534+
<p class="det_font">
535+
<span class="name"><strong>Environment </strong></span>
536+
<br />
537+
<span class="small_info_spec" id="rswEnvironment"></span>
538+
<br /><br/>
539+
<span class="name"><strong>Code repo </strong> </span>
540+
<br />
541+
<span class="small_info_spec" id="rswRepo"></span>
542+
</p>
543+
<div class="bottom_spec"></div>
544+
</div>
532545
</div><!-- End .detailsContent -->
533546
</div><!-- End .details -->
534547
<!-- END Spec Display -->
@@ -576,6 +589,12 @@
576589

577590
</div>
578591
<!-- end .guidelines -->
592+
<div class="envRepo">
593+
<h3>Environment</h3>
594+
<input class="environmentEdit" name="environmentEdit" type="text" maxlength="500"/>
595+
<h3>Code Repo</h3>
596+
<input type="text" class="repoEdit" maxlength="500" />
597+
</div>
579598
</div> <!-- end .contestDetail -->
580599

581600
</div> <!-- End .launchContestOut -->

‎src/web/WEB-INF/includes/contest/editTabSoftware.jsp‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@
352352
</div>
353353
</div>
354354
<div class="ms-group-display">
355-
<span class="name fixWidthName" title="Enter challenge groups"><strong>Group(s):</strong></span>
355+
<span class="name fixWidthName" title="Enter challenge groups"><strong>Group(s)</strong></span>
356356
<div class="ms-group-div"><div id="groups"></div></div>
357357
</div>
358358
<br/>
@@ -838,7 +838,20 @@
838838

839839
<div class="bottom_spec">
840840
</div>
841-
</div> <!-- End .component -->
841+
</div>
842+
<!-- End .component -->
843+
<div>
844+
<p class="det_font">
845+
<span class="name"><strong>Environment </strong></span>
846+
<br />
847+
<span class="small_info_spec" id="rswEnvironment"></span>
848+
<br /><br/>
849+
<span class="name"><strong>Code repo </strong> </span>
850+
<br />
851+
<span class="small_info_spec" id="rswRepo"></span>
852+
</p>
853+
<div class="bottom_spec"></div>
854+
</div>
842855
</div><!-- End .detailsContent -->
843856
</div><!-- End .details -->
844857
<!-- END Spec Display -->
@@ -944,6 +957,12 @@
944957
</div> <!-- end of prizesInner_tech -->
945958
</div>
946959
</s:if>
960+
<div class="envRepo">
961+
<h3>Environment</h3>
962+
<input class="environmentEdit" name="environmentEdit" type="text" maxlength="500"/>
963+
<h3>Code Repo</h3>
964+
<input type="text" class="repoEdit" maxlength="500" />
965+
</div>
947966
</div> <!-- end .contestDetail -->
948967
</div> <!-- End .launchContestOut -->
949968

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,17 @@
6868
</div>
6969
</div>
7070
<!-- end round 2 information -->
71+
<!-- Environment -->
72+
<div class="prizes">
73+
<h3>Environment :</h3>
74+
<input class="environmentEdit text" name="environmentEdit" type="text" maxlength="500"/>
75+
</div>
76+
77+
<!-- repo -->
78+
<div class="prizes">
79+
<h3>Code Repo :</h3>
80+
<input class="repoEdit text" name="repo" type="text" maxlength="500"/>
81+
</div>
7182
<!-- upload -->
7283
<div id="uploadSection">
7384

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,17 @@
4646
</div>
4747
</div>
4848
<!-- end Match Rules -->
49+
<!-- Environment -->
50+
<div class="prizes">
51+
<h3>Environment :</h3>
52+
<input class="environmentEdit text" name="environmentEdit" type="text" maxlength="500"/>
53+
</div>
54+
55+
<!-- repo -->
56+
<div class="prizes">
57+
<h3>Code Repo :</h3>
58+
<input class="repoEdit text" name="repo" type="text" maxlength="500"/>
59+
</div>
4960
<!-- upload -->
5061
<div id="alUploadSection">
5162
<h3>File Upload (20MB maximum):</h3>

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,17 @@
109109
</select>
110110
</div> <!-- end of prizesInner_tech -->
111111
</div>
112+
<!-- Environment -->
113+
<div class="prizes">
114+
<h3>Environment :</h3>
115+
<input class="environmentEdit text" name="environmentEdit" type="text" maxlength="500"/>
116+
</div>
117+
118+
<!-- repo -->
119+
<div class="prizes">
120+
<h3>Code Repo :</h3>
121+
<input class="repoEdit text" name="repo" type="text" maxlength="500"/>
122+
</div>
112123
<!-- Contest Detail -->
113124

114125
<!-- upload -->

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@
7979

8080
<dt class="rMultiInfo">Round Two Information :</dt>
8181
<dd class="rMultiInfo"><span id="rRound2Info"></span><a href="javascript: showPage('overviewPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
82+
83+
<dt>Environment :</dt>
84+
<dd class="rEnvironment"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
85+
86+
<dt>Code Repo :</dt>
87+
<dd class="rRepo"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
8288
</dl>
8389
</div>
8490
<!-- end .contentList -->

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@
6262

6363
<dt>Match Rules :</dt>
6464
<dd><span id="ralMatchRules"></span><a href="javascript: showPage('overviewAlgorithmPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
65+
66+
<dt>Environment :</dt>
67+
<dd class="rEnvironment"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
68+
69+
<dt>Code Repo :</dt>
70+
<dd class="rRepo"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
6571
</dl>
6672
</div>
6773
<!-- end .contentList -->

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@
8383

8484
<dt>Technologies :</dt>
8585
<dd id="rTechnologies"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
86+
87+
<dt>Environment :</dt>
88+
<dd class="rEnvironment"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
89+
90+
<dt>Code Repo :</dt>
91+
<dd class="rRepo"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
8692
</dl>
8793
</div>
8894
<!-- end .contentList -->

0 commit comments

Comments
 (0)