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

remove env and repo on studio #327

Merged
merged 1 commit into from
Oct 20, 2017
Merged

remove env and repo on studio #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions src/web/WEB-INF/includes/contest/editTab.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,19 +804,6 @@
<div class="bottom_spec">
</div>

<div class="hide">
<p class="det_font">
<span class="name"><strong>Environment </strong></span>
<br />
<span class="small_info_spec" id="rswEnvironment"></span>
<br /><br/>
<span class="name"><strong>Code repo </strong> </span>
<br />
<span class="small_info_spec" id="rswRepo"></span>
</p>
<div class="bottom_spec"></div>
</div>

<p class="det_font">
<span class="name"><strong>Final Deliverables</strong></span>
<br />
Expand Down Expand Up @@ -883,12 +870,6 @@

</div>
<!-- end .guidelines -->
<div class="envRepo hide">
<h3>Environment</h3>
<input class="environmentEdit" name="environmentEdit" type="text" maxlength="500"/>
<h3>Code Repo</h3>
<input type="text" class="repoEdit" maxlength="500" />
</div>
</div> <!-- end .contestDetail -->
<div class="deliverables">
<h3><span class="icon">Final Deliverables:</span><a href="javascript:;" class="helpIcon"><span class="hide">Help</span></a></h3>
Expand Down
8 changes: 5 additions & 3 deletions src/web/WEB-INF/includes/contest/editTabMarathon.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@
</div>
</p>
<div class="bottom_spec"></div>
<div class="hide">
<%--
<p class="det_font">
<span class="name"><strong>Environment </strong></span>
<br />
Expand All @@ -541,7 +541,7 @@
<span class="small_info_spec" id="rswRepo"></span>
</p>
<div class="bottom_spec"></div>
</div>
--%>
</div><!-- End .detailsContent -->
</div><!-- End .details -->
<!-- END Spec Display -->
Expand Down Expand Up @@ -589,12 +589,14 @@

</div>
<!-- end .guidelines -->
<div class="envRepo hide">
<%--
<div class="envRepo">
<h3>Environment</h3>
<input class="environmentEdit" name="environmentEdit" type="text" maxlength="500"/>
<h3>Code Repo</h3>
<input type="text" class="repoEdit" maxlength="500" />
</div>
--%>
</div> <!-- end .contestDetail -->

</div> <!-- End .launchContestOut -->
Expand Down
8 changes: 5 additions & 3 deletions src/web/WEB-INF/includes/contest/editTabSoftware.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@
</div>
</div>
<!-- End .component -->
<div class="hide">

<p class="det_font">
<span class="name"><strong>Environment </strong></span>
<br />
Expand All @@ -851,7 +851,7 @@
<span class="small_info_spec" id="rswRepo"></span>
</p>
<div class="bottom_spec"></div>
</div>

</div><!-- End .detailsContent -->
</div><!-- End .details -->
<!-- END Spec Display -->
Expand Down Expand Up @@ -957,12 +957,14 @@
</div> <!-- end of prizesInner_tech -->
</div>
</s:if>
<div class="envRepo hide">

<div class="envRepo">
<h3>Environment</h3>
<input class="environmentEdit" name="environmentEdit" type="text" maxlength="500"/>
<h3>Code Repo</h3>
<input type="text" class="repoEdit" maxlength="500" />
</div>

</div> <!-- end .contestDetail -->
</div> <!-- End .launchContestOut -->

Expand Down
10 changes: 0 additions & 10 deletions src/web/WEB-INF/includes/launch/overview.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,7 @@
</div>
</div>
<!-- end round 2 information -->
<!-- Environment -->
<div class="prizes hide">
<h3>Environment :</h3>
<input class="environmentEdit text" name="environmentEdit" type="text" maxlength="500"/>
</div>

<!-- repo -->
<div class="prizes hide">
<h3>Code Repo :</h3>
<input class="repoEdit text" name="repo" type="text" maxlength="500"/>
</div>
<!-- upload -->
<div id="uploadSection">

Expand Down
6 changes: 4 additions & 2 deletions src/web/WEB-INF/includes/launch/overviewAlgorithm.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,19 @@
</div>
</div>
<!-- end Match Rules -->
<%--
<!-- Environment -->
<div class="prizes hide">
<div class="prizes">
<h3>Environment :</h3>
<input class="environmentEdit text" name="environmentEdit" type="text" maxlength="500"/>
</div>

<!-- repo -->
<div class="prizes hide">
<div class="prizes">
<h3>Code Repo :</h3>
<input class="repoEdit text" name="repo" type="text" maxlength="500"/>
</div>
--%>
<!-- upload -->
<div id="alUploadSection">
<h3>File Upload (20MB maximum):</h3>
Expand Down
4 changes: 2 additions & 2 deletions src/web/WEB-INF/includes/launch/overviewSoftware.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,13 @@
</div> <!-- end of prizesInner_tech -->
</div>
<!-- Environment -->
<div class="prizes hide">
<div class="prizes">
<h3>Environment :</h3>
<input class="environmentEdit text" name="environmentEdit" type="text" maxlength="500"/>
</div>

