##// END OF EJS Templates
Moving static/user to static/custom to prevent future conflicts.
Brian E. Granger -
Show More
1 NO CONTENT: file renamed from IPython/frontend/html/notebook/static/user/css/custom.css to IPython/frontend/html/notebook/static/custom/css/custom.css
NO CONTENT: file renamed from IPython/frontend/html/notebook/static/user/css/custom.css to IPython/frontend/html/notebook/static/custom/css/custom.css
1 NO CONTENT: file renamed from IPython/frontend/html/notebook/static/user/js/custom.js to IPython/frontend/html/notebook/static/custom/js/custom.js
NO CONTENT: file renamed from IPython/frontend/html/notebook/static/user/js/custom.js to IPython/frontend/html/notebook/static/custom/js/custom.js
@@ -1,76 +1,76 b''
1
1
2
2
3 <!DOCTYPE HTML>
3 <!DOCTYPE HTML>
4 {% macro static_url(name) -%}
4 {% macro static_url(name) -%}
5 {{ base_project_url }}static/{{ name }}
5 {{ base_project_url }}static/{{ name }}
6 {%- endmacro %}
6 {%- endmacro %}
7 <html>
7 <html>
8
8
9 <head>
9 <head>
10 <meta charset="utf-8">
10 <meta charset="utf-8">
11
11
12 <title>{% block title %}IPython Notebook{% endblock %}</title>
12 <title>{% block title %}IPython Notebook{% endblock %}</title>
13 <link rel="shortcut icon" type="image/x-icon" href="{{static_url("base/images/favicon.ico") }}">
13 <link rel="shortcut icon" type="image/x-icon" href="{{static_url("base/images/favicon.ico") }}">
14 <meta http-equiv="X-UA-Compatible" content="chrome=1">
14 <meta http-equiv="X-UA-Compatible" content="chrome=1">
15 <link rel="stylesheet" href="{{static_url("jquery/css/themes/base/jquery-ui.min.css") }}" type="text/css" />
15 <link rel="stylesheet" href="{{static_url("jquery/css/themes/base/jquery-ui.min.css") }}" type="text/css" />
16 <link rel="stylesheet" href="{{static_url("base/css/boilerplate.css") }}" type="text/css" />
16 <link rel="stylesheet" href="{{static_url("base/css/boilerplate.css") }}" type="text/css" />
17 {% block stylesheet %}
17 {% block stylesheet %}
18 {% block lesscss %}
18 {% block lesscss %}
19 {% if use_less %}
19 {% if use_less %}
20 <link rel="stylesheet/less" href="{{ static_url("style/style.less") }}" type="text/css" />
20 <link rel="stylesheet/less" href="{{ static_url("style/style.less") }}" type="text/css" />
21 {% else %}
21 {% else %}
22 <link rel="stylesheet" href="{{ static_url("style/style.min.css") }}" type="text/css"/>
22 <link rel="stylesheet" href="{{ static_url("style/style.min.css") }}" type="text/css"/>
23 {% endif %}
23 {% endif %}
24 {% endblock lesscss%}
24 {% endblock lesscss%}
25 {% endblock %}
25 {% endblock %}
26 <link rel="stylesheet" href="{{ static_url("user/css/custom.css") }}" type="text/css" />
26 <link rel="stylesheet" href="{{ static_url("custom/css/custom.css") }}" type="text/css" />
27
27
28
28
29 {% block meta %}
29 {% block meta %}
30 {% endblock %}
30 {% endblock %}
31
31
32 </head>
32 </head>
33
33
34 <body {% block params %}{% endblock %}>
34 <body {% block params %}{% endblock %}>
35
35
36 <div id="header">
36 <div id="header">
37 <span id="ipython_notebook"><div><a href="{{base_project_url}}" alt='dashboard'><img src='{{static_url("base/images/ipynblogo.png") }}' alt='IPython Notebook'/></a></div></span>
37 <span id="ipython_notebook"><div><a href="{{base_project_url}}" alt='dashboard'><img src='{{static_url("base/images/ipynblogo.png") }}' alt='IPython Notebook'/></a></div></span>
38
38
39 {% block login_widget %}
39 {% block login_widget %}
40
40
41 <span id="login_widget">
41 <span id="login_widget">
42 {% if logged_in %}
42 {% if logged_in %}
43 <button id="logout">Logout</button>
43 <button id="logout">Logout</button>
44 {% elif login_available and not logged_in %}
44 {% elif login_available and not logged_in %}
45 <button id="login">Login</button>
45 <button id="login">Login</button>
46 {% endif %}
46 {% endif %}
47 </span>
47 </span>
48
48
49 {% endblock %}
49 {% endblock %}
50
50
51 {% block header %}
51 {% block header %}
52 {% endblock %}
52 {% endblock %}
53 </div>
53 </div>
54
54
55 <div id="site">
55 <div id="site">
56 {% block site %}
56 {% block site %}
57 {% endblock %}
57 {% endblock %}
58 </div>
58 </div>
59
59
60 <script src="{{static_url("jquery/js/jquery-1.7.1.min.js") }}" type="text/javascript" charset="utf-8"></script>
60 <script src="{{static_url("jquery/js/jquery-1.7.1.min.js") }}" type="text/javascript" charset="utf-8"></script>
61 <script src="{{static_url("jquery/js/jquery-ui.min.js") }}" type="text/javascript" charset="utf-8"></script>
61 <script src="{{static_url("jquery/js/jquery-ui.min.js") }}" type="text/javascript" charset="utf-8"></script>
62 <script src="{{static_url("base/js/namespace.js") }}" type="text/javascript" charset="utf-8"></script>
62 <script src="{{static_url("base/js/namespace.js") }}" type="text/javascript" charset="utf-8"></script>
63 <script src="{{static_url("base/js/page.js") }}" type="text/javascript" charset="utf-8"></script>
63 <script src="{{static_url("base/js/page.js") }}" type="text/javascript" charset="utf-8"></script>
64 <script src="{{static_url("auth/js/loginwidget.js") }}" type="text/javascript" charset="utf-8"></script>
64 <script src="{{static_url("auth/js/loginwidget.js") }}" type="text/javascript" charset="utf-8"></script>
65
65
66 {% block script %}
66 {% block script %}
67 {% if use_less %}
67 {% if use_less %}
68 <script src="{{ static_url("components/less.js/dist/less-1.3.3.min.js") }}" charset="utf-8"></script>
68 <script src="{{ static_url("components/less.js/dist/less-1.3.3.min.js") }}" charset="utf-8"></script>
69 {% endif %}
69 {% endif %}
70 {% endblock %}
70 {% endblock %}
71
71
72 <script src="{{static_url("user/js/custom.js") }}" type="text/javascript" charset="utf-8"></script>
72 <script src="{{static_url("custom/js/custom.js") }}" type="text/javascript" charset="utf-8"></script>
73
73
74 </body>
74 </body>
75
75
76 </html>
76 </html>
General Comments 0
You need to be logged in to leave comments. Login now