##// END OF EJS Templates
use full base_url in html and js
Matthias BUSSONNIER -
Show More
@@ -10,6 +10,7 b''
10 //============================================================================
10 //============================================================================
11
11
12 var IPython = (function (IPython) {
12 var IPython = (function (IPython) {
13 var base_url = $('body').data('baseProjectUrl');
13
14
14 var LoginWidget = function (selector) {
15 var LoginWidget = function (selector) {
15 this.selector = selector;
16 this.selector = selector;
@@ -29,10 +30,10 b' var IPython = (function (IPython) {'
29 LoginWidget.prototype.bind_events = function () {
30 LoginWidget.prototype.bind_events = function () {
30 var that = this;
31 var that = this;
31 this.element.find("button#logout").click(function () {
32 this.element.find("button#logout").click(function () {
32 window.location = "logout";
33 window.location = base_url+"logout";
33 });
34 });
34 this.element.find("button#login").click(function () {
35 this.element.find("button#login").click(function () {
35 window.location = "login";
36 window.location = base_url+"login";
36 });
37 });
37 };
38 };
38
39
@@ -16,7 +16,7 b''
16 <div id="main_app">
16 <div id="main_app">
17
17
18 {% if login_available %}
18 {% if login_available %}
19 <form action="login?next={{url_escape(next)}}" method="post">
19 <form action="{{base_project_url}}login?next={{url_escape(next)}}" method="post">
20 Password: <input type="password" class='ui-widget ui-widget-content' name="password" id="password_input">
20 Password: <input type="password" class='ui-widget ui-widget-content' name="password" id="password_input">
21 <input type="submit" value="Log in" id="login_submit">
21 <input type="submit" value="Log in" id="login_submit">
22 </form>
22 </form>
@@ -23,9 +23,9 b''
23 {% end %}
23 {% end %}
24
24
25 {% if read_only or not login_available %}
25 {% if read_only or not login_available %}
26 Proceed to the <a href="">dashboard</a>.
26 Proceed to the <a href="{{base_project_url}}">dashboard</a>.
27 {% else %}
27 {% else %}
28 Proceed to the <a href="login">login page</a>.
28 Proceed to the <a href="{{base_project_url}}login">login page</a>.
29 {% end %}
29 {% end %}
30
30
31
31
General Comments 0
You need to be logged in to leave comments. Login now