diff --git a/IPython/frontend/html/notebook/static/js/loginwidget.js b/IPython/frontend/html/notebook/static/js/loginwidget.js index 1277180..d0d739e 100644 --- a/IPython/frontend/html/notebook/static/js/loginwidget.js +++ b/IPython/frontend/html/notebook/static/js/loginwidget.js @@ -10,6 +10,7 @@ //============================================================================ var IPython = (function (IPython) { + var base_url = $('body').data('baseProjectUrl'); var LoginWidget = function (selector) { this.selector = selector; @@ -29,10 +30,10 @@ var IPython = (function (IPython) { LoginWidget.prototype.bind_events = function () { var that = this; this.element.find("button#logout").click(function () { - window.location = "logout"; + window.location = base_url+"logout"; }); this.element.find("button#login").click(function () { - window.location = "login"; + window.location = base_url+"login"; }); }; diff --git a/IPython/frontend/html/notebook/templates/login.html b/IPython/frontend/html/notebook/templates/login.html index 6c436b0..2ac7b65 100644 --- a/IPython/frontend/html/notebook/templates/login.html +++ b/IPython/frontend/html/notebook/templates/login.html @@ -16,7 +16,7 @@
{% if login_available %} -
+ Password:
diff --git a/IPython/frontend/html/notebook/templates/logout.html b/IPython/frontend/html/notebook/templates/logout.html index e27036f..9ea495b 100644 --- a/IPython/frontend/html/notebook/templates/logout.html +++ b/IPython/frontend/html/notebook/templates/logout.html @@ -23,9 +23,9 @@ {% end %} {% if read_only or not login_available %} - Proceed to the dashboard. + Proceed to the dashboard. {% else %} - Proceed to the login page. + Proceed to the login page. {% end %}