##// END OF EJS Templates
Merge branch 'carreau-mathjax-warning'...
Fernando Perez -
r5002:b3f314ef merge
parent child Browse files
Show More
@@ -1,4 +1,3 b''
1
2 /**
1 /**
3 * Primary styles
2 * Primary styles
4 *
3 *
@@ -52,5 +51,3 b' div#main_app {'
52 padding: 0.2em 0.8em;
51 padding: 0.2em 0.8em;
53 font-size: 77%;
52 font-size: 77%;
54 }
53 }
55
56
@@ -13,6 +13,15 b''
13 <!-- <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML" charset="utf-8"></script> -->
13 <!-- <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML" charset="utf-8"></script> -->
14 <script type='text/javascript' src='static/mathjax/MathJax.js?config=TeX-AMS_HTML' charset='utf-8'></script>
14 <script type='text/javascript' src='static/mathjax/MathJax.js?config=TeX-AMS_HTML' charset='utf-8'></script>
15 <script type="text/javascript">
15 <script type="text/javascript">
16 function CheckMathJax(){
17 var div=document.getElementById("MathJaxFetchingWarning")
18 if(window.MathJax){
19 document.body.removeChild(div)
20 }
21 else{
22 div.style.display = "block";
23 }
24 }
16 if (typeof MathJax == 'undefined') {
25 if (typeof MathJax == 'undefined') {
17 console.log("No local MathJax, loading from CDN");
26 console.log("No local MathJax, loading from CDN");
18 document.write(unescape("%3Cscript type='text/javascript' src='http://cdn.mathjax.org/mathjax/latest/MathJax.js%3Fconfig=TeX-AMS_HTML' charset='utf-8'%3E%3C/script%3E"));
27 document.write(unescape("%3Cscript type='text/javascript' src='http://cdn.mathjax.org/mathjax/latest/MathJax.js%3Fconfig=TeX-AMS_HTML' charset='utf-8'%3E%3C/script%3E"));
@@ -38,7 +47,7 b''
38
47
39 </head>
48 </head>
40
49
41 <body>
50 <body onload='CheckMathJax();'>
42
51
43 <div id="header">
52 <div id="header">
44 <span id="ipython_notebook"><h1>IPython Notebook</h1></span>
53 <span id="ipython_notebook"><h1>IPython Notebook</h1></span>
@@ -50,6 +59,29 b''
50 <span id="kernel_status">Idle</span>
59 <span id="kernel_status">Idle</span>
51 </div>
60 </div>
52
61
62 <div id="MathJaxFetchingWarning"
63 style="width:80%; margin:auto;padding-top:20%;text-align: justify; display:none">
64 <p style="font-size:26px;">There was an issue trying to fetch MathJax.js
65 from the internet.</p>
66
67 <p style="padding:0.2em"> With a working internet connection, you can run
68 the following at a Python or IPython prompt, which will install a local
69 copy of MathJax:</p>
70
71 <pre style="background-color:lightblue;border:thin silver solid;padding:0.4em">
72 from IPython.external import mathjax; mathjax.install_mathjax()
73 </pre>
74 This will try to install MathJax into the directory where you installed
75 IPython. If you installed IPython to a location that requires
76 administrative privileges to write, you will need to make this call as
77 an administrator. On OSX/Linux/Unix, this can be done at the
78 command-line via:
79 <pre style="background-color:lightblue;border:thin silver solid;padding:0.4em">
80 sudo python -c "from IPython.external import mathjax; mathjax.install_mathjax()"
81 </pre>
82 </p>
83 </div>
84
53 <div id="main_app">
85 <div id="main_app">
54
86
55 <div id="left_panel">
87 <div id="left_panel">
General Comments 0
You need to be logged in to leave comments. Login now