Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/static/js/alterLSF.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function fillHoursPerWeek(){ // prefill hours per week select picker
$("#warningModalText").html("Student with WLS Level 5 or 6 must have at least a 15 hour contract. " +
"These positions require special authorization as specified at " +
"<a href=\"http://catalog.berea.edu/2014-2015/Tools/Work-Learning-Service-Levels-WLS\""+
"target=\"_blank\">The Labor Program Website.</a>");
"target=\"_blank\">Berea's Work College Program Website.</a>");
$("#warningModalButton").css('display', 'none');
$("#resetConfirmButton").css('display', 'none');
$("#warningModal").modal("show");
Expand Down
2 changes: 1 addition & 1 deletion app/static/js/laborStatusForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ function getDepartment(object, stopSelectRefresh="") { // get department from se
$("#warningModalText").html("Student with WLS Level 5 or 6 must have at least a 15 hour contract. " +
"These positions require special authorization as specified at " +
"<a href=\"http://catalog.berea.edu/2014-2015/Tools/Work-Learning-Service-Levels-WLS\""+
"target=\"_blank\">The Labor Program Website.</a>");
"target=\"_blank\">Berea's Work College Program Website.</a>");
$("#warningModal").modal("show");
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/static/js/laborhistory.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified app/static/labor-logo.png

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new image isn't the same quality as the old one. We need to either get a new image from Labor, or pay closer attention to our resolution and font choices.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/templates/finAidBase.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

{% block navbar %}
<div id="topbar">
<div id="logo"><a href="/"><img src="/static/labor-logo.png" title="Labor Program Logo" /></a></div>
<div id="logo"><a href="/"><img src="/static/labor-logo.png" title="Berea's Work College Program Logo" /></a></div>
</div>
{% endblock %}

Expand Down
2 changes: 1 addition & 1 deletion app/templates/main/laborStatusForm.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<h1 id ="title">Labor Status Form
<span class="glyphicon glyphicon-bookmark"
data-toggle="tooltip"
title="This online labor status form is used to establish a student's work status in the Labor Program."
title="This online labor status form is used to establish a student's work status in Berea's Work College Program."
data-placement = "right"
id="titleGlyphicon"
tabindex="0">
Expand Down
8 changes: 4 additions & 4 deletions app/templates/main/studentEmailConfirmation.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ <h3>Labor Contract Details: </h3>

<div class="form-group">
{% if laborDescription.jobType == "Primary" %}
<p>This contract is an offer that you must respond to before it is reviewed by the Labor Program Office. By choosing “Accept”, you agree to the labor status form details above. Please be aware that <b>once an offer is accepted, the offer is locked in.</b> In order to leave an accepted contract, you and your supervisor must mutually agree to a release before the labor change deadline listed in the academic calendar. Any mutual releases or adjustments must happen before the labor position change deadline listed on the academic calendar.</p>
<p>Please do not accept this position without first considering all your offers. If you felt coerced or pressured to accept the position, please do not accept the contract and contact the Labor Program Office.</p>
<p>This contract is an offer that you must respond to before it is reviewed by Berea's Work College Program Office. By choosing “Accept”, you agree to the labor status form details above. Please be aware that <b>once an offer is accepted, the offer is locked in.</b> In order to leave an accepted contract, you and your supervisor must mutually agree to a release before the labor change deadline listed in the academic calendar. Any mutual releases or adjustments must happen before the labor position change deadline listed on the academic calendar.</p>
<p>Please do not accept this position without first considering all your offers. If you felt coerced or pressured to accept the position, please do not accept the contract and contact Berea's Work College Program Office.</p>

{% else %} {# Secondary #}
<p>This contract is an offer that you must respond to before it is reviewed by the Labor Program Office. <b>By choosing “Accept”, you agree to the labor status form details above.</b> Please be aware that secondaries are not a requirement. However, in order to leave an accepted contract, your supervisor must submit a release.</p>
<p>This contract is an offer that you must respond to before it is reviewed by Berea's Work College Program Office. <b>By choosing “Accept”, you agree to the labor status form details above.</b> Please be aware that secondaries are not a requirement. However, in order to leave an accepted contract, your supervisor must submit a release.</p>
<p>If this is a secondary position for the Spring or Fall term, <b>your primary supervisor reserves the right to deny the secondary position.</b> There are no primary break positions.<p>

{% endif %}

<p>If you do not accept the terms of this form, please deny the position. If you believe that some of the information in this contract is correct, but some of it is incorrect, deny the position and contact the potential supervisor. Your supervisor can submit a new contract for your acceptance.
</p>

<p><b>NOTICE:</b> This does not mean your position is active to begin work, only that a labor status form has been submitted to the Labor Program Office to await approval.</p>
<p><b>NOTICE:</b> This does not mean your position is active to begin work, only that a labor status form has been submitted to Berea's Work College Program Office to await approval.</p>

<label>
<input type="checkbox">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<div class="col-lg-11 navbar-header">
<!-- This div is important to keep the current navbar style -->
</div>
<div id="logo" class="pull-right"><img src="/static/labor-logo.png" title="Labor Program Logo" /></div>
<div id="logo" class="pull-right"><img src="/static/labor-logo.png" title="Berea's Work College Program Logo" /></div>
</div>
2 changes: 1 addition & 1 deletion app/templates/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div id="sidebar" class="col-sm-2">
<nav class="navbar">
<!-- Logo -->
<div id="logo"><img src="/static/labor-logo.png" title="Labor Program Logo" /></div>
<div id="logo"><img src="/static/labor-logo.png" title="Berea's Work College Program Logo" /></div>

{% if currentUser.isLaborDepartmentStudent %}
<div class="container-fluid">
Expand Down
Loading