Merge commit '2b5b3009a8538ec717fda4a2f780100d72a5f3f7' into HEAD

Jenkins Continuous Integration Server · Jenkins Continuous Integration Server · commit d02e650bbc65 · 2016-09-01T23:48:02.000Z
diff --git a/app/my-dashboard/my-dashboard.jade b/app/my-dashboard/my-dashboard.jade
@@ -7,6 +7,12 @@
 
   //- .ttl
   //-   tc-banner(theme="black", banner-name="ttl")
+  .tco.tco17
+    .tc-banner-placeholder.black.bg-image
+      .title 2017 Topcoder Open
+      .subtitle The Ultimate Programming & Design tournament
+      .description Earn your way to the USA!
+      a(href="http://tco17.topcoder.com/").cta.tc-btn-white.tc-btn-radius Learn More
 
   .tco
     tc-banner(theme="black", banner-name="tco16")
diff --git a/app/services/nav.service.js b/app/services/nav.service.js
@@ -30,12 +30,12 @@ import angular from 'angular'
       ],
       'community': [
           { 'sref': 'community.members', 'text': 'OVERVIEW', 'icon': require('../../assets/images/nav/members.svg') },
-          { 'href': CONSTANTS.TCO16_URL, 'text': 'TCO16', 'icon': require('../../assets/images/nav/ico-tco16.svg'), 'target': '_blank' },
+          { 'href': CONSTANTS.TCO_HOME_URL, 'text': 'TCO', 'icon': require('../../assets/images/nav/tco-generic.svg'), 'target': '_blank' },
           { 'href': '/community/member-programs/', 'text': 'PROGRAMS', 'icon': require('../../assets/images/nav/programs.svg') },
           { 'href': CONSTANTS.FORUMS_APP_URL, 'text': 'FORUMS', 'icon': require('../../assets/images/nav/forums.svg') },
           { 'sref': 'community.statistics', 'text': 'STATISTICS', 'icon': require('../../assets/images/nav/statistics.svg') },
           { 'href': '/community/events/', 'text': 'EVENTS', 'icon': require('../../assets/images/nav/events.svg') },
-          { 'href': '/blog/', 'text': 'BLOG', 'icon': require('../../assets/images/nav/blog.svg') }
+          { 'href': '/blog/', 'text': 'BLOG', 'icon': require('../../assets/images/nav/blog.svg') } 
       ]
     }
 
diff --git a/app/topcoder.constants.js b/app/topcoder.constants.js
@@ -20,6 +20,8 @@ angular.module('CONSTANTS', []).constant('CONSTANTS', {
   'PHOTO_LINK_LOCATION'     : process.env.PHOTO_LINK_LOCATION,
   'SWIFT_PROGRAM_URL'       : process.env.SWIFT_PROGRAM_URL,
   'TCO16_URL'               : process.env.TCO16_URL,
+  'TCO17_URL'               : process.env.TCO17_URL,
+  'TCO_HOME_URL'            : process.env.TCO_HOME_URL,
   'ACCOUNTS_APP_URL'        : process.env.ACCOUNTS_APP_URL,
   'FILE_PICKER_API_KEY'     : process.env.FILE_PICKER_API_KEY,
   'FILE_PICKER_SUBMISSION_CONTAINER_NAME': process.env.FILE_PICKER_SUBMISSION_CONTAINER_NAME,
diff --git a/assets/css/directives/tc-banner.scss b/assets/css/directives/tc-banner.scss
@@ -3,6 +3,10 @@
 $tco-color: #F47A20;
 $tco-color-dark: #ea690b;
 
+.tco17 {
+  margin-bottom: 10px;
+}
+
 .tc-banner-placeholder {
   display: flex;
   flex-direction: column;
@@ -113,6 +117,11 @@ $tco-color-dark: #ea690b;
     color: $white;
   }
 
+  .subtitle {
+    @extend .title;
+    @include sofia-pro-regular;
+  }
+
   .description {
     color: $white;
   }
@@ -124,4 +133,41 @@ $tco-color-dark: #ea690b;
       }
     }
   }
