Merge branch 'jupyter/master'

notebook/base/handlers.py

@@ -161,7 +161,7 @@ class IPythonHandler(AuthenticatedHandler):
     
     @property
     def mathjax_config(self):
-        return self.settings.get('mathjax_config', 'TeX-AMS_HTML-full,Safe')
+        return self.settings.get('mathjax_config', 'TeX-AMS-MML_HTMLorMML-full,Safe')
 
     @property
     def base_url(self):

notebook/notebookapp.py

@@ -528,7 +528,7 @@ class NotebookApp(JupyterApp):
     )
     
     client_ca = Unicode(u'', config=True,
-        help="""The full path to a certificate authority certifificate for SSL/TLS client authentication."""
+        help="""The full path to a certificate authority certificate for SSL/TLS client authentication."""
     )
     
     cookie_secret_file = Unicode(config=True,
@@ -762,7 +762,7 @@ class NotebookApp(JupyterApp):
         else:
             self.log.info("Using MathJax: %s", new)
 
-    mathjax_config = Unicode("TeX-AMS_HTML-full,Safe", config=True,
+    mathjax_config = Unicode("TeX-AMS-MML_HTMLorMML-full,Safe", config=True,
         help="""The MathJax.js configuration file that is to be used."""
     )
 

notebook/static/notebook/js/notificationarea.js

@@ -24,6 +24,7 @@ define([
     NotebookNotificationArea.prototype.init_notification_widgets = function () {
         this.init_kernel_notification_widget();
         this.init_notebook_notification_widget();
+        this.init_trusted_notebook_notification_widget();
     };
 
     /**
@@ -338,5 +339,27 @@ define([
         });
     };
 
+    /**
+     * Initialize the notification widget for trusted notebook messages.
+     *
+     * @method init_trusted_notebook_notification_widget
+     */
+    NotebookNotificationArea.prototype.init_trusted_notebook_notification_widget = function () {
+        var that = this;
+        var tnw = this.widget('trusted');
+
+        // Notebook trust events
+        this.events.on('trust_changed.Notebook', function (event, trusted) {
+            if (trusted) {
+                tnw.set_message("Trusted");
+            } else {
+                tnw.set_message("Not Trusted", undefined, function() {
+                  that.notebook.trust_notebook();
+                  return false;
+                });
+            }
+        });
+    };
+
     return {'NotebookNotificationArea': NotebookNotificationArea};
 });

setupbase.py

@@ -166,7 +166,7 @@ def find_package_data():
     mj = lambda *path: pjoin(components, 'MathJax', *path)
     static_data.extend([
         mj('MathJax.js'),
-        mj('config', 'TeX-AMS_HTML-full.js'),
+        mj('config', 'TeX-AMS-MML_HTMLorMML-full.js'),
         mj('config', 'Safe.js'),
     ])