diff --git a/conf/ApplicationServer.properties b/conf/ApplicationServer.properties index eb2ea5f6b..76c7d20a5 100644 --- a/conf/ApplicationServer.properties +++ b/conf/ApplicationServer.properties @@ -45,4 +45,6 @@ SSO_HASH_SECRET = @ApplicationServer.SSO_HASH_SECRET@ SSO_DOMAIN = @ApplicationServer.SSO_DOMAIN@ JWT_V3_COOKIE_KEY = @ApplicationServer.JWT_V3_COOKIE_KEY@ -JWT_COOKIE_KEY = @ApplicationServer.JWT_COOKIE_KEY@ \ No newline at end of file +JWT_COOKIE_KEY = @ApplicationServer.JWT_COOKIE_KEY@ + +TOPCODER_CONNECT_URL=@TopcoderConnectUrl@ \ No newline at end of file diff --git a/src/java/main/com/topcoder/direct/services/configs/ServerConfiguration.java b/src/java/main/com/topcoder/direct/services/configs/ServerConfiguration.java index b678e1b92..4fef7be92 100644 --- a/src/java/main/com/topcoder/direct/services/configs/ServerConfiguration.java +++ b/src/java/main/com/topcoder/direct/services/configs/ServerConfiguration.java @@ -58,4 +58,9 @@ public class ServerConfiguration extends ApplicationServer { public static String JWT_V3_COOKIE_KEY = bundle.getProperty("JWT_V3_COOKIE_KEY", "v3jwt"); public static String JWT_COOKIE_KEY = bundle.getProperty("JWT_COOKIE_KEY", "tcjwt"); + + /** + * The Topcoder Connect URL + */ + public static String TOPCODER_CONNECT_URL = bundle.getProperty("TOPCODER_CONNECT_URL", "https://connect.topcoder.com"); } diff --git a/src/web/WEB-INF/includes/newHeader.jsp b/src/web/WEB-INF/includes/newHeader.jsp index d7d66878f..d818ec6fc 100644 --- a/src/web/WEB-INF/includes/newHeader.jsp +++ b/src/web/WEB-INF/includes/newHeader.jsp @@ -25,15 +25,17 @@ - - Version 1.7 (TOPCODER - REMOVE TASKS TAB IN DIRECT APP) - - Remove tasks tab - - - - Version 1.4 (Quick72Hrs!! Topcoder - Remove VM Management Feature In Direct App version 1.0) - - remove the vm related things + - + - Version 1.4 (Quick72Hrs!! Topcoder - Remove VM Management Feature In Direct App version 1.0) + - remove the vm related things - - Description: The new cockpit header and navigation. --%> <%@ page import="com.topcoder.direct.services.configs.ServerConfiguration" %> <%@ include file="/WEB-INF/includes/taglibs.jsp" %> + +
@@ -132,7 +134,7 @@
  • - ">Start New + Start New
  • @@ -422,7 +424,7 @@ diff --git a/src/web/WEB-INF/includes/right.jsp b/src/web/WEB-INF/includes/right.jsp index 7dc8e8bbe..527e71ac6 100644 --- a/src/web/WEB-INF/includes/right.jsp +++ b/src/web/WEB-INF/includes/right.jsp @@ -32,16 +32,18 @@ - the data via ajax. - --%> +<%@ page import="com.topcoder.direct.services.configs.ServerConfiguration" %> <%@ include file="/WEB-INF/includes/taglibs.jsp" %> + +
    diff --git a/token.properties.docker b/token.properties.docker index 38c01e117..b455eed37 100644 --- a/token.properties.docker +++ b/token.properties.docker @@ -349,4 +349,7 @@ @aws_s3_secret_key@= @trialBillingId@ = -@defaultGroupIdForTrial@ = \ No newline at end of file +@defaultGroupIdForTrial@ = + +# The Topcoder Connect Url to which the projects creation will redirect +@TopcoderConnectUrl@=https://connect.topcoder-dev.com \ No newline at end of file diff --git a/token.properties.example b/token.properties.example index 9a6daba85..465d84f89 100644 --- a/token.properties.example +++ b/token.properties.example @@ -397,4 +397,7 @@ @authorizationUrl@=http://api.topcoder-dev.com/v3/authorizations @userGroupsApiEndpoint@=http://172.18.0.1:8080/v3/groups @trialBillingId@ = 3 -@defaultGroupIdForTrial@ = 12347 \ No newline at end of file +@defaultGroupIdForTrial@ = 12347 + +# The Topcoder Connect Url to which the projects creation will redirect +@TopcoderConnectUrl@=https://connect.topcoder.com \ No newline at end of file