diff --git a/build-master-targets.xml b/build-master-targets.xml index b795d13fd..37ff5f616 100644 --- a/build-master-targets.xml +++ b/build-master-targets.xml @@ -580,5 +580,14 @@ - + + + + + + + + + + diff --git a/build.xml b/build.xml index 3942e438f..a5db1b321 100644 --- a/build.xml +++ b/build.xml @@ -2,6 +2,14 @@ + + + + + + @@ -140,7 +148,7 @@ - + @@ -469,6 +477,14 @@ + + + + + + + + @@ -579,7 +595,7 @@ - + @@ -662,7 +678,7 @@ - + @@ -671,6 +687,25 @@ + + + + + + + + + + + + + + + + + + + @@ -679,5 +714,4 @@ - diff --git a/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java b/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java index 3938f0378..90c69f239 100644 --- a/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java +++ b/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java @@ -27,6 +27,7 @@ import com.topcoder.clientcockpit.phases.messagegenerators.DefaultEmailMessageGenerator; import com.topcoder.clients.dao.DAOException; import com.topcoder.clients.dao.ProjectDAO; +import com.topcoder.clients.model.Client; import com.topcoder.clients.model.ProjectContestFee; import com.topcoder.configuration.ConfigurationObject; import com.topcoder.configuration.persistence.ConfigurationFileManager; @@ -5953,7 +5954,11 @@ public SoftwareCompetition getSoftwareContestByProjectId(TCSubject tcSubject, lo Boolean effortHoursEnabled = false; try { - effortHoursEnabled = projectService.getClientByProject(fullProjectData.getProjectHeader().getTcDirectProjectId()).isEffortHoursEnabled(); + Client client = projectService.getClientByProject(fullProjectData.getProjectHeader().getTcDirectProjectId()); + if (client != null) { + effortHoursEnabled = client.isEffortHoursEnabled(); + } + } catch (PersistenceFault e) { effortHoursEnabled = false; } diff --git a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/CommonAction.java b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/CommonAction.java index c73a16de7..e6f9586e7 100644 --- a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/CommonAction.java +++ b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/CommonAction.java @@ -3,6 +3,7 @@ */ package com.topcoder.direct.services.view.action.contest.launch; +import com.topcoder.clients.model.Client; import com.topcoder.clients.model.Project; import com.topcoder.clients.model.ProjectContestFee; import com.topcoder.clients.model.ProjectContestFeePercentage; @@ -397,7 +398,13 @@ public String getBillingAccountsForProject() { billingAccount.put("name", billingAccountsByProject.get(i).getName()); billingAccount.put("cca", String.valueOf(requireCCAs[i])); // Add enableEffortHours for each billing account - billingAccount.put("enableEffortHours", billingAccountsByProject.get(i).getClient().isEffortHoursEnabled()); + Client client = billingAccountsByProject.get(i).getClient(); + if (client != null) { + billingAccount.put("enableEffortHours", client.isEffortHoursEnabled()); + } else { + billingAccount.put("enableEffortHours", false); + } + result.add(billingAccount); } setResult(result); diff --git a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetContestAction.java b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetContestAction.java index b76e2ed66..d9c3b814d 100644 --- a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetContestAction.java +++ b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetContestAction.java @@ -3,6 +3,7 @@ */ package com.topcoder.direct.services.view.action.contest.launch; +import com.topcoder.clients.model.Client; import com.topcoder.clients.model.Project; import com.topcoder.direct.services.exception.DirectException; import com.topcoder.direct.services.project.milestone.model.Milestone; @@ -569,7 +570,12 @@ protected void executeAction() throws Exception { billingAccount.put("name", billingProjects.get(i).getName()); billingAccount.put("cca", String.valueOf(requireCCAs[i])); // Add enableEffortHours for each billing account - billingAccount.put("enableEffortHours", billingProjects.get(i).getClient().isEffortHoursEnabled()); + Client client = billingProjects.get(i).getClient(); + if (client != null) { + billingAccount.put("enableEffortHours", client.isEffortHoursEnabled()); + } else { + billingAccount.put("enableEffortHours", false); + } billingAccountsForProject.add(billingAccount); } diff --git a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetGroupMemberAction.java b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetGroupMemberAction.java index bf3ea0d7d..3da8a7413 100644 --- a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetGroupMemberAction.java +++ b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetGroupMemberAction.java @@ -105,7 +105,7 @@ public boolean evaluate(Object o) { private List> getData() throws Exception { CacheClient cc = null; List> data = null; - SortedCacheAddress cacheAddress = new SortedCacheAddress("group_member", MaxAge.FIVE_MINUTES); + SortedCacheAddress cacheAddress = new SortedCacheAddress("group_member", MaxAge.HOUR); cacheAddress.addAll(groupIds); try{ cc = CacheClientFactory.create(); @@ -120,7 +120,7 @@ private List> getData() throws Exception { Set groupMembers = getGroupMembers(); data = DirectUtils.getUsersFromId(groupMembers.toArray(new Long[groupMembers.size()])); try{ - cc.set(cacheAddress, data, MaxAge.FIVE_MINUTES); + cc.set(cacheAddress, data, MaxAge.HOUR); } catch (Exception e) { logger.error("Failed to put group member into cache ", e); } diff --git a/src/web/WEB-INF/asset/project/batchEditAssets.jsp b/src/web/WEB-INF/asset/project/batchEditAssets.jsp index 57a4eb356..0b6e46c27 100644 --- a/src/web/WEB-INF/asset/project/batchEditAssets.jsp +++ b/src/web/WEB-INF/asset/project/batchEditAssets.jsp @@ -56,25 +56,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/web/WEB-INF/asset/project/projectAssetUpload.jsp b/src/web/WEB-INF/asset/project/projectAssetUpload.jsp index 6ce53cc95..bb2b879df 100644 --- a/src/web/WEB-INF/asset/project/projectAssetUpload.jsp +++ b/src/web/WEB-INF/asset/project/projectAssetUpload.jsp @@ -33,31 +33,31 @@ - - - - - - - - + + + + + + + + @@ -68,31 +68,31 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - - - + + + diff --git a/src/web/WEB-INF/asset/project/projectAssetVersions.jsp b/src/web/WEB-INF/asset/project/projectAssetVersions.jsp index d85fb3df0..dcbafa386 100644 --- a/src/web/WEB-INF/asset/project/projectAssetVersions.jsp +++ b/src/web/WEB-INF/asset/project/projectAssetVersions.jsp @@ -53,25 +53,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/web/WEB-INF/asset/project/projectAssets.jsp b/src/web/WEB-INF/asset/project/projectAssets.jsp index 200b6b1ba..eddc5473e 100644 --- a/src/web/WEB-INF/asset/project/projectAssets.jsp +++ b/src/web/WEB-INF/asset/project/projectAssets.jsp @@ -56,25 +56,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/web/WEB-INF/billing/billing_account_contest_fee.jsp b/src/web/WEB-INF/billing/billing_account_contest_fee.jsp index c731767d2..7d2457454 100644 --- a/src/web/WEB-INF/billing/billing_account_contest_fee.jsp +++ b/src/web/WEB-INF/billing/billing_account_contest_fee.jsp @@ -31,9 +31,9 @@ diff --git a/src/web/WEB-INF/billing/billing_account_create_fees_list.jsp b/src/web/WEB-INF/billing/billing_account_create_fees_list.jsp index ec4b7098f..9ca581dc8 100644 --- a/src/web/WEB-INF/billing/billing_account_create_fees_list.jsp +++ b/src/web/WEB-INF/billing/billing_account_create_fees_list.jsp @@ -31,9 +31,9 @@ diff --git a/src/web/WEB-INF/billing/billing_account_list.jsp b/src/web/WEB-INF/billing/billing_account_list.jsp index 7878d4317..9df889549 100644 --- a/src/web/WEB-INF/billing/billing_account_list.jsp +++ b/src/web/WEB-INF/billing/billing_account_list.jsp @@ -30,9 +30,9 @@ diff --git a/src/web/WEB-INF/billing/customer_platform_fee.jsp b/src/web/WEB-INF/billing/customer_platform_fee.jsp index c1fc7486b..4cd9334de 100644 --- a/src/web/WEB-INF/billing/customer_platform_fee.jsp +++ b/src/web/WEB-INF/billing/customer_platform_fee.jsp @@ -22,9 +22,9 @@ diff --git a/src/web/WEB-INF/billing/customer_platform_fee_list.jsp b/src/web/WEB-INF/billing/customer_platform_fee_list.jsp index adbf5657c..b995270f9 100644 --- a/src/web/WEB-INF/billing/customer_platform_fee_list.jsp +++ b/src/web/WEB-INF/billing/customer_platform_fee_list.jsp @@ -28,9 +28,9 @@ diff --git a/src/web/WEB-INF/calendar.jsp b/src/web/WEB-INF/calendar.jsp index e6111d120..a3d4bd540 100644 --- a/src/web/WEB-INF/calendar.jsp +++ b/src/web/WEB-INF/calendar.jsp @@ -20,10 +20,10 @@ - - - - + + + + diff --git a/src/web/WEB-INF/contest-details2.jsp b/src/web/WEB-INF/contest-details2.jsp index 414ffd158..4e16ec3d3 100644 --- a/src/web/WEB-INF/contest-details2.jsp +++ b/src/web/WEB-INF/contest-details2.jsp @@ -50,7 +50,7 @@ - + @@ -69,10 +69,10 @@ - - - - + + + + @@ -171,9 +171,31 @@ - +
+
+ +
+
+ +
+
+
+

ToolTip

+ +
+
+
+ +
+

in Equated offshore hours = onsite hours * 6 + offshore hours

+
+ +
+
+
+ +
- diff --git a/src/web/WEB-INF/contest-view.jsp b/src/web/WEB-INF/contest-view.jsp index 64222fd74..0fb856ea4 100644 --- a/src/web/WEB-INF/contest-view.jsp +++ b/src/web/WEB-INF/contest-view.jsp @@ -53,7 +53,7 @@ - + diff --git a/src/web/WEB-INF/contests-calendar-view.jsp b/src/web/WEB-INF/contests-calendar-view.jsp index d5dd0f363..8242054b6 100644 --- a/src/web/WEB-INF/contests-calendar-view.jsp +++ b/src/web/WEB-INF/contests-calendar-view.jsp @@ -15,8 +15,8 @@ - - + + diff --git a/src/web/WEB-INF/copilot-contests-comparison.jsp b/src/web/WEB-INF/copilot-contests-comparison.jsp index 2fe42ceb6..9b1faf620 100644 --- a/src/web/WEB-INF/copilot-contests-comparison.jsp +++ b/src/web/WEB-INF/copilot-contests-comparison.jsp @@ -41,64 +41,64 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + - + diff --git a/src/web/WEB-INF/copilot-contests-details.jsp b/src/web/WEB-INF/copilot-contests-details.jsp index b552b52bd..042e554d2 100644 --- a/src/web/WEB-INF/copilot-contests-details.jsp +++ b/src/web/WEB-INF/copilot-contests-details.jsp @@ -51,15 +51,15 @@ - - + + - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + - + diff --git a/src/web/WEB-INF/copilot-pool.jsp b/src/web/WEB-INF/copilot-pool.jsp index dcc9c7759..c04c9b4b5 100644 --- a/src/web/WEB-INF/copilot-pool.jsp +++ b/src/web/WEB-INF/copilot-pool.jsp @@ -24,18 +24,18 @@ - - - - + + + + - - - - - - - + + + + + + + diff --git a/src/web/WEB-INF/dashboard-active.jsp b/src/web/WEB-INF/dashboard-active.jsp index 8ecb85b82..edfa463e6 100644 --- a/src/web/WEB-INF/dashboard-active.jsp +++ b/src/web/WEB-INF/dashboard-active.jsp @@ -43,9 +43,9 @@ diff --git a/src/web/WEB-INF/dashboard-create-new-project.jsp b/src/web/WEB-INF/dashboard-create-new-project.jsp index fe555a9ce..2712e3183 100644 --- a/src/web/WEB-INF/dashboard-create-new-project.jsp +++ b/src/web/WEB-INF/dashboard-create-new-project.jsp @@ -34,29 +34,29 @@ - - + + - - - + + + - - + + - - - - + + + + diff --git a/src/web/WEB-INF/dashboard-enterprise.jsp b/src/web/WEB-INF/dashboard-enterprise.jsp index 4a17655eb..f0f445795 100644 --- a/src/web/WEB-INF/dashboard-enterprise.jsp +++ b/src/web/WEB-INF/dashboard-enterprise.jsp @@ -42,12 +42,12 @@ - - - - + + + + - + - - - - - + + + + + diff --git a/src/web/WEB-INF/dashboard-search.jsp b/src/web/WEB-INF/dashboard-search.jsp index 5dcf897eb..15e955c44 100644 --- a/src/web/WEB-INF/dashboard-search.jsp +++ b/src/web/WEB-INF/dashboard-search.jsp @@ -32,7 +32,7 @@ - + @@ -51,7 +51,7 @@ - + - + + - + diff --git a/src/web/WEB-INF/enterpriseDashboard/financial.jsp b/src/web/WEB-INF/enterpriseDashboard/financial.jsp index 2133d0d4c..f0723fcaf 100644 --- a/src/web/WEB-INF/enterpriseDashboard/financial.jsp +++ b/src/web/WEB-INF/enterpriseDashboard/financial.jsp @@ -29,7 +29,7 @@ diff --git a/src/web/WEB-INF/enterpriseDashboard/health.jsp b/src/web/WEB-INF/enterpriseDashboard/health.jsp index 973e9db10..0c58271bd 100644 --- a/src/web/WEB-INF/enterpriseDashboard/health.jsp +++ b/src/web/WEB-INF/enterpriseDashboard/health.jsp @@ -22,7 +22,7 @@ diff --git a/src/web/WEB-INF/enterpriseDashboard/roadmap.jsp b/src/web/WEB-INF/enterpriseDashboard/roadmap.jsp index 22f64d0cc..245140f53 100644 --- a/src/web/WEB-INF/enterpriseDashboard/roadmap.jsp +++ b/src/web/WEB-INF/enterpriseDashboard/roadmap.jsp @@ -31,7 +31,7 @@ - + diff --git a/src/web/WEB-INF/groups/auditing-info.jsp b/src/web/WEB-INF/groups/auditing-info.jsp index 654c6cee9..216801043 100644 --- a/src/web/WEB-INF/groups/auditing-info.jsp +++ b/src/web/WEB-INF/groups/auditing-info.jsp @@ -24,11 +24,11 @@ - - + + - + diff --git a/src/web/WEB-INF/groups/create-administrator.jsp b/src/web/WEB-INF/groups/create-administrator.jsp index 0262f5d61..48b4f08d6 100644 --- a/src/web/WEB-INF/groups/create-administrator.jsp +++ b/src/web/WEB-INF/groups/create-administrator.jsp @@ -22,8 +22,8 @@ - - + + diff --git a/src/web/WEB-INF/groups/create-group.jsp b/src/web/WEB-INF/groups/create-group.jsp index d6c216e5b..a2b2df088 100644 --- a/src/web/WEB-INF/groups/create-group.jsp +++ b/src/web/WEB-INF/groups/create-group.jsp @@ -44,8 +44,8 @@ - - + + diff --git a/src/web/WEB-INF/groups/send-invitation.jsp b/src/web/WEB-INF/groups/send-invitation.jsp index cb9faabfa..d19bf1007 100644 --- a/src/web/WEB-INF/groups/send-invitation.jsp +++ b/src/web/WEB-INF/groups/send-invitation.jsp @@ -27,8 +27,8 @@ - - + + diff --git a/src/web/WEB-INF/groups/view-invitations.jsp b/src/web/WEB-INF/groups/view-invitations.jsp index 22b4b3010..aa83935d3 100644 --- a/src/web/WEB-INF/groups/view-invitations.jsp +++ b/src/web/WEB-INF/groups/view-invitations.jsp @@ -28,8 +28,8 @@ - - + + diff --git a/src/web/WEB-INF/groups/view-pending-approvals.jsp b/src/web/WEB-INF/groups/view-pending-approvals.jsp index d0d9c06f2..89e20c59c 100644 --- a/src/web/WEB-INF/groups/view-pending-approvals.jsp +++ b/src/web/WEB-INF/groups/view-pending-approvals.jsp @@ -30,8 +30,8 @@ - - + + diff --git a/src/web/WEB-INF/groups/view-user-group-details.jsp b/src/web/WEB-INF/groups/view-user-group-details.jsp index 947c907fb..5ed566917 100644 --- a/src/web/WEB-INF/groups/view-user-group-details.jsp +++ b/src/web/WEB-INF/groups/view-user-group-details.jsp @@ -39,8 +39,8 @@ - - + + diff --git a/src/web/WEB-INF/groups/view-user-groups.jsp b/src/web/WEB-INF/groups/view-user-groups.jsp index 26c74abfe..754759ea0 100644 --- a/src/web/WEB-INF/groups/view-user-groups.jsp +++ b/src/web/WEB-INF/groups/view-user-groups.jsp @@ -24,11 +24,11 @@ - - + + - + diff --git a/src/web/WEB-INF/includes/contest/editTab.jsp b/src/web/WEB-INF/includes/contest/editTab.jsp index 9dc1e794b..a1f087607 100644 --- a/src/web/WEB-INF/includes/contest/editTab.jsp +++ b/src/web/WEB-INF/includes/contest/editTab.jsp @@ -342,7 +342,7 @@

- Effort Hours Estimate: + Estimated Effort: help


diff --git a/src/web/WEB-INF/includes/contest/editTabMarathon.jsp b/src/web/WEB-INF/includes/contest/editTabMarathon.jsp index ac522ff57..ee7f667fe 100644 --- a/src/web/WEB-INF/includes/contest/editTabMarathon.jsp +++ b/src/web/WEB-INF/includes/contest/editTabMarathon.jsp @@ -295,7 +295,7 @@

- Effort Hours Estimate: + Estimated Effort: help


diff --git a/src/web/WEB-INF/includes/contest/editTabSoftware.jsp b/src/web/WEB-INF/includes/contest/editTabSoftware.jsp index 2ab6d3d9b..b74640bc5 100644 --- a/src/web/WEB-INF/includes/contest/editTabSoftware.jsp +++ b/src/web/WEB-INF/includes/contest/editTabSoftware.jsp @@ -369,7 +369,7 @@
- Effort Hours Estimate: + Estimated Effort: help

diff --git a/src/web/WEB-INF/includes/contest/submissionViewer/submissionViewerHtmlHead.jsp b/src/web/WEB-INF/includes/contest/submissionViewer/submissionViewerHtmlHead.jsp index 1f11e8395..857945eb6 100644 --- a/src/web/WEB-INF/includes/contest/submissionViewer/submissionViewerHtmlHead.jsp +++ b/src/web/WEB-INF/includes/contest/submissionViewer/submissionViewerHtmlHead.jsp @@ -36,59 +36,59 @@ - - - - - - + + + + + + - + - + - + - - - - - - - - + + + + + + + + - + - - - - - - + + + + + + - + - - - - - - - - - - + + + + + + + + + + @@ -112,32 +112,32 @@ - + - + - - - + + + - - + + - - + + - - + + - + diff --git a/src/web/WEB-INF/includes/filterPanel.jsp b/src/web/WEB-INF/includes/filterPanel.jsp index 5d9e0cbe0..cd8eb00d7 100644 --- a/src/web/WEB-INF/includes/filterPanel.jsp +++ b/src/web/WEB-INF/includes/filterPanel.jsp @@ -1,7 +1,7 @@ - + - \ No newline at end of file + \ No newline at end of file diff --git a/src/web/WEB-INF/includes/footer.jsp b/src/web/WEB-INF/includes/footer.jsp index 6fa715c79..c4d8e6aa1 100644 --- a/src/web/WEB-INF/includes/footer.jsp +++ b/src/web/WEB-INF/includes/footer.jsp @@ -52,15 +52,21 @@ + + - + diff --git a/src/web/WEB-INF/includes/htmlhead.jsp b/src/web/WEB-INF/includes/htmlhead.jsp index 6a1e4d1dc..3bddd9e9d 100644 --- a/src/web/WEB-INF/includes/htmlhead.jsp +++ b/src/web/WEB-INF/includes/htmlhead.jsp @@ -33,32 +33,32 @@ - - - - - - - - + + + + + + + + @@ -70,33 +70,33 @@ //]]> - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - - + + + + diff --git a/src/web/WEB-INF/includes/launch/contestSelection.jsp b/src/web/WEB-INF/includes/launch/contestSelection.jsp index 46de765f3..34ba7d279 100644 --- a/src/web/WEB-INF/includes/launch/contestSelection.jsp +++ b/src/web/WEB-INF/includes/launch/contestSelection.jsp @@ -237,7 +237,7 @@
- +
diff --git a/src/web/WEB-INF/includes/paginationSetup.jsp b/src/web/WEB-INF/includes/paginationSetup.jsp index 968037f68..e69443b42 100644 --- a/src/web/WEB-INF/includes/paginationSetup.jsp +++ b/src/web/WEB-INF/includes/paginationSetup.jsp @@ -2,7 +2,7 @@ <%@ include file="/WEB-INF/includes/taglibs.jsp" %> - - + + - \ No newline at end of file + diff --git a/src/web/WEB-INF/internal-stats.jsp b/src/web/WEB-INF/internal-stats.jsp index 00028997d..eb12fc9f3 100644 --- a/src/web/WEB-INF/internal-stats.jsp +++ b/src/web/WEB-INF/internal-stats.jsp @@ -16,7 +16,7 @@ - + + - + - - - - - + + + + + @@ -151,7 +151,30 @@ +
+
+ +
+
+
+
+
+

ToolTip

+ +
+
+
+ +
+

in Equated offshore hours = onsite hours * 6 + offshore hours

+
+ +
+
+
+ +
diff --git a/src/web/WEB-INF/launch-copilot-contest.jsp b/src/web/WEB-INF/launch-copilot-contest.jsp index 4c43d629d..a58d7eedd 100644 --- a/src/web/WEB-INF/launch-copilot-contest.jsp +++ b/src/web/WEB-INF/launch-copilot-contest.jsp @@ -29,17 +29,17 @@ - + - - - + + + - - + + diff --git a/src/web/WEB-INF/manage-copilots.jsp b/src/web/WEB-INF/manage-copilots.jsp index 2fa8840bb..8451e1fe0 100644 --- a/src/web/WEB-INF/manage-copilots.jsp +++ b/src/web/WEB-INF/manage-copilots.jsp @@ -24,9 +24,9 @@ - - - + + + diff --git a/src/web/WEB-INF/metadata/project-metadata-demo.jsp b/src/web/WEB-INF/metadata/project-metadata-demo.jsp index a894b0719..901ae2a5a 100644 --- a/src/web/WEB-INF/metadata/project-metadata-demo.jsp +++ b/src/web/WEB-INF/metadata/project-metadata-demo.jsp @@ -15,7 +15,7 @@ - + diff --git a/src/web/WEB-INF/milestone/project-milestone-batch-create.jsp b/src/web/WEB-INF/milestone/project-milestone-batch-create.jsp index 8f45655c9..27b0803da 100644 --- a/src/web/WEB-INF/milestone/project-milestone-batch-create.jsp +++ b/src/web/WEB-INF/milestone/project-milestone-batch-create.jsp @@ -18,7 +18,7 @@ - + diff --git a/src/web/WEB-INF/milestone/project-milestone-demo.jsp b/src/web/WEB-INF/milestone/project-milestone-demo.jsp index 9f9e2ca91..011c4ee24 100644 --- a/src/web/WEB-INF/milestone/project-milestone-demo.jsp +++ b/src/web/WEB-INF/milestone/project-milestone-demo.jsp @@ -18,7 +18,7 @@ - + diff --git a/src/web/WEB-INF/milestone/projectMilestonesBatchCreation.jsp b/src/web/WEB-INF/milestone/projectMilestonesBatchCreation.jsp index 1305d1ffe..a5328c3fd 100644 --- a/src/web/WEB-INF/milestone/projectMilestonesBatchCreation.jsp +++ b/src/web/WEB-INF/milestone/projectMilestonesBatchCreation.jsp @@ -24,7 +24,7 @@ - - - - + + + + diff --git a/src/web/WEB-INF/milestone/projectMilestonesCalendarView.jsp b/src/web/WEB-INF/milestone/projectMilestonesCalendarView.jsp index 31d595ea8..48fe6c934 100644 --- a/src/web/WEB-INF/milestone/projectMilestonesCalendarView.jsp +++ b/src/web/WEB-INF/milestone/projectMilestonesCalendarView.jsp @@ -21,15 +21,15 @@ - - - - - - + + + + + + diff --git a/src/web/WEB-INF/milestone/projectMilestonesListView.jsp b/src/web/WEB-INF/milestone/projectMilestonesListView.jsp index 4e9bd08eb..26faa4362 100644 --- a/src/web/WEB-INF/milestone/projectMilestonesListView.jsp +++ b/src/web/WEB-INF/milestone/projectMilestonesListView.jsp @@ -27,14 +27,14 @@ - - - + + + - + diff --git a/src/web/WEB-INF/my/myChallenges.jsp b/src/web/WEB-INF/my/myChallenges.jsp index 7e06c4122..6a6cc5545 100644 --- a/src/web/WEB-INF/my/myChallenges.jsp +++ b/src/web/WEB-INF/my/myChallenges.jsp @@ -20,7 +20,7 @@ - + diff --git a/src/web/WEB-INF/my/myCreatedChallenges.jsp b/src/web/WEB-INF/my/myCreatedChallenges.jsp index 0a787c927..11b32372b 100644 --- a/src/web/WEB-INF/my/myCreatedChallenges.jsp +++ b/src/web/WEB-INF/my/myCreatedChallenges.jsp @@ -20,7 +20,7 @@ - + diff --git a/src/web/WEB-INF/notification/dashboard-notifications.jsp b/src/web/WEB-INF/notification/dashboard-notifications.jsp index 92da75817..04f70aebd 100644 --- a/src/web/WEB-INF/notification/dashboard-notifications.jsp +++ b/src/web/WEB-INF/notification/dashboard-notifications.jsp @@ -34,20 +34,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - - + + + + + + + + + + + - - + + diff --git a/src/web/WEB-INF/project-gameplan.jsp b/src/web/WEB-INF/project-gameplan.jsp index fb6f376f5..b74fd5ff9 100644 --- a/src/web/WEB-INF/project-gameplan.jsp +++ b/src/web/WEB-INF/project-gameplan.jsp @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/src/web/WEB-INF/project-jsgantt-gameplan.jsp b/src/web/WEB-INF/project-jsgantt-gameplan.jsp index 4e84db82b..bdd87d21c 100644 --- a/src/web/WEB-INF/project-jsgantt-gameplan.jsp +++ b/src/web/WEB-INF/project-jsgantt-gameplan.jsp @@ -37,31 +37,31 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + diff --git a/src/web/WEB-INF/project-overview.jsp b/src/web/WEB-INF/project-overview.jsp index 017dc20c7..955c32a36 100644 --- a/src/web/WEB-INF/project-overview.jsp +++ b/src/web/WEB-INF/project-overview.jsp @@ -56,16 +56,16 @@ - - - - - - - + + + + + + + diff --git a/src/web/WEB-INF/projectPlanner.jsp b/src/web/WEB-INF/projectPlanner.jsp index 42cb2d2d6..1c7f7896f 100644 --- a/src/web/WEB-INF/projectPlanner.jsp +++ b/src/web/WEB-INF/projectPlanner.jsp @@ -34,59 +34,59 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + diff --git a/src/web/WEB-INF/report/dashboard-billing-cost-report.jsp b/src/web/WEB-INF/report/dashboard-billing-cost-report.jsp index 9b0b4b334..bade6bbd2 100644 --- a/src/web/WEB-INF/report/dashboard-billing-cost-report.jsp +++ b/src/web/WEB-INF/report/dashboard-billing-cost-report.jsp @@ -64,16 +64,16 @@ - + - - - - - + + + + + diff --git a/src/web/WEB-INF/report/dashboard-client-user-stats-report.jsp b/src/web/WEB-INF/report/dashboard-client-user-stats-report.jsp index 32f3a15c0..66d80e46d 100644 --- a/src/web/WEB-INF/report/dashboard-client-user-stats-report.jsp +++ b/src/web/WEB-INF/report/dashboard-client-user-stats-report.jsp @@ -26,7 +26,7 @@ - + diff --git a/src/web/WEB-INF/report/dashboard-cost-report.jsp b/src/web/WEB-INF/report/dashboard-cost-report.jsp index a2b123ac5..9f38a9bc4 100644 --- a/src/web/WEB-INF/report/dashboard-cost-report.jsp +++ b/src/web/WEB-INF/report/dashboard-cost-report.jsp @@ -58,17 +58,17 @@ - + - - - - - - + + + + + + diff --git a/src/web/WEB-INF/report/dashboard-participation-report.jsp b/src/web/WEB-INF/report/dashboard-participation-report.jsp index 0d71b34f8..7e63252a7 100644 --- a/src/web/WEB-INF/report/dashboard-participation-report.jsp +++ b/src/web/WEB-INF/report/dashboard-participation-report.jsp @@ -10,7 +10,7 @@ - - Added a new option "Contest" to the "View By" dropdown list. - - Added two new columns "Checkpoint Submissions" and "Final Submissions" to the table for all view type. - - Split the "Aggregation Participation Metrics Report" table into multiple tables to support sorting and pagination. - - - Show indicator when “Customer Name” or “Billing Account” has been changed. + - - Show indicator when ???Customer Name??? or ???Billing Account??? has been changed. - - Version 1.3 (Release Assembly - TopCoder Cockpit Direct UI Text and Layout Bugs Termination 1.0) - - Update layout to fix a layout issue. @@ -38,9 +38,9 @@ - - - + + + diff --git a/src/web/WEB-INF/report/dashboard-pipeline.jsp b/src/web/WEB-INF/report/dashboard-pipeline.jsp index e2bfece81..fd2c36d23 100644 --- a/src/web/WEB-INF/report/dashboard-pipeline.jsp +++ b/src/web/WEB-INF/report/dashboard-pipeline.jsp @@ -43,14 +43,14 @@ - + - - - + + + - - + + diff --git a/src/web/WEB-INF/report/platform-specialist-report.jsp b/src/web/WEB-INF/report/platform-specialist-report.jsp index b46eb1210..508aef585 100644 --- a/src/web/WEB-INF/report/platform-specialist-report.jsp +++ b/src/web/WEB-INF/report/platform-specialist-report.jsp @@ -20,7 +20,7 @@ diff --git a/src/web/WEB-INF/setting/notifications.jsp b/src/web/WEB-INF/setting/notifications.jsp index 8b0477f8b..bfcd16e3e 100644 --- a/src/web/WEB-INF/setting/notifications.jsp +++ b/src/web/WEB-INF/setting/notifications.jsp @@ -23,16 +23,16 @@ - + - - - - + + + + - - - + + + - - - - - - + + + + + + + + - + + + diff --git a/src/web/WEB-INF/studio-submissions-single.jsp b/src/web/WEB-INF/studio-submissions-single.jsp index d1c55972e..f6518fc94 100644 --- a/src/web/WEB-INF/studio-submissions-single.jsp +++ b/src/web/WEB-INF/studio-submissions-single.jsp @@ -46,13 +46,13 @@ - - - - - - - + + + + + + +