Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 83234b8

Browse files
thabofletcherthabofletcher
committed
Merge pull request #94 from appirio-tech/qa
Release
2 parents 4529026 + 445e111 commit 83234b8

23 files changed

+350
-134
lines changed

‎Gruntfile.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ module.exports = function(grunt) {
4949
helpAppURL: grunt.option('help-app-url') || 'help.topcoder.com',
5050
forumsAppURL: grunt.option('forums-app-url') || 'forums.topcoder.com',
5151
swiftProgramId: grunt.option('swift-program-id') || 3445,
52+
swiftProgramURL: grunt.option('swift-program-url') || 'http://apple.topcoder.com',
5253

5354
// only used on wp setup
5455
useGz: grunt.option('use-gz') || false,
@@ -59,7 +60,7 @@ module.exports = function(grunt) {
5960
cbURL: grunt.option('cb-url') || 'https://coderbits.com',
6061

6162
blogRSSFeedURL: grunt.option('blog-rss-feed') || 'https://www.topcoder.com/feed/?post_type=blog',
62-
photoLinkBaseURL: grunt.option('photo-link-base') || 'http://community.topcoder.com',
63+
photoLinkBaseURL: grunt.option('photo-link-base') || 'https://www.topcoder.com',
6364

6465
marketingMessageMyDashURL: grunt.option('marketing-message-my-dash-url') || 'https://banners-r-us.herokuapp.com/serve?size=650x150'
6566
};

‎src/conf/build-dev.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
grunt --main-url=https://www.topcoder-dev.com --auth-main-url=topcoder-dev.auth0.com --auth-client-id=JFDo7HMkf0q2CkVFHojy3zHWafziprhT --auth-callback-url=https://www.topcoder-dev.com/reg2/callback.action --api-url=https://api.topcoder-dev.com/v2 --lc-url=https://dev-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://dev-lc1-discussion-service.herokuapp.com --lc-user-url=https://dev-lc1-user-service.herokuapp.com --lc-site-url=https://dev-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-dev.com --photo-link-base=http://community.topcoder-dev.com --review-app-url=software.topcoder-dev.com/review --help-app-url=help.topcoder-dev.com --forums-app-url=forums.topcoder-dev.com --swift-program-id=3445 --blog-rss-feed="https://www.topcoder-dev.com/feed/?post_type=blog" --api3-url=https://api.topcoder-dev.com/v3 --use-cdn=1 --use-min=1
1+
grunt --main-url=https://www.topcoder-dev.com --auth-main-url=topcoder-dev.auth0.com --auth-client-id=JFDo7HMkf0q2CkVFHojy3zHWafziprhT --auth-callback-url=https://www.topcoder-dev.com/reg2/callback.action --api-url=https://api.topcoder-dev.com/v2 --lc-url=https://dev-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://dev-lc1-discussion-service.herokuapp.com --lc-user-url=https://dev-lc1-user-service.herokuapp.com --lc-site-url=https://dev-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-dev.com --photo-link-base=https://www.topcoder-dev.com --review-app-url=software.topcoder-dev.com/review --help-app-url=help.topcoder-dev.com --forums-app-url=forums.topcoder-dev.com --swift-program-id=3445 --swift-program-url=http://apple.topcoder-dev.com --blog-rss-feed="https://www.topcoder-dev.com/feed/?post_type=blog" --api3-url=https://api.topcoder-dev.com/v3 --use-cdn=1 --use-min=1

‎src/conf/build-qa.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
grunt --main-url=https://www.topcoder-qa.com --auth-main-url=topcoder-qa.auth0.com --auth-client-id=EVOgWZlCtIFlbehkq02treuRRoJk12UR --auth-callback-url="https://www.topcoder-qa.com/reg2/callback.action" --api-url=https://api.topcoder-qa.com/v2 --lc-url=https://qa-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://qa-lc1-discussion-service.herokuapp.com --lc-user-url=https://qa-lc1-user-service.herokuapp.com --lc-site-url=https://qa-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-qa.com --photo-link-base=http://community.topcoder-qa.com --review-app-url=software.topcoder-qa.com/review --help-app-url=help.topcoder-qa.com --forums-app-url=forums.topcoder-qa.com --swift-program-id=3445 --blog-rss-feed="https://www.topcoder-qa.com/feed/?post_type=blog" --api3-url=https://api.topcoder-qa.com/v3 --use-cdn=1 --use-min=1
1+
grunt --main-url=https://www.topcoder-qa.com --auth-main-url=topcoder-qa.auth0.com --auth-client-id=EVOgWZlCtIFlbehkq02treuRRoJk12UR --auth-callback-url="https://www.topcoder-qa.com/reg2/callback.action" --api-url=https://api.topcoder-qa.com/v2 --lc-url=https://qa-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://qa-lc1-discussion-service.herokuapp.com --lc-user-url=https://qa-lc1-user-service.herokuapp.com --lc-site-url=https://qa-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-qa.com --photo-link-base=https://www.topcoder-qa.com --review-app-url=software.topcoder-qa.com/review --help-app-url=help.topcoder-qa.com --forums-app-url=forums.topcoder-qa.com --swift-program-id=3445 --swift-program-url=http://apple.topcoder-qa.com --blog-rss-feed="https://www.topcoder-qa.com/feed/?post_type=blog" --api3-url=https://api.topcoder-qa.com/v3 --use-cdn=1 --use-min=1

‎src/conf/tc-nginx.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ server {
7070
}
7171

7272
location ~ ^/fonts/ {
73-
add_header 'Access-Control-Allow-Origin' "$http_origin" always;
73+
add_header 'Access-Control-Allow-Origin' "$http_origin";
7474
add_header 'Access-Control-Allow-Headers' "Content-Type,Accept,Origin,User-Agent,DNT,Cache-Control,X-Mx-ReqToken,Keep-Alive,X-Requested-With,If-Modified-Since" always;
7575
root $root_base/dist;
7676
}

‎src/css/base.css‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,24 @@ sub, sup {
215215
margin-bottom: 5px;
216216
}
217217

218+
.margin-left-1x {
219+
margin-left: 5px;
220+
}
221+
222+
.margin-right-1x {
223+
margin-right: 5px;
224+
}
225+
218226
.margin-vert-1x {
219227
margin-top: 5px;
220228
margin-bottom: 5px;
221229
}
222230

231+
.margin-vert-2x {
232+
margin-top: 10px;
233+
margin-bottom: 10px;
234+
}
235+
223236
.margin-top-2x {
224237
margin-top: 10px;
225238
}

‎src/css/my-dashboard.css‎

Lines changed: 84 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,12 @@
223223
}
224224

