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

Fix modal vertical align #91

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

Fix modal vertical align #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8afc9ac
Fix modal vertical align
tylerburleigh Jul 14, 2018
64fde0a
CSS vertical align
tylerburleigh Jul 14, 2018
3c75839
Allow token entry via GET
tylerburleigh Jul 15, 2018
596ff3f
Revert "Allow token entry via GET"
tylerburleigh Jul 15, 2018
93588da
Allow get
tylerburleigh Sep 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions expfactory/static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,3 +558,8 @@ iframe {

}

.modal-dialog {
top: 50%;
transform: translateY(-50%) !important;
margin: auto !important;
}
3 changes: 2 additions & 1 deletion expfactory/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<script src="{{ url_for('static',filename='js/bootstrap.min.js') }}"></script>
<script src="{{ url_for('static',filename='js/vertically-centered-bootstrap-modals.js') }}"></script>
<script>
$(window).load(function() {
$(".loader").fadeOut("slow");;
$(".loader").fadeOut("slow");
});
</script>
{% block scripts %}
Expand Down
3 changes: 1 addition & 2 deletions expfactory/templates/routes/entry.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
data-backdrop="static"
role="dialog"
aria-labelledby="instructions_modal_label"
aria-hidden="false"
style="margin-top:200px">
aria-hidden="false">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
Expand Down
3 changes: 1 addition & 2 deletions expfactory/templates/routes/finish.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
data-backdrop="static"
role="dialog"
aria-labelledby="instructions_modal_label"
aria-hidden="false"
style="margin-top:200px">
aria-hidden="false">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
Expand Down
3 changes: 1 addition & 2 deletions expfactory/templates/routes/start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
data-backdrop="static"
role="dialog"
aria-labelledby="instructions_modal_label"
aria-hidden="false"
style="margin-top:200px">
aria-hidden="false">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
Expand Down
10 changes: 7 additions & 3 deletions expfactory/views/headless.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

# HEADLESS LOGIN ###############################################################

@app.route('/login', methods=['POST'])
@app.route('/login', methods=['POST', 'GET'])
def login():

# Only allowed to login via post from entry (headless) url
Expand All @@ -74,8 +74,12 @@ def login():

subid = session.get('subid')
if not subid:
if form.validate_on_submit():
token = form.token.data
if form.validate_on_submit() or request.args.get('token') is not None:
if form.validate_on_submit():
token = form.token.data
else:
token = request.args.get('token')
session['experiments'] = [os.path.basename(x) for x in app.experiments]

subid = app.validate_token(token)
if subid is None:
Expand Down