Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added training version of page #174

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added training version of page #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3ebdb3
added training banner
Jul 22, 2019
4e5e6d1
reverting accidental changes
Jul 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion client/app/controllers/clientController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ 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';

Expand Down
3 changes: 2 additions & 1 deletion client/app/helper/drop_sheet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}


Expand Down
6 changes: 6 additions & 0 deletions client/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@
<body>

<header>
{% if client.banner_text %}
<div class="banner">
<h1> {{client.banner_text}} </h1>
</div>
{% endif %}

<div class="container">
<h1>{{ client.organization }}<br/>
<small> {{ client.subtitle }}</small>
Expand Down
22 changes: 18 additions & 4 deletions client/styles/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -114,7 +114,7 @@ header #logos img:not(:first-child) {
}

#content {
margin-top: 270px;
margin-top: 200px;
}

.card {
Expand Down Expand Up @@ -344,7 +344,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
}

/* *** */
Expand Down
27 changes: 27 additions & 0 deletions server/config/bwwcTraining.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": "[email protected]",
"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": "[email protected]",
"banner_text": "TRAINING SESSION: Do not upload your companies' true salary data!"
}
}
2 changes: 1 addition & 1 deletion server/config/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
let deployment = process.env.WEBMPC_DEPLOYMENT;
if (deployment === null || deployment === undefined) {
deployment = 'bwwc';
deployment = 'bwwcTraining';
}

module.exports = require('./' + deployment + '.json');