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

Commit 78b1148

Browse files
skyhitskyhit
authored
Merge pull request #323 from deedee/new_fields_challenge_page
move env and repo fields to overview page
2 parents 7be4237 + a569736 commit 78b1148

File tree

16 files changed

+215
-163
lines changed

16 files changed

+215
-163
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
@@ -518,12 +518,12 @@ public class SaveDraftContestAction extends ContestAction {
518518
* Checkpoint date of the contest if any.
519519
* </p>
520520
*/
521-
private Date checkpointDate = new Date();
521+
private Date checkpointDate = null;
522522

523523
/**
524524
* The registration end date
525525
*/
526-
private Date regEndDate = new Date();
526+
private Date regEndDate = null;
527527

528528
/**
529529
* <p>

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

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -159,18 +159,6 @@
159159
<td class="sec_tab_type"><strong>: <span id="rswGroups"></span></strong></td>
160160
</tr>
161161
<tr></tr>
162-
163-
<tr>
164-
<td class="first_tab_type"><strong>Environment :</strong></td>
165-
<td class="sec_tab_type"><strong>: <span id="rswEnvironment"></span></strong></td>
166-
</tr>
167-
<tr></tr>
168-
<tr>
169-
<td class="first_tab_type"><strong>Code Repo :</strong></td>
170-
<td class="sec_tab_type"><strong>: <span id="rswRepo"></span></strong></td>
171-
</tr>
172-
<tr></tr>
173-
174162
<tr>
175163
<td class="first_tab_type"><strong>Created By</strong></td>
176164
<td class="sec_tab_type"><strong>: <span id="rChallengeCreator"></span></strong></td>
@@ -345,20 +333,6 @@
345333
<div class="ms-group-div"><div id="groups"></div></div>
346334
</div>
347335
<br/><br/>
348-
349-
350-
<span class="name fixWidthName"><strong>Environment</strong></span>
351-
<span class="value">
352-
<input type="text" class="bigin" id="environmentEdit" />
353-
</span>
354-
<br /><br />
355-
356-
<span class="name fixWidthName"><strong>Code Repo</strong></span>
357-
<span class="value">
358-
<input type="text" class="bigin" id="repoEdit" />
359-
</span>
360-
<br /><br />
361-
362336
<span class="name fixWidthName"><strong>Created By</strong></span>
363337
<span class ='small_info_spec' id="challegneCreatorLabel"></span>
364338
</div>
@@ -829,6 +803,20 @@
829803

830804
<div class="bottom_spec">
831805
</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+
832820
<p class="det_font">
833821
<span class="name"><strong>Final Deliverables</strong></span>
834822
<br />
@@ -895,6 +883,12 @@
895883

896884
</div>
897885
<!-- 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>
898892
</div> <!-- end .contestDetail -->
899893
<div class="deliverables">
900894
<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: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,6 @@
119119
<td class="sec_tab_type"><strong>: <span id="rswGroups"></span></strong></td>
120120
</tr>
121121
<tr></tr>
122-
<tr>
123-
<td class="first_tab_type"><strong>Environment :</strong></td>
124-
<td class="sec_tab_type"><strong>: <span id="rswEnvironment"></span></strong></td>
125-
</tr>
126-
<tr></tr>
127-
<tr>
128-
<td class="first_tab_type"><strong>Code Repo :</strong></td>
129-
<td class="sec_tab_type"><strong>: <span id="rswRepo"></span></strong></td>
130-
</tr>
131-
<tr></tr>
132122
<tr>
133123
<td class="first_tab_type"><strong>Created By</strong></td>
134124
<td class="sec_tab_type"><strong>: <span id="rChallengeCreator"></span></strong></td>
@@ -270,17 +260,6 @@
270260
<span class="name fixWidthName" title="Enter challenge groups"><strong>Group(s):</strong></span>
271261
<div id="groupDiv"><div id="groups"></div></div>
272262
</div>
273-
<br/><br/>
274-
<span class="name fixWidthName"><strong>Environment</strong></span>
275-
<span class="value">
276-
<input type="text" class="bigin" id="environmentEdit" />
277-
</span>
278-
<br /><br />
279-
280-
<span class="name fixWidthName"><strong>Code Repo</strong></span>
281-
<span class="value">
282-
<input type="text" class="bigin" id="repoEdit" />
283-
</span>
284263
<br /><br />
285264
<span class="name fixWidthName"><strong>Created By</strong></span>
286265
<span class ='small_info_spec' id="challegneCreatorLabel"></span>
@@ -550,6 +529,19 @@
550529
</span>
551530
</div>
552531
</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>
553545
</div><!-- End .detailsContent -->
554546
</div><!-- End .details -->
555547
<!-- END Spec Display -->
@@ -597,6 +589,12 @@
597589

598590
</div>
599591
<!-- 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>
600598
</div> <!-- end .contestDetail -->
601599

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

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

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -178,16 +178,6 @@
178178
<td class="sec_tab_type"><strong>: <span id="rswGroups"></span></strong></td>
179179
</tr>
180180
<tr></tr>
181-
<tr>
182-
<td class="first_tab_type"><strong>Environment :</strong></td>
183-
<td class="sec_tab_type"><strong>: <span id="rswEnvironment"></span></strong></td>
184-
</tr>
185-
<tr></tr>
186-
<tr>
187-
<td class="first_tab_type"><strong>Code Repo :</strong></td>
188-
<td class="sec_tab_type"><strong>: <span id="rswRepo"></span></strong></td>
189-
</tr>
190-
<tr></tr>
191181
<tr>
192182
<td class="first_tab_type"><strong>Created By</strong></td>
193183
<td class="sec_tab_type"><strong>: <span id="rChallengeCreator"></span></strong></td>
@@ -362,21 +352,10 @@
362352
</div>
363353
</div>
364354
<div class="ms-group-display">
365-
<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>
366356
<div class="ms-group-div"><div id="groups"></div></div>
367357
</div>
368358
<br/>
369-
<span class="name fixWidthName"><strong>Environment</strong></span>
370-
<span class="value">
371-
<input type="text" class="bigin" id="environmentEdit" />
372-
</span>
373-
<br /><br />
374-
375-
<span class="name fixWidthName"><strong>Code Repo</strong></span>
376-
<span class="value">
377-
<input type="text" class="bigin" id="repoEdit" />
378-
</span>
379-
<br /><br />
380359
<div>
381360

382361
<span class="name fixWidthName"><strong>Created By</strong></span>
@@ -859,7 +838,20 @@
859838

860839
<div class="bottom_spec">
861840
</div>
862-
</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>
863855
</div><!-- End .detailsContent -->
864856
</div><!-- End .details -->
865857
<!-- END Spec Display -->
@@ -965,6 +957,12 @@
965957
</div> <!-- end of prizesInner_tech -->
966958
</div>
967959
</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>
968966
</div> <!-- end .contestDetail -->
969967
</div> <!-- End .launchContestOut -->
970968

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -217,19 +217,6 @@
217217
<div id="groups"></div>
218218
</div>
219219
</div>
220-
221-
<!-- Environment -->
222-
<div class="row">
223-
<label>Environment :</label>
224-
<input id="environment" name="environmentEdit" type="text" class="text" maxlength="500"/>
225-
</div>
226-
227-
<!-- repo -->
228-
<div class="row">
229-
<label>Code Repo :</label>
230-
<input id="repoEdit" name="repo" type="text" class="text" maxlength="500"/>
231-
</div>
232-
233220
</div>
234221
<!-- end .addNewContest -->
235222
</form>

‎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 -->

0 commit comments

Comments
 (0)