diff options
| author | Sam | 2013-06-21 21:00:34 +0000 |
|---|---|---|
| committer | Sam | 2013-06-21 21:00:34 +0000 |
| commit | 5b05c3322c1ea25a30bec0048847e5265a036d15 (patch) | |
| tree | bbca05d9190ecb34397bc2399c3892a26eab89c3 /wqflask | |
| parent | aec9cbf92c04820392a80f3fd1a7fb30d21f0d8c (diff) | |
| download | genenetwork2-5b05c3322c1ea25a30bec0048847e5265a036d15.tar.gz | |
Working on getting logins working again
Diffstat (limited to 'wqflask')
| -rw-r--r-- | wqflask/wqflask/static/new/javascript/login.coffee | 2 | ||||
| -rw-r--r-- | wqflask/wqflask/static/new/javascript/login.js | 2 | ||||
| -rw-r--r-- | wqflask/wqflask/templates/base.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/wqflask/wqflask/static/new/javascript/login.coffee b/wqflask/wqflask/static/new/javascript/login.coffee index c49353d5..95e2b5c7 100644 --- a/wqflask/wqflask/static/new/javascript/login.coffee +++ b/wqflask/wqflask/static/new/javascript/login.coffee @@ -39,4 +39,4 @@ $ -> ) - $("form").on("submit", submit_form) + $("#colorbox form").on("submit", submit_form) diff --git a/wqflask/wqflask/static/new/javascript/login.js b/wqflask/wqflask/static/new/javascript/login.js index 6c6120ec..d51a0ac8 100644 --- a/wqflask/wqflask/static/new/javascript/login.js +++ b/wqflask/wqflask/static/new/javascript/login.js @@ -38,7 +38,7 @@ success: form_success }); }; - return $("form").on("submit", submit_form); + return $("#colorbox form").on("submit", submit_form); }); }).call(this); diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html index 741c5425..bdb1c362 100644 --- a/wqflask/wqflask/templates/base.html +++ b/wqflask/wqflask/templates/base.html @@ -180,7 +180,7 @@ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js" type="text/javascript"></script> <script language="javascript" type="text/javascript" src="/static/packages/colorbox/jquery.colorbox.js"></script> -<!-- <script type="text/javascript" src="/static/new/javascript/login.js"></script>--> + <script type="text/javascript" src="/static/new/javascript/login.js"></script> {% block js %} {% endblock %} |