Merge pull request #6554 from Carreau/itsallaboutme

Add About IPython

IPython/html/static/notebook/js/about.js

@@ -0,0 +1,38 b''
+// Copyright (c) IPython Development Team.
+// Distributed under the terms of the Modified BSD License.
+require([
+    'jquery',
+    'base/js/dialog',
+    'underscore',
+    'base/js/namespace'
+], function ($, dialog, _, IPython) {
+    'use strict';
+    $('#notebook_about').click(function () {
+        // use underscore template to auto html escape
+        var text = 'You are using IPython notebook.<br/><br/>';
+        text = text + 'The version of the notebook server is ';
+        text = text + _.template('<b><%- version %></b>')({ version: sys_info.ipython_version });
+        if (sys_info.commit_hash) {
+            text = text + _.template('-<%- hash %>')({ hash: sys_info.commit_hash });
+        }
+        text = text + _.template(' and is running on:<br/><pre>Python <%- pyver %></pre>')({ pyver: sys_info.sys_version });
+        var kinfo = $('<div/>').attr('id', '#about-kinfo').text('Waiting for kernel to be available...');
+        var body = $('<div/>');
+        body.append($('<h4/>').text('Server Information:'));
+        body.append($('<p/>').html(text));
+        body.append($('<h4/>').text('Current Kernel Information:'));
+        body.append(kinfo);
+        dialog.modal({
+            title: 'About IPython Notebook',
+            body: body,
+            buttons: { 'OK': {} }
+        });
+        try {
+            IPython.notebook.session.kernel.kernel_info(function (data) {
+                kinfo.html($('<pre/>').text(data.content.banner));
+            });
+        } catch (e) {
+            kinfo.html($('<p/>').text('unable to contact kernel'));
+        }
+    });
+});

IPython/html/base/handlers.py

@@ -25,6 +25,7 b' except ImportError:'
     app_log = logging.getLogger()
 
 import IPython
+from IPython.utils.sysinfo import get_sys_info
 
 from IPython.config import Application
 from IPython.utils.path import filefind
@@ -36,6 +37,8 b' from IPython.html.utils import is_hidden, url_path_join, url_escape'
 #-----------------------------------------------------------------------------
 non_alphanum = re.compile(r'[^A-Za-z0-9]')
 
+sys_info = json.dumps(get_sys_info())
+
 class AuthenticatedHandler(web.RequestHandler):
     """A RequestHandler with an authenticated user."""
 
@@ -221,6 +224,7 b' class IPythonHandler(AuthenticatedHandler):'
             logged_in=self.logged_in,
             login_available=self.login_available,
             static_url=self.static_url,
+            sys_info=sys_info
         )
     
     def get_json_body(self):

IPython/html/static/notebook/js/main.js

@@ -20,6 +20,7 b' require(['
     'notebook/js/config',
     'notebook/js/kernelselector',
     'codemirror/lib/codemirror',
+    'notebook/js/about',
     // only loaded, not used, please keep sure this is loaded last
     'custom/custom'
 ], function(
@@ -41,6 +42,7 b' require(['
     config,
     kernelselector,
     CodeMirror,
+    about,
     // please keep sure that even if not used, this is loaded last
     custom
     ) {

IPython/html/templates/notebook.html

@@ -259,7 +259,7 b' class="notebook_app"'
                                     ("http://nbviewer.ipython.org/github/ipython/ipython/tree/2.x/examples/Index.ipynb", "Notebook Help", True),
                                 ),(
                                     ("http://docs.python.org","Python",True),
-                            ("http://help.github.com/articles/github-flavored-markdown","Markdown",True),
+                                    ("http://help.github.com/articles/github-flavored-markdown","Markdown",True),
                                     ("http://docs.scipy.org/doc/numpy/reference/","NumPy",True),
                                     ("http://docs.scipy.org/doc/scipy/reference/","SciPy",True),
                                     ("http://matplotlib.org/contents.html","Matplotlib",True),
@@ -280,7 +280,8 b' class="notebook_app"'
                                 <li class="divider"></li>
                             {% endif %}
                         {% endfor %}
-                        </li>
+                        <li class="divider"></li>
+                        <li title="About IPython Notebook"><a id="notebook_about" href="#">About</a></li>
                     </ul>
                 </li>
               </ul>
@@ -316,6 +317,9 b' class="notebook_app"'
 
 {% block script %}
 {{super()}}
+<script type="text/javascript">
+    sys_info = {{sys_info}};
+</script>
 
 <script src="{{ static_url("components/text-encoding/lib/encoding.js") }}" charset="utf-8"></script>