225225
.member-program-content .panel-body {
226-
/*background: -webkit-linear-gradient(360deg, rgb(15, 16, 31), rgb(101,220,85), rgb(164, 13, 62));*/
227226
height: 377px;
228-
/*margin-left: 50px;*/
229227
overflow: hidden;
230-
background: url('../i/swift_background_hpattern.jpg') repeat-x center center;
231-
color: #eeeeee;
228+
}
229+
230+
.member-program-content img[rel="program-logo"] {
231+
height: 80px;
232232
}
233233

234234
.member-program-content .display-image {
@@ -241,8 +241,7 @@
241241
}
242242

243243
.member-program-content .description {
244-
/*float: left;
245-
width: 50%;*/
244+
text-align: justify;
246245
}
247246

248247
.member-program-content .signup {
@@ -257,54 +256,66 @@
257256
.member-program-content *[rel="badges"] *[rel="badge"] div[rel="image"] {
258257
min-width: 30px;
259258
min-height: 30px;
260-
background-size: cover;
259+
background-image: url('../i/member-program/sprite.png');
260+
background-repeat: no-repeat;
261+
zoom: 0.5;
261262
}
262263

263-
.member-program-content *[rel="badges"] *[rel="badge"].badge1 div[rel="image"] {
264-
background-image: url("../i/member-program/get-ready-48.png");
265-
background-repeat: no-repeat;
264+
.member-program-content *[rel="badges"] *[rel="badge"].participant div[rel="image"] {
265+
background-position: -112px 0px;
266+
width: 76px;
267+
height: 76px;
266268
}
267269

268-
.member-program-content *[rel="badges"] *[rel="badge"].badge2 div[rel="image"] {
269-
background-image: url("../i/member-program/step-one-48.png");
270-
background-repeat: no-repeat;
270+
.member-program-content *[rel="badges"] *[rel="badge"].education div[rel="image"] {
271+
background-position: -112px -78px;
272+
width: 74px;
273+
height: 74px;
271274
}
272275

273-
.member-program-content *[rel="badges"] *[rel="badge"].badge3 div[rel="image"] {
274-
background-image: url("../i/member-program/getting-ready-48.png");
275-
background-repeat: no-repeat;
276+
.member-program-content *[rel="badges"] *[rel="badge"].peer div[rel="image"] {
277+
background-position: 0px -83px;
278+
width: 66px;
279+
height: 90px;
276280
}
277281

278-
.member-program-content *[rel="badges"] *[rel="badge"].badge4 div[rel="image"] {
279-
background-image: url("../i/member-program/on-starting-line-48.png");
280-
background-repeat: no-repeat;
282+
.member-program-content *[rel="badges"] *[rel="badge"].challenge div[rel="image"] {
283+
background-position: -190px -76px;
284+
width: 54px;
285+
height: 74px;
281286
}
282287

283-
.member-program-content *[rel="badges"] *[rel="badge"].badge5 div[rel="image"] {
284-
background-image: url("../i/member-program/break-the-finish-48.png");
285-
background-repeat: no-repeat;
288+
.member-program-content *[rel="badges"] *[rel="badge"].high-performer div[rel="image"] {
289+
background-position: -190px 0px;
290+
width: 63px;
291+
height: 74px;
286292
}
287293

288-
.member-program-content *[rel="badges"] *[rel="badge"].badge6 div[rel="image"] {
289-
background-image: url("../i/member-program/get-certified-48.png");
290-
background-repeat: no-repeat;
294+
.member-program-content *[rel="badges"] *[rel="badge"].custom div[rel="image"] {
295+
background-position: 0px -175px;
296+
width: 64px;
297+
height: 64px;
291298
}
292299

293300
.member-program-content *[rel="badges"] *[rel="badge"] div[rel="name"] {
294-
margin-top: 5px;
295301
margin-left: 5px;
302+
line-height: 37px; /* sync with height of the badge images */
296303
}
297304

298305
.member-program-content *[rel="badges"] *[rel="badge-status"] {
299-
padding-left: 20px;
300-
margin-top: 5px;
306+
line-height: 37px; /* sync with height of the badge images */
307+
}
308+
.member-program-content *[rel="badges"] *[rel="badge-status"] *[rel="image"] {
309+
width: 20px;
310+
height: 20px;
311+
margin-top: 8px; /* (height(badge) - height(checkbox)) / 2 = (37 - 20)/2 */
301312
}
302313

303-
.member-program-content *[rel="badges"] *[rel="badge-status"].pending {
314+
.member-program-content *[rel="badges"] *[rel="badge-status"].pending *[rel="image"] {
304315
background: url("../i/check-box.png") no-repeat 0 0px;
305316
}
306317

307-
.member-program-content *[rel="badges"] *[rel="badge-status"].completed {
318+
.member-program-content *[rel="badges"] *[rel="badge-status"].completed *[rel="image"] {
308319
background: url("../i/check-box.png") no-repeat 0 -20px;
309320
}
310321

@@ -360,8 +371,30 @@
360371
background: url("../i/ico-track-design.png") no-repeat center center;
361372
}
362373

363-
.my-challenges th {
374+
.my-challenges table > thead > tr > th {
364375
text-align: center;
376+
white-space: nowrap;
377+
padding-left: 13px;
378+
padding-right: 13px;
379+
}
380+
381+
.my-challenges th .sort,
382+
.my-challenges th .sort-icon-place {
383+
width: 100%;
384+
height: 12px;
385+
386+
}
387+
388+
.my-challenges th[rel="sortable"] {
389+
cursor: pointer;
390+
}
391+
392+
.my-challenges th .sort.asc {
393+
background: #f5f5f5 url("../i/sort-arrows.png") no-repeat center -94px;
394+
}
395+
396+
.my-challenges th .sort.desc {
397+
background: #f5f5f5 url("../i/sort-arrows.png") no-repeat center 6px;
365398
}
366399

367400
.my-challenges table > tbody> tr > td {
@@ -376,6 +409,7 @@
376409

377410
.my-challenges td[rel="challenge-name"] {
378411
text-align: left;
412+
/*max-width: 320px;*/
379413
}
380414

381415
.my-challenges td[rel="challenge-name"] > a {
@@ -403,6 +437,25 @@
403437
text-align: center;
404438
}
405439

440+
.upcoming-srms-div th .sort,
441+
.upcoming-srms-div th .sort-icon-place {
442+
width: 100%;
443+
height: 12px;
444+
445+
}
446+
447+
.upcoming-srms-div th[rel="sortable"] {
448+
cursor: pointer;
449+
}
450+
451+
.upcoming-srms-div th .sort.asc {
452+
background: #f5f5f5 url("../i/sort-arrows.png") no-repeat center -94px;
453+
}
454+
455+
.upcoming-srms-div th .sort.desc {
456+
background: #f5f5f5 url("../i/sort-arrows.png") no-repeat center 6px;
457+
}
458+
406459
.upcoming-srms-div table > tbody> tr > td {
407460
padding-top: 20px;
408461
padding-bottom: 20px;

‎src/js/app/challenge-details/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,14 +381,14 @@ <h3>Challenge Links:</h3>
381381
Scorecard</a></p>
382382

383383
<p ng-show="!CD.isDesign && CD.challenge.reviewScorecardId"><a
384-
href="http://software.topcoder.com/review/actions/ViewScorecard.do?method=viewScorecard&scid={{CD.challenge.reviewScorecardId}}">Review
384+
href="{{CD.reviewScorecardLink}}" target="_blank">Review
385385
Scorecard</a></p>
386386
</div>
387387

388388
</div>
389389

390390
</li>
391-
<li ng-hide="CD.isDesign" class="slide">
391+
<li ng-hide="CD.isDesign || CD.isPeerReviewed" class="slide">
392392

393393
<div class="umltoolLinks slideBox">
394394
<h3>Get the UML Tool:</h3>

‎src/js/app/challenge-details/js/controllers/challenge-details-controller.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@
237237

238238
// Global variable available from ng-page-challenge-details.php
239239
challengeName = challenge.challengeName;
240+
var reviewScorecardId = challenge.reviewScorecardId;
240241
vm.isDesign = (challengeType === 'design');
241242
vm.allowDownloads = challenge.currentPhaseName === 'Registration' || challenge.currentPhaseName === 'Submission';
242243

@@ -363,9 +364,11 @@
363364
if (vm.challenge.reviewType == 'PEER') {
364365
vm.reviewStyle = 'Peer Review';
365366
vm.reviewStyleTooltip = 'Your peers performs a thorough review based on scorecards.';
367+
vm.reviewScorecardLink = '/reviews/index.html#/scorecard/' + reviewScorecardId;
366368
} else {
367369
vm.reviewStyle = 'Community Review Board';
368370
vm.reviewStyleTooltip = 'Community Review Board performs a thorough review based on scorecards.';
371+
vm.reviewScorecardLink = 'http://software.topcoder.com/review/actions/ViewScorecard.do?method=viewScorecard&scid=' + reviewScorecardId;
369372
}
370373

371374
vm.hasCheckpoints = vm.numCheckpointSubmissions > 0;

‎src/js/app/challenge-details/partials/ng-content-challenge-topsection.tpl.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div rel="action" ng-bind="CD.phaseProgram.nextStepAction" class="margin-top-2x"></div>
66
</div>
77
<div rel="badge">
8-
<h5 rel="title" class="center-align-text">Recognition Award</h5>
8+
<h5 rel="title" class="center-align-text">Peer Review Award</h5>
99
<img ng-src="{{CD.phaseProgram.nextBadgeImg}}" alt="{{CD.phaseProgram.nextBadgeTitle}}" />
1010
</div>
1111
<div class="clear"></div>

‎src/js/app/my-dashboard/app.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
.constant("HELP_APP_URL", tcconfig.helpAppURL)
3232
.constant("PHOTO_LINK_LOCATION", tcconfig.photoLinkBaseURL)
3333
.constant('SWIFT_PROGRAM_ID', tcconfig.swiftProgramId)
34+
.constant('SWIFT_PROGRAM_URL', tcconfig.swiftProgramURL)
3435
.factory('Restangular3', Restangular3)
3536
.run(['$rootScope', '$location', '$window', 'AuthService', run]);
3637

0 commit comments

Comments
 (0)