Skip to content

Opened Lockdown to Eboard, Changed Lockdown Page Content #123

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.

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

Merged
merged 1 commit into from
Jan 26, 2017
Merged
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
10 changes: 8 additions & 2 deletions conditional/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,14 @@
{% block body %}
{% endblock %}
{% else %}
<div class="container main">
<div class="alert alert-danger" role="alert"><span class="glyphicon glyphicon-remove-sign"></span> Site Lockdown: Evaluations in progress. Please check back later.</div>
<div class="container main error-page align-center">
<div class="col-xs-12">
<img src="/static/images/material_lock.svg" alt="Attention!">
<h1>Congratulations or I'm Sorry...</h1>
<h2>We cannot reveal the results of your evaluation!</h2>
<h3>Evaluations underway:</h3>
<p>Conditional is in Lockdown</p>
</div>
</div>
{% endif %}

Expand Down
2 changes: 1 addition & 1 deletion conditional/util/flask.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def render_template(request, template_name, **kwargs):
ts_review = len(TechnicalSeminar.query.filter(
TechnicalSeminar.approved == False).all()) # pylint: disable=singleton-comparison

if is_eval:
if is_eboard:
lockdown = False

return flask_render_template(
Expand Down
14 changes: 14 additions & 0 deletions frontend/images/material_lock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.