+
+  .tc-btn-white {
+    background-color: white;
+    color: #0096FF;
+    padding: 10px 20px;
+    margin-top: 5px;
+  }
+
+  .tc-btn-radius {
+    border-radius: 26px;
+  }
+}
+.tc-banner-placeholder.bg-image {
+  background-image: url(../../images/home-hero.jpg);
+  background-size: 100%;
+  height: 352px;
+  background-position: center 40%;
+  background-repeat: no-repeat;
+
+  padding-top: 50px;
+  padding-right: 350px;
+
+  .title {
+    font-size: 36px;
+    margin-bottom: 5px;
+    margin-top: 10px;
+  }
+
+  .subtitle {
+    margin-top: 20px;
+    width: 450px;
+  }
+
+  .cta {
+    margin-top: 20px;
+  }
 }
+
diff --git a/assets/css/my-dashboard/my-dashboard.scss b/assets/css/my-dashboard/my-dashboard.scss
@@ -34,6 +34,7 @@
     }
   }
 
+
   .challenges, .srms, .programs, .tco, .ttl, .community-updates {
     padding-top: 0px;
   }
diff --git a/assets/images/home-hero.jpg b/assets/images/home-hero.jpg
diff --git a/assets/images/nav/tco-generic.svg b/assets/images/nav/tco-generic.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>nav/tco-generic</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="nav/tco-generic">
+            <path d="M4,7 L2,7 L2,21 L4,21 L4,23 L0,23 L0,5 L4,5 L4,7 Z M28,5 L32,5 L32,23 L28,23 L28,21 L30,21 L30,7 L28,7 L28,5 Z" id="[-]" fill="#FFFFFF"></path>
+            <g id="business-24px-outline_award-48" transform="translate(7.000000, 8.000000)" stroke-width="2" stroke="#FFFEFE">
+                <g id="Group">
+                    <polyline id="Shape" points="3.1 10.8 0 17.4 3.6 16.9 5.4 20 8.3 13.9"></polyline>
+                    <polyline id="Shape" points="14.9 10.8 18 17.4 14.4 16.9 12.6 20 9.7 13.9"></polyline>
+                    <circle id="Oval" cx="9" cy="7" r="7"></circle>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/assets/images/tco-generic.svg b/assets/images/tco-generic.svg

Original file line number	Diff line number	Diff line change
`@@ -30,12 +30,12 @@ import angular from 'angular'`
`30`	`30`	`],`
`31`	`31`	`'community': [`
`32`	`32`	`{ 'sref': 'community.members', 'text': 'OVERVIEW', 'icon': require('../../assets/images/nav/members.svg') },`
`33`		`- { 'href': CONSTANTS.TCO16_URL, 'text': 'TCO16', 'icon': require('../../assets/images/nav/ico-tco16.svg'), 'target': '_blank' },`
	`33`	`+ { 'href': CONSTANTS.TCO_HOME_URL, 'text': 'TCO', 'icon': require('../../assets/images/nav/tco-generic.svg'), 'target': '_blank' },`
`34`	`34`	`{ 'href': '/community/member-programs/', 'text': 'PROGRAMS', 'icon': require('../../assets/images/nav/programs.svg') },`
`35`	`35`	`{ 'href': CONSTANTS.FORUMS_APP_URL, 'text': 'FORUMS', 'icon': require('../../assets/images/nav/forums.svg') },`
`36`	`36`	`{ 'sref': 'community.statistics', 'text': 'STATISTICS', 'icon': require('../../assets/images/nav/statistics.svg') },`
`37`	`37`	`{ 'href': '/community/events/', 'text': 'EVENTS', 'icon': require('../../assets/images/nav/events.svg') },`
`38`		`- { 'href': '/blog/', 'text': 'BLOG', 'icon': require('../../assets/images/nav/blog.svg') }`
	`38`	`+ { 'href': '/blog/', 'text': 'BLOG', 'icon': require('../../assets/images/nav/blog.svg') }`
`39`	`39`	`]`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
	`37`	`+`
`37`	`38`	`.challenges, .srms, .programs, .tco, .ttl, .community-updates {`
`38`	`39`	`padding-top: 0px;`
`39`	`40`	`}`