<!-- repo -->
<div class="prizes hide">
<div class="prizes">
<h3>Code Repo :</h3>
<input class="repoEdit text" name="repo" type="text" maxlength="500"/>
</div>
Expand Down
6 changes: 0 additions & 6 deletions src/web/WEB-INF/includes/launch/review.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,6 @@

<dt class="rMultiInfo">Round Two Information :</dt>
<dd class="rMultiInfo"><span id="rRound2Info"></span><a href="javascript: showPage('overviewPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>

<dt>Environment :</dt>
<dd class="rEnvironment"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>

<dt>Code Repo :</dt>
<dd class="rRepo"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
</dl>
</div>
<!-- end .contentList -->
Expand Down
3 changes: 2 additions & 1 deletion src/web/WEB-INF/includes/launch/reviewAlgorithm.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,13 @@

<dt>Match Rules :</dt>
<dd><span id="ralMatchRules"></span><a href="javascript: showPage('overviewAlgorithmPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>

<%--
<dt>Environment :</dt>
<dd class="rEnvironment"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>

<dt>Code Repo :</dt>
<dd class="rRepo"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
--%>
</dl>
</div>
<!-- end .contentList -->
Expand Down
1 change: 1 addition & 0 deletions src/web/WEB-INF/includes/launch/reviewSoftware.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@

<dt>Code Repo :</dt>
<dd class="rRepo"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>

</dl>
</div>
<!-- end .contentList -->
Expand Down
7 changes: 4 additions & 3 deletions src/web/scripts/launch/contestDetailSoftware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2853,9 +2853,10 @@ function saveSpecSection() {
return;
}

mainWidget.softwareCompetition.projectHeader.properties[ENVIRONMENT] = $(".environmentEdit").val().trim();
mainWidget.softwareCompetition.projectHeader.properties[CODE_REPO] = $(".repoEdit").val().trim();

if (!mainWidget.isStudioContest()){
mainWidget.softwareCompetition.projectHeader.properties[ENVIRONMENT] = ($(".environmentEdit").val() || "").trim();
mainWidget.softwareCompetition.projectHeader.properties[CODE_REPO] = ($(".repoEdit").val() || "").trim();
}
var saveDraftHandler = function () {

//construct request data
Expand Down
25 changes: 6 additions & 19 deletions src/web/scripts/launch/pages/overview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,17 +459,10 @@ function continueOverview() {
if(!validateFieldsOverview()) {
return;
}

var environmentEdit = $(".environmentEdit:visible").val();
if (environmentEdit) {
mainWidget.softwareCompetition.projectHeader.properties[ENVIRONMENT] = environmentEdit.trim();
}

var repoEdit = $(".repoEdit:visible").val();
if (repoEdit) {
mainWidget.softwareCompetition.projectHeader.properties[CODE_REPO] = repoEdit.trim();
if (!mainWidget.isStudioContest()) {
mainWidget.softwareCompetition.projectHeader.properties[ENVIRONMENT] = ($(".environmentEdit:visible").val() || "").trim();
mainWidget.softwareCompetition.projectHeader.properties[CODE_REPO] = ($(".repoEdit:visible").val() || "").trim();
}

var backLink = '<a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a>';
$(".rEnvironment").html(mainWidget.softwareCompetition.projectHeader.properties[ENVIRONMENT] + backLink);
$(".rRepo").html(mainWidget.softwareCompetition.projectHeader.properties[CODE_REPO] + backLink);
Expand All @@ -491,16 +484,10 @@ function saveAsDraftOverview() {
return;
}

var environmentEdit = $(".environmentEdit:visible").val();
if (environmentEdit) {
mainWidget.softwareCompetition.projectHeader.properties[ENVIRONMENT] = environmentEdit.trim();
if (!mainWidget.isStudioContest()) {
mainWidget.softwareCompetition.projectHeader.properties[ENVIRONMENT] = ($(".environmentEdit").val() || "").trim();
mainWidget.softwareCompetition.projectHeader.properties[CODE_REPO] = ($(".repoEdit").val() || "").trim();
}

var repoEdit = $(".repoEdit:visible").val();
if (repoEdit) {
mainWidget.softwareCompetition.projectHeader.properties[CODE_REPO] = repoEdit.trim();
}

var saveDraftHandler = function () {
//construct request data
var request = saveAsDraftRequest();
Expand Down
3 changes: 0 additions & 3 deletions src/web/scripts/launch/pages/selection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,9 +501,6 @@ function continueContestSelection() {
$(".overviewData .rGroups td span").remove();
$(groupsSpan).insertBefore(".overviewData .rGroups td a");

$(".environmentEdit").val(mainWidget.softwareCompetition.projectHeader.properties[ENVIRONMENT]);
$(".repoEdit").val(mainWidget.softwareCompetition.projectHeader.properties[CODE_REPO]);

if(mainWidget.isSoftwareContest()) {
showPage('overviewSoftwarePage');

Expand Down