From ec7b58d8d011e4528dc676cd7edb62984a27daf0 Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Tue, 5 Jan 2016 17:32:36 -0800 Subject: [PATCH 1/4] Add label and width to font dropdown and width to rank input --- app/submissions/submit-file/submit-file.jade | 2 ++ assets/css/submissions/submit-file.scss | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/app/submissions/submit-file/submit-file.jade b/app/submissions/submit-file/submit-file.jade index 0ba83fa04..fac551ac8 100644 --- a/app/submissions/submit-file/submit-file.jade +++ b/app/submissions/submit-file/submit-file.jade @@ -112,6 +112,8 @@ .form-block__fields .fieldsets ng-form.fieldset(name="font{{$index + 1}}", ng-repeat="font in vm.submissionForm.fonts track by font.id") + label.tc-label Font Source + dropdown( name="'font-source{{$index + 1}}'", options="vm.fontList{{$index + 1}}", diff --git a/assets/css/submissions/submit-file.scss b/assets/css/submissions/submit-file.scss index 11c5689ed..0e3fdbfff 100644 --- a/assets/css/submissions/submit-file.scss +++ b/assets/css/submissions/submit-file.scss @@ -34,5 +34,11 @@ } .submitterRank { + width: 100px; margin-top: 10px; } + +.Select { + max-width: 300px; + margin-bottom: 20px; +} From ebbd3a0c262afd4a7cf4c5867d66860a2765f248 Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Tue, 5 Jan 2016 17:46:20 -0800 Subject: [PATCH 2/4] Add back link for devices page --- app/submissions/submit-file/submit-file.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/submissions/submit-file/submit-file.jade b/app/submissions/submit-file/submit-file.jade index fac551ac8..4e99a3be6 100644 --- a/app/submissions/submit-file/submit-file.jade +++ b/app/submissions/submit-file/submit-file.jade @@ -4,9 +4,9 @@ .mobile-redirect__body p Our team is working hard on new features, and file upload currently only works on the web. Please open this page on your desktop if you want to create a submission. - a Learn more about formatting your submission file + a(ng-href="TODO: Need Link") Learn more about formatting your submission file - a.tc-btn.tc-btn-s(ng-click="'TODO: go back to challenge details'") Back to Challenge Details + a.tc-btn.tc-btn-s(ng-href="https://www.{{DOMAIN}}/challenge-details/{{submissions.challengeId}}/?type={{submissions.track}}") Back to Challenge Details .panel-body form.form-blocks(name="submissionForm", role="form", ng-submit="submissionForm.$valid && vm.uploadSubmission()", novalidate) From b20914555401f116272ea677715d6899adc51a49 Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Tue, 5 Jan 2016 17:48:21 -0800 Subject: [PATCH 3/4] Add proper phaseTypes --- app/submissions/submissions.routes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/submissions/submissions.routes.js b/app/submissions/submissions.routes.js index 8e376b87b..a80987887 100644 --- a/app/submissions/submissions.routes.js +++ b/app/submissions/submissions.routes.js @@ -46,12 +46,12 @@ var isPhaseSubmission = _.some(challenge.currentPhases, function(phase) { if (phase.phaseStatus === 'Open') { if (phase.phaseType === 'Submission') { - phaseType = 'Submission'; + phaseType = 'SUBMISSION'; phaseId = phase.id; return true; } else if (phase.phaseType === 'Checkpoint Submission') { - phaseType = 'Checkpoint_Submission'; + phaseType = 'CHECKPOINT_SUBMISSION'; phaseId = phase.id; return true; } From 271bfd6ccb48818d77df25193d3d4de482c14a2c Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Wed, 6 Jan 2016 10:06:19 -0800 Subject: [PATCH 4/4] Make error messages correct width --- assets/css/submissions/submit-file.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/css/submissions/submit-file.scss b/assets/css/submissions/submit-file.scss index 0e3fdbfff..978edbea9 100644 --- a/assets/css/submissions/submit-file.scss +++ b/assets/css/submissions/submit-file.scss @@ -42,3 +42,7 @@ max-width: 300px; margin-bottom: 20px; } + +.tc-error-messages { + max-width: 500px; +}