aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
Diffstat (limited to 'wqflask')
-rw-r--r--wqflask/wqflask/static/new/javascript/login.coffee2
-rw-r--r--wqflask/wqflask/static/new/javascript/login.js2
-rw-r--r--wqflask/wqflask/templates/base.html2
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 %}