diff --git a/src/web/WEB-INF/includes/contest/editTab.jsp b/src/web/WEB-INF/includes/contest/editTab.jsp index 4ae1c9dcb..7142788c6 100644 --- a/src/web/WEB-INF/includes/contest/editTab.jsp +++ b/src/web/WEB-INF/includes/contest/editTab.jsp @@ -804,19 +804,6 @@
-
-

- Environment -
- -

- Code repo -
- -

-
-
-

Final Deliverables
@@ -883,12 +870,6 @@ -

-

Environment

- -

Code Repo

- -

Final Deliverables:Help

diff --git a/src/web/WEB-INF/includes/contest/editTabMarathon.jsp b/src/web/WEB-INF/includes/contest/editTabMarathon.jsp index 249ff8271..ba6ee6c5f 100644 --- a/src/web/WEB-INF/includes/contest/editTabMarathon.jsp +++ b/src/web/WEB-INF/includes/contest/editTabMarathon.jsp @@ -530,7 +530,7 @@

-
+<%--

Environment
@@ -541,7 +541,7 @@

-
+--%> @@ -589,12 +589,14 @@ -
+<%-- +

Environment

Code Repo

+--%>
diff --git a/src/web/WEB-INF/includes/contest/editTabSoftware.jsp b/src/web/WEB-INF/includes/contest/editTabSoftware.jsp index c999a5d06..c68a89acb 100644 --- a/src/web/WEB-INF/includes/contest/editTabSoftware.jsp +++ b/src/web/WEB-INF/includes/contest/editTabSoftware.jsp @@ -840,7 +840,7 @@ -
+

Environment
@@ -851,7 +851,7 @@

-
+ @@ -957,12 +957,14 @@ -
+ +

Environment

Code Repo

+
diff --git a/src/web/WEB-INF/includes/launch/overview.jsp b/src/web/WEB-INF/includes/launch/overview.jsp index d024f8827..26171043f 100644 --- a/src/web/WEB-INF/includes/launch/overview.jsp +++ b/src/web/WEB-INF/includes/launch/overview.jsp @@ -68,17 +68,7 @@ - -
-

Environment :

- -
- -
-

Code Repo :

- -
diff --git a/src/web/WEB-INF/includes/launch/overviewAlgorithm.jsp b/src/web/WEB-INF/includes/launch/overviewAlgorithm.jsp index fff986e1d..e1f6ded61 100644 --- a/src/web/WEB-INF/includes/launch/overviewAlgorithm.jsp +++ b/src/web/WEB-INF/includes/launch/overviewAlgorithm.jsp @@ -46,17 +46,19 @@
+<%-- -
+

Environment :

-
+

Code Repo :

+--%>

File Upload (20MB maximum):

diff --git a/src/web/WEB-INF/includes/launch/overviewSoftware.jsp b/src/web/WEB-INF/includes/launch/overviewSoftware.jsp index 2cec18eb5..55c935caf 100644 --- a/src/web/WEB-INF/includes/launch/overviewSoftware.jsp +++ b/src/web/WEB-INF/includes/launch/overviewSoftware.jsp @@ -110,13 +110,13 @@
-
+

Environment :

-
+

Code Repo :

diff --git a/src/web/WEB-INF/includes/launch/review.jsp b/src/web/WEB-INF/includes/launch/review.jsp index 62fa874c0..625b3fbff 100644 --- a/src/web/WEB-INF/includes/launch/review.jsp +++ b/src/web/WEB-INF/includes/launch/review.jsp @@ -79,12 +79,6 @@
Round Two Information :
Edit
- -
Environment :
-
Edit
- -
Code Repo :
-
Edit
diff --git a/src/web/WEB-INF/includes/launch/reviewAlgorithm.jsp b/src/web/WEB-INF/includes/launch/reviewAlgorithm.jsp index 056b13f29..804fbaca6 100644 --- a/src/web/WEB-INF/includes/launch/reviewAlgorithm.jsp +++ b/src/web/WEB-INF/includes/launch/reviewAlgorithm.jsp @@ -62,12 +62,13 @@
Match Rules :
Edit
- +<%--
Environment :
Edit
Code Repo :
Edit
+--%>
diff --git a/src/web/WEB-INF/includes/launch/reviewSoftware.jsp b/src/web/WEB-INF/includes/launch/reviewSoftware.jsp index 14a8a52d1..70e065790 100644 --- a/src/web/WEB-INF/includes/launch/reviewSoftware.jsp +++ b/src/web/WEB-INF/includes/launch/reviewSoftware.jsp @@ -89,6 +89,7 @@
Code Repo :
Edit
+
diff --git a/src/web/scripts/launch/contestDetailSoftware.js b/src/web/scripts/launch/contestDetailSoftware.js index bd64d5fb6..dc76a274a 100644 --- a/src/web/scripts/launch/contestDetailSoftware.js +++ b/src/web/scripts/launch/contestDetailSoftware.js @@ -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 diff --git a/src/web/scripts/launch/pages/overview.js b/src/web/scripts/launch/pages/overview.js index 57a09f2c7..266f10c37 100644 --- a/src/web/scripts/launch/pages/overview.js +++ b/src/web/scripts/launch/pages/overview.js @@ -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 = 'Edit'; $(".rEnvironment").html(mainWidget.softwareCompetition.projectHeader.properties[ENVIRONMENT] + backLink); $(".rRepo").html(mainWidget.softwareCompetition.projectHeader.properties[CODE_REPO] + backLink); @@ -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(); diff --git a/src/web/scripts/launch/pages/selection.js b/src/web/scripts/launch/pages/selection.js index f3843cd19..86a2a50c4 100644 --- a/src/web/scripts/launch/pages/selection.js +++ b/src/web/scripts/launch/pages/selection.js @@ -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');