From e3ebdb3f9e6a0117610f129c2fc364eb71e1dacd Mon Sep 17 00:00:00 2001 From: Ira Globus-Harris Date: Mon, 22 Jul 2019 16:16:02 -0400 Subject: [PATCH 1/2] added training banner --- client/app/controllers/clientController.js | 4 +++- client/app/helper/drop_sheet.js | 3 ++- client/index.html | 6 +++++ client/styles/style.css | 26 +++++++++++++++++---- server/config/bwwcTraining.json | 27 ++++++++++++++++++++++ server/config/config.js | 2 +- 6 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 server/config/bwwcTraining.json diff --git a/client/app/controllers/clientController.js b/client/app/controllers/clientController.js index 92deac28..b322b5b1 100755 --- a/client/app/controllers/clientController.js +++ b/client/app/controllers/clientController.js @@ -18,7 +18,9 @@ define(['jquery', 'controllers/tableController', 'controllers/jiffController', ' /** * Error messages definitions */ - var SUCCESS_MESSAGE = 'Thank you for participating in the data submission! If you discover that there was an error in your submission, you may correct your data, revist this page, and submit your data again.'; + + var SUCCESS_MESSAGE = "Thank you for participating in the data submission! If you discover that there was an error " + + "in your submission, you may correct your data, revisit this page, and submit your data again."; var SESSION_KEY_ERROR = 'Invalid session number'; var PARTICIPATION_CODE_ERROR = 'Invalid participation code'; diff --git a/client/app/helper/drop_sheet.js b/client/app/helper/drop_sheet.js index 833771f3..4cca81e6 100755 --- a/client/app/helper/drop_sheet.js +++ b/client/app/helper/drop_sheet.js @@ -151,7 +151,8 @@ define(['alertHandler', 'XLSX'], function (alertHandler) { throw 'Spreadsheet name does not match with format.' } } - alertHandler.success('The tables below have been populated. Please confirm that your data is accurate and scroll down to answer the multiple choice questions, verify, and submit your data'); + + alertHandler.success('The tables below have been populated. Please verify that your data is accurate and scroll down to submit your data'); } diff --git a/client/index.html b/client/index.html index 7d2c023b..054af447 100755 --- a/client/index.html +++ b/client/index.html @@ -45,6 +45,12 @@
+ {% if client.banner_text %} + + {% endif %} +

{{ client.organization }}
{{ client.subtitle }} diff --git a/client/styles/style.css b/client/styles/style.css index 3a0e9216..0c1972c8 100755 --- a/client/styles/style.css +++ b/client/styles/style.css @@ -85,11 +85,11 @@ h1 { header, #shadow { - position: absolute; + position: relative; top: 0; left: 0; right: 0; - height: 170px; + /*height: 200px;*/ background: #fff; z-index: 2; } @@ -114,7 +114,7 @@ header #logos img:not(:first-child) { } #content { - margin-top: 270px; + margin-top: 200px; } .card { @@ -290,6 +290,10 @@ span.success { margin-top: 20px; } +#submit-text{ + display: none; +} + @media (min-width: 992px) and (max-width: 1200px) { h1 { font-size: 35px; @@ -344,7 +348,21 @@ span.success { bottom: -25px; z-index: 1; background: inherit; - box-shadow: -50px 50px 0 #fff, 50px -50px 0 #fff, 2px 2px 4px 0 rgba(170, 170, 170, .80), -48px 52px 4px 0 rgba(170, 170, 170, .80), 52px -48px 4px 0 rgba(170, 170, 170, .80); + box-shadow: -50px 50px 0 #ffffff, 50px -50px 0 #fff, 2px 2px 4px 0 rgba(170, 170, 170, .80), -48px 52px 4px 0 rgba(170, 170, 170, .80), 52px -48px 4px 0 rgba(170, 170, 170, .80); +} + +.banner { + /*position:absolute;*/ + background-color: #cb1821; + width: 100%; + text-align: center; + padding: 50px; + margin-bottom: 35px; +} + +.banner h1 { + text-shadow: 2px 2px #cb1821; + color: #FFFFFF } /* *** */ diff --git a/server/config/bwwcTraining.json b/server/config/bwwcTraining.json new file mode 100644 index 00000000..b70a9854 --- /dev/null +++ b/server/config/bwwcTraining.json @@ -0,0 +1,27 @@ +{ + "template": "../client/app/data/bwwc", + "MAX_SIZE": 10000, + + "webRootPath": "/tmp/acme-challenges", + "approveDomainsPattern": "^([A-Za-z0-9]+.)?100talent.org$", + "approveDomainsOpts": { + "domains": [ + "www.100talent.org", + "100talent.org" + ], + "email": "fjansen@bu.edu", + "agreeTos": true + }, + + "client": { + "table_template": "data/bwwc", + "organization": "Boston Women's Workforce Council", + "subtitle": "100% Talent Data Submission", + "logo": "images/bwwc.png", + "cohort": "Industry", + "session_key": "BWWC 2019 Submission ID", + "phone": "(617) 358-8517", + "email": "team@bostonwomensworkforcecouncil.org", + "banner_text": "TRAINING SESSION: Do not upload your companies' true salary data!" + } +} diff --git a/server/config/config.js b/server/config/config.js index 9b56370b..df03e07f 100644 --- a/server/config/config.js +++ b/server/config/config.js @@ -1,6 +1,6 @@ let deployment = process.env.WEBMPC_DEPLOYMENT; if (deployment === null || deployment === undefined) { - deployment = 'bwwc'; + deployment = 'bwwcTraining'; } module.exports = require('./' + deployment + '.json'); From 4e5e6d1ffc4819b8171ad7ddd55d241ddf870753 Mon Sep 17 00:00:00 2001 From: Ira Globus-Harris Date: Mon, 22 Jul 2019 16:19:53 -0400 Subject: [PATCH 2/2] reverting accidental changes --- client/app/controllers/clientController.js | 1 - client/styles/style.css | 4 ---- 2 files changed, 5 deletions(-) diff --git a/client/app/controllers/clientController.js b/client/app/controllers/clientController.js index b322b5b1..c60475d3 100755 --- a/client/app/controllers/clientController.js +++ b/client/app/controllers/clientController.js @@ -18,7 +18,6 @@ define(['jquery', 'controllers/tableController', 'controllers/jiffController', ' /** * Error messages definitions */ - var SUCCESS_MESSAGE = "Thank you for participating in the data submission! If you discover that there was an error " + "in your submission, you may correct your data, revisit this page, and submit your data again."; var SESSION_KEY_ERROR = 'Invalid session number'; diff --git a/client/styles/style.css b/client/styles/style.css index 0c1972c8..24b5f426 100755 --- a/client/styles/style.css +++ b/client/styles/style.css @@ -290,10 +290,6 @@ span.success { margin-top: 20px; } -#submit-text{ - display: none; -} - @media (min-width: 992px) and (max-width: 1200px) { h1 { font-size: 35px;