Skip to content

Commit

Permalink
Merge pull request #125 from bullhorn/f/oscp-v-2-0-1
Browse files Browse the repository at this point in the history 
Version 2.0.1
  • Loading branch information
@krsween
krsween authored Apr 17, 2017
2 parents 37e88fa + cf5c236 commit 8e272d0
Show file tree
Hide file tree
Showing 8 changed files with 87 additions and 149 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ reports/
.DS_Store
.idea
.vs/
.settings/
.settings/
5 changes: 3 additions & 2 deletions bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "CareerPortal",
"version": "1.6.0",
"version": "2.0.1",
"dependencies": {
"angular": "~1.5.8",
"angular-animate": "~1.5.8",
Expand All @@ -15,7 +15,8 @@
"roboto-fontface": "~0.5.0",
"angular-ui-router": "^0.3.1",
"ng-fastclick": "^1.0.2",
"ng-file-upload": "^12.2.12"
"ng-file-upload": "^12.2.12",
"angular-cookies": "1.5.8"
},
"devDependencies": {
"angular-mocks": "~1.5.8"
Expand Down
9 changes: 1 addition & 8 deletions build/build.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ var $ = require('gulp-load-plugins')({
'gulp-uglify',
'del',
'gulp-size',
'gulp-rev-replace',
'gulp-rev',
'gulp-useref',
'gulp-minify-css',
'gulp-minify-html'
Expand All @@ -43,9 +41,6 @@ gulp.task('partials', function () {

var wiredep = require('wiredep').stream;




gulp.task('html', ['inject', 'partials'], function () {
var partialsInjectFile = gulp.src(path.join(conf.paths.tmp, '/partials/templateCacheHtml.js'), {read: false});
var partialsInjectOptions = {
Expand All @@ -68,8 +63,6 @@ gulp.task('html', ['inject', 'partials'], function () {
.pipe(cssFilter)
.pipe($.minifyCss({cache: true}))
.pipe(cssFilter.restore)
.pipe($.rev())
.pipe($.revReplace())
.pipe(htmlFilter)
.pipe($.minifyHtml({
empty: true,
Expand All @@ -94,7 +87,7 @@ gulp.task('fonts', function () {
return gulp.src($.mainBowerFiles())
.pipe($.filter('**/*.{eot,svg,ttf,woff,woff2}'))
.pipe($.flatten())
.pipe(gulp.dest(path.join(conf.paths.dist, '/fonts/')));
.pipe(gulp.dest(path.join(conf.paths.dist, '/fonts/roboto/')));
});

gulp.task('other', ['config:app'], function () {
Expand Down
4 changes: 1 addition & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "CareerPortal",
"version": "2.0.0",
"version": "2.0.1",
"scripts": {
"loc": "sloc src/ --format json > ./reports/sloc.json",
"pregalaxy": "npm run loc",
Expand Down Expand Up @@ -31,8 +31,6 @@
"gulp-protractor": "~3.0.0",
"gulp-rename": "~1.2.2",
"gulp-replace": "~0.5.4",
"gulp-rev": "~7.1.2",
"gulp-rev-replace": "~0.4.2",
"gulp-sass": "~2.3.2",
"gulp-size": "~2.1.0",
"gulp-sourcemaps": "~1.7.0",
Expand Down
43 changes: 13 additions & 30 deletions src/app/modal/modal.controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ class CareerPortalModalController {
this.locale = locale;

// Variables
this.isToolTipHidden = true;
this.currentToolTip = 0;
this.APPLIED_JOBS_KEY = APPLIED_JOBS_KEY;
this.isLinkedInActive = VerifyLI.verified;
// Create a local variable to store user's email address for sendEmailLink
Expand Down Expand Up @@ -123,39 +125,20 @@ class CareerPortalModalController {
return true;
}

getTooltipText() {
let tooltip = '<ul>';
this.configuration.acceptedResumeTypes.forEach(function (type) {
tooltip += '<li>' + type + '</li>';
});
tooltip += '</ul>';
return tooltip;
}

getEEOCTooltipText(eeocSection) {
var tooltip;
if (this.configuration.eeoc && this.configuration.eeoc[eeocSection]) {
tooltip = this.configuration.eeoc[eeocSection].tooltip.html;
} else if (this.configuration.eeoc) {
tooltip = this.configuration.eeoc.tooltip.html;
} else {
tooltip = '';
showTooltip(toolTipType) {
// 0: FileTypes
// 1: EEOC Gender, Race, Ethnicity
// 2: EEOC Race/Ethnicity
// 3: EEOC Veteran
// 4: EEOC Disability
if (toolTipType) {
this.isToolTipHidden = false;
this.currentToolTip = toolTipType;
}
return tooltip.replace(/\{companyName\}/g, this.configuration.companyName);
}

getEEOCEthnicityTooltipText() {
var tooltip = '';
if (this.configuration.eeoc) {
tooltip = '<ul>';
this.configuration.eeoc.ethnicity.options.forEach(function (option) {
if (option.info) {
tooltip += '<li>' + option.label + ': ' + option.info + '</li>';
}
});
tooltip += '</ul>';
}
return tooltip;
hideTooltip() {
this.isToolTipHidden = true;
}

formatResume(userProfile) {
Expand Down
83 changes: 40 additions & 43 deletions src/app/modal/modal.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,45 @@ <h3>{{ 'modal.successSubHeading' | i18n }}</h3>
<div class="form-field" data-ng-if="modal.hasAttemptedLIApply">
<textarea placeholder="{{ 'modal.skills' | i18n }}" name="resume-text" data-ng-model="modal.linkedInData.resume" id="resume-text" cols="30" rows="5" data-ng-minlength="number"></textarea>
</div>
<!-- TOOLTIP -->
<div class="tooltip-info" data-ng-show="!modal.isToolTipHidden">
<div class="tooltip-modal">
<div class="tooltip-info-closer">
<i class="bhi-close" data-ng-click="modal.hideTooltip()"></i>
</div>
<!-- FILE TYPE TOOL TIP -->
<div data-ng-if="modal.currentToolTip === 0">
<strong>{{ 'modal.supportedFileFormatsLabel' | i18n }}</strong>
<ul>
<li data-ng-repeat="type in modal.configuration.acceptedResumeTypes">
{{ type }}
</li>
</ul>
</div>
<!-- EEOC GENDER, RACE, &, ETHNICITY -->
<div data-ng-if="modal.currentToolTip === 1" data-i18n="eeoc.genderRaceEthnicityHelp" data-companyName="{{ modal.configuration.companyName }}"></div>
<!-- ETHNICITY -->
<div data-ng-if="modal.currentToolTip === 2">
<ul>
<li>{{ 'eeoc.raceEthnicityHL' | i18n }}: {{ 'eeoc.raceEthnicityHLHelp' | i18n }}</li>
<li>{{ 'eeoc.raceEthnicityWH' | i18n }}: {{ 'eeoc.raceEthnicityWHHelp' | i18n }}</li>
<li>{{ 'eeoc.raceEthnicityBL' | i18n }}: {{ 'eeoc.raceEthnicityBLHelp' | i18n }}</li>
<li>{{ 'eeoc.raceEthnicityAS' | i18n }}: {{ 'eeoc.raceEthnicityASHelp' | i18n }}</li>
<li>{{ 'eeoc.raceEthnicityNP' | i18n }}: {{ 'eeoc.raceEthnicityNPHelp' | i18n }}</li>
<li>{{ 'eeoc.raceEthnicityIA' | i18n }}: {{ 'eeoc.raceEthnicityIAHelp' | i18n }}</li>
</ul>
</div>
<!-- PROTECTED VETERAN -->
<div data-ng-if="modal.currentToolTip === 3" data-i18n="eeoc.veteranHelp" data-companyName="{{ modal.configuration.companyName }}"></div>
<!-- DISABILITY -->
<p data-ng-if="modal.currentToolTip === 4" data-i18n="eeoc.disabilityHelp" data-companyName="{{ modal.configuration.companyName }}"></p>
</div>
</div>
<!-- UPLOAD LABEL -->
<div class="upload-label" data-ng-if="!modal.hasAttemptedLIApply">
<span class="field-label">
{{ 'modal.resumeFilePlaceholder' | i18n }}
<a class="bhi-question" data-ng-model="tooltip_info" data-ng-click="tooltip_info = 'tooltip'" />
<div class="tooltip-info" data-ng-show="tooltip_info == 'tooltip'" data-ng-hide="tooltip_info != 'tooltip'">
<div class="tooltip-modal">
<div class="tooltip-info-closer"><i class="bhi-close" data-ng-click="tooltip_info = false" /></div>
<p data-i18n="<strong>{{'modal.supportedFileFormatsLabel' | i18n}}</strong> {{modal.getTooltipText()}}"></p>
</div>
</div>
<a data-ng-click="modal.showTooltip(0)"><i class="bhi-question"></i></a>
</span>
<span class="error" data-ng-show="!applyForm.$submitted && modal.resumeUploadErrorMessage">
{{ modal.resumeUploadErrorMessage }}
Expand All @@ -102,7 +130,7 @@ <h3>{{ 'modal.successSubHeading' | i18n }}</h3>
<span class="upload-text" data-ng-show="modal.ApplyService.form.resumeInfo.name">{{ modal.ApplyService.form.resumeInfo.name }}</span>
</div>
<!-- ERROR MESSAGE -->
<span class="error submit-error" data-ng-show="applyForm.$submitted && modal.ApplyService.ajaxError">
<span class="error submit-error" data-ng-if="!modal.isSubmitting && modal.ApplyService.ajaxError">
<i class="bhi-caution"></i> <span>{{ modal.ApplyService.ajaxError }}</span>
</span>
<div id="eeoc-fields">
Expand All @@ -111,14 +139,8 @@ <h3>{{ 'modal.successSubHeading' | i18n }}</h3>
<span class="eeoc-label-header">
<h4>
{{ 'eeoc.genderRaceEthnicityHeader' | i18n }}
<a class="bhi-question" data-ng-model="tooltip_info" data-ng-click="tooltip_info = 'genderRaceEthnicity'" />
<a data-ng-click="modal.showTooltip(1)"><i class="bhi-question"></i></a>
</h4>
<div class="tooltip-info" data-ng-show="tooltip_info == 'genderRaceEthnicity'" data-ng-hide="tooltip_info != 'genderRaceEthnicity'">
<div class="tooltip-modal">
<div class="tooltip-info-closer"><i class="bhi-close" data-ng-click="tooltip_info = false" /></div>
<p data-i18n="eeoc.genderRaceEthnicityHelp" data-companyName="{{ modal.configuration.companyName }}"></p>
</div>
</div>
</span>
</div>
<div class="form-field">
Expand All @@ -135,21 +157,8 @@ <h4>
<div class="input eeoc">
<label for="eeoc-ethnicity">
{{ 'eeoc.raceEthnicityLabel' | i18n }}
<a class="bhi-question" data-ng-model="tooltip_info" data-ng-click="tooltip_info = 'raceEthnicity'" />
<a data-ng-click="modal.showTooltip(2)"><i class="bhi-question"></i></a>
</label>
<div class="tooltip-info short" data-ng-show="tooltip_info == 'raceEthnicity'" data-ng-hide="tooltip_info != 'raceEthnicity'">
<div class="tooltip-modal">
<div class="tooltip-info-closer"><i class="bhi-close" data-ng-click="tooltip_info = false" /></div>
<ul>
<li>{{ 'eeoc.raceEthnicityHL' | i18n }}: {{ 'eeoc.raceEthnicityHLHelp' | i18n }}</li>
<li>{{ 'eeoc.raceEthnicityWH' | i18n }}: {{ 'eeoc.raceEthnicityWHHelp' | i18n }}</li>
<li>{{ 'eeoc.raceEthnicityBL' | i18n }}: {{ 'eeoc.raceEthnicityBLHelp' | i18n }}</li>
<li>{{ 'eeoc.raceEthnicityAS' | i18n }}: {{ 'eeoc.raceEthnicityASHelp' | i18n }}</li>
<li>{{ 'eeoc.raceEthnicityNP' | i18n }}: {{ 'eeoc.raceEthnicityNPHelp' | i18n }}</li>
<li>{{ 'eeoc.raceEthnicityIA' | i18n }}: {{ 'eeoc.raceEthnicityIAHelp' | i18n }}</li>
</ul>
</div>
</div>
<fieldset id="eeoc-ethnicity" class="checkboxgroup">
<div class="eeoc-checkbox">
<input id="eeoc-eth-HL" type="checkbox" value="HL" data-ng-model="modal.EeocService.selectedEthnicities['HL']" data-ng-required="modal.EeocService.isGenderRaceEthnicityEnabled() && !modal.EeocService.isEthnicityChecked()" data-ng-click="modal.ApplyService.form.ethnicity = modal.EeocService.getCheckedEthnicities()" /><label for="eeoc-eth-HL">{{ 'eeoc.raceEthnicityHL' | i18n }}</label>
Expand Down Expand Up @@ -181,14 +190,8 @@ <h4>
<span class="eeoc-label-header">
<h4>
{{ 'eeoc.veteranHeader' | i18n }}
<a class="bhi-question" data-ng-model="tooltip_info" data-ng-click="tooltip_info = 'veteran'" />
<a data-ng-click="modal.showTooltip(3)"><i class="bhi-question"></i></a>
</h4>
<div class="tooltip-info" data-ng-show="tooltip_info == 'veteran'" data-ng-hide="tooltip_info != 'veteran'">
<div class="tooltip-modal">
<div class="tooltip-info-closer"><i class="bhi-close" data-ng-click="tooltip_info = false" /></div>
<p data-i18n="eeoc.veteranHelp" data-companyName="{{ modal.configuration.companyName }}"></p>
</div>
</div>
</span>
</div>
<div class="form-field">
Expand All @@ -208,14 +211,8 @@ <h4>
<span class="eeoc-label-header">
<h4>
{{ 'eeoc.disabilityHeader' | i18n }}
<a class="bhi-question" data-ng-model="tooltip_info" data-ng-click="tooltip_info = 'disability'" />
<a data-ng-click="modal.showTooltip(4)"><i class="bhi-question"></i></a>
</h4>
<div class="tooltip-info" data-ng-show="tooltip_info == 'disability'" data-ng-hide="tooltip_info != 'disability'">
<div class="tooltip-modal">
<div class="tooltip-info-closer"><i class="bhi-close" data-ng-click="tooltip_info = false" /></div>
<p data-i18n="eeoc.disabilityHelp" data-companyName="{{ modal.configuration.companyName }}"></p>
</div>
</div>
</span>
</div>
<div class="form-field">
Expand Down
7 changes: 4 additions & 3 deletions src/app/modal/modal.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
max-width: 500px !important;
}
}

@media screen and (max-height: 700px) and (min-width: 992px){
margin: 0px auto;
margin: 0 auto;
-ms-transform: scale(.85); /* IE 9 */
-webkit-transform: scale(.85); /* Safari */
transform: scale(.85); /* Firefox, Opera, Chrome */

}


Expand Down Expand Up @@ -138,6 +138,7 @@
border: grey;
border-radius: 3px;
box-shadow: 0 1px 10px rgba(0, 0, 0, 0.35);
z-index: 999;

& > p {
margin: 0;
Expand Down
Loading

0 comments on commit 8e272d0

Please sign in to comment.