diff --git a/Gruntfile.js b/Gruntfile.js index 41cbd846..aa14ec15 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -52,6 +52,7 @@ module.exports = function(grunt) { swiftProgramId: grunt.option('swift-program-id') || 3445, swiftProgramURL: grunt.option('swift-program-url') || 'http://ios.topcoder.com', arenaURL: grunt.option('arena-url') || '//arena.topcoder.com', + accountAppURL: grunt.option('account-app-url') || 'https://accounts.topcoder.com/member', // only used on wp setup useGz: grunt.option('use-gz') || false, diff --git a/config.json b/config.json index 5b8e682b..a264c55b 100644 --- a/config.json +++ b/config.json @@ -13,5 +13,6 @@ "useMin": true, "useCND": false, "myFiltersURL": "https://staging-user-settings-service.herokuapp.com", - "cbURL": "https://coderbits.com" + "cbURL": "https://coderbits.com", + "accountAppURL": "https://accounts.topcoder.com/member" } \ No newline at end of file diff --git a/src/analytics.html b/src/analytics.html index 6c28fb3c..480a6740 100644 --- a/src/analytics.html +++ b/src/analytics.html @@ -1,26 +1,3 @@ - - - - - - - - - - - - - - - - - - - @@ -293,7 +264,7 @@ function getHashParameterByName(name, source) { { 'href': '/community/design/', 'text': 'DESIGN', 'icon': '/mf/i/nav/book-design.svg' }, { 'href': '/community/development/', 'text': 'DEVELOPMENT', 'icon': '/mf/i/nav/book-develop.svg' }, { 'href': '/community/data-science/', 'text': 'DATA SCIENCE', 'icon': '/mf/i/nav/book-data.svg' }, - { 'href': '/community/competitive%20programming/', 'text': 'COMPETITIVE PROGRAMMING', 'icon': '/mf/i/nav/book-cp.svg' }, + { 'href': '/community/competitive-programming/', 'text': 'COMPETITIVE PROGRAMMING', 'icon': '/mf/i/nav/book-cp.svg' }, ], 'community': [ { 'href': '/community/members/', 'text': 'OVERVIEW', 'icon': '/mf/i/nav/members.svg' }, @@ -318,7 +289,11 @@ function getHashParameterByName(name, source) { } vm.login = function() { - window.location.href = "/login?next=" + encodeURIComponent(window.location.href); + window.location.href = tcconfig.accountAppURL + "?next=" + encodeURIComponent(window.location.href); + } + + vm.join = function() { + window.location.href = tcconfig.accountAppURL + '/registration?next=' + encodeURIComponent(window.location.href); } vm.logout = function() { diff --git a/wp/wp-content/themes/tcs-responsive/i/banner-tco-data.svg b/wp/wp-content/themes/tcs-responsive/i/banner-tco-data.svg new file mode 100644 index 00000000..7f35538e --- /dev/null +++ b/wp/wp-content/themes/tcs-responsive/i/banner-tco-data.svg @@ -0,0 +1,17 @@ + + + + banner-data + Created with Sketch. + + + + + + + + TCO + \ No newline at end of file diff --git a/wp/wp-content/themes/tcs-responsive/ng-page-challenge-details.php b/wp/wp-content/themes/tcs-responsive/ng-page-challenge-details.php index cf939246..83e549d8 100644 --- a/wp/wp-content/themes/tcs-responsive/ng-page-challenge-details.php +++ b/wp/wp-content/themes/tcs-responsive/ng-page-challenge-details.php @@ -145,14 +145,17 @@ function tc_challenge_details_js() {

Platforms

- +
+ +
+
diff --git a/wp/wp-content/themes/tcs-responsive/ng-page-challenges.php b/wp/wp-content/themes/tcs-responsive/ng-page-challenges.php index 88afbbae..e619af51 100644 --- a/wp/wp-content/themes/tcs-responsive/ng-page-challenges.php +++ b/wp/wp-content/themes/tcs-responsive/ng-page-challenges.php @@ -578,7 +578,13 @@ class="ngHeaderCell" ng-header-cell> diff --git a/wp/wp-content/themes/tcs-responsive/page-challenge-details.php b/wp/wp-content/themes/tcs-responsive/page-challenge-details.php index acf3fd1f..e3a081fc 100644 --- a/wp/wp-content/themes/tcs-responsive/page-challenge-details.php +++ b/wp/wp-content/themes/tcs-responsive/page-challenge-details.php @@ -207,7 +207,7 @@ class="contestForumIcon" target="_blank">Challenge Discussion
-

Final Submission Guidelines

+

Final Submission Guidelines

finalSubmissionGuidelines; ?> @@ -220,7 +220,7 @@ class="contestForumIcon" target="_blank">Challenge Discussion will be made at the closure of the approval phase. The second payment will be made at the completion of the support period.

-

Reliability Rating and Bonus

+

Reliability Rating and Bonus

For challenges that have a reliability bonus, the bonus depends on the reliability rating at the moment of registration for that project. A participant with no previous projects is @@ -389,7 +389,7 @@ class="contestForumIcon" target="_blank">Challenge Discussion will be made at the closure of the approval phase. The second payment will be made at the completion of the support period.

-

Reliability Rating and Bonus

+

Reliability Rating and Bonus

For challenges that have a reliability bonus, the bonus depends on the reliability rating at the moment of registration for that project. A participant with no previous projects is @@ -791,7 +791,7 @@ class="contestForumIcon" target="_blank">Challenge Discussion class="tip reviewStyleTip tipFinalReview" style="display: none;">

-

Final Review

+

Final Review

Community Review Board performs a thorough review based on scorecards.