From e64adb9b28fcb989044eaa77cea6ef94e9d3ea82 2011-10-19 00:55:25
From: Brian E. Granger <ellisonbg@gmail.com>
Date: 2011-10-19 00:55:25
Subject: [PATCH] Misc changes to the notebook.
* IPythonNotebookApp->NotebookApp.
* Cleaned up html templates of unused stylesheets.
---
diff --git a/IPython/core/profileapp.py b/IPython/core/profileapp.py
index 2ae9812..cbe53a3 100644
--- a/IPython/core/profileapp.py
+++ b/IPython/core/profileapp.py
@@ -194,15 +194,15 @@ class ProfileCreate(BaseIPythonApplication):
else:
apps.append(IPythonQtConsoleApp)
try:
- from IPython.frontend.html.notebook.notebookapp import IPythonNotebookApp
+ from IPython.frontend.html.notebook.notebookapp import NotebookApp
except ImportError:
pass
except Exception:
- self.log.debug('Unexpected error when importing IPythonNotebookApp',
+ self.log.debug('Unexpected error when importing NotebookApp',
exc_info=True
)
else:
- apps.append(IPythonNotebookApp)
+ apps.append(NotebookApp)
if self.parallel:
from IPython.parallel.apps.ipcontrollerapp import IPControllerApp
from IPython.parallel.apps.ipengineapp import IPEngineApp
diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py
index 2228962..469be9e 100644
--- a/IPython/frontend/html/notebook/notebookapp.py
+++ b/IPython/frontend/html/notebook/notebookapp.py
@@ -125,11 +125,11 @@ notebook_flags = ['no-browser']
aliases = dict(ipkernel_aliases)
aliases.update({
- 'ip': 'IPythonNotebookApp.ip',
- 'port': 'IPythonNotebookApp.port',
- 'keyfile': 'IPythonNotebookApp.keyfile',
- 'certfile': 'IPythonNotebookApp.certfile',
- 'ws-hostname': 'IPythonNotebookApp.ws_hostname',
+ 'ip': 'NotebookApp.ip',
+ 'port': 'NotebookApp.port',
+ 'keyfile': 'NotebookApp.keyfile',
+ 'certfile': 'NotebookApp.certfile',
+ 'ws-hostname': 'NotebookApp.ws_hostname',
'notebook-dir': 'NotebookManager.notebook_dir',
})
@@ -141,10 +141,10 @@ notebook_aliases = [u'port', u'ip', u'keyfile', u'certfile', u'ws-hostname',
u'notebook-dir']
#-----------------------------------------------------------------------------
-# IPythonNotebookApp
+# NotebookApp
#-----------------------------------------------------------------------------
-class IPythonNotebookApp(BaseIPythonApplication):
+class NotebookApp(BaseIPythonApplication):
name = 'ipython-notebook'
default_config_file_name='ipython_notebook_config.py'
@@ -213,7 +213,7 @@ class IPythonNotebookApp(BaseIPythonApplication):
return prefix + self.ws_hostname + u':' + unicode(self.port)
def parse_command_line(self, argv=None):
- super(IPythonNotebookApp, self).parse_command_line(argv)
+ super(NotebookApp, self).parse_command_line(argv)
if argv is None:
argv = sys.argv[1:]
@@ -254,14 +254,14 @@ class IPythonNotebookApp(BaseIPythonApplication):
self.notebook_manager.list_notebooks()
def init_logging(self):
- super(IPythonNotebookApp, self).init_logging()
+ super(NotebookApp, self).init_logging()
# This prevents double log messages because tornado use a root logger that
# self.log is a child of. The logging module dipatches log messages to a log
# and all of its ancenstors until propagate is set to False.
self.log.propagate = False
def initialize(self, argv=None):
- super(IPythonNotebookApp, self).initialize(argv)
+ super(NotebookApp, self).initialize(argv)
self.init_configurables()
self.web_app = NotebookWebApplication(
self, self.kernel_manager, self.notebook_manager, self.log
@@ -309,7 +309,7 @@ class IPythonNotebookApp(BaseIPythonApplication):
#-----------------------------------------------------------------------------
def launch_new_instance():
- app = IPythonNotebookApp()
+ app = NotebookApp()
app.initialize()
app.start()
diff --git a/IPython/frontend/html/notebook/static/js/savewidget.js b/IPython/frontend/html/notebook/static/js/savewidget.js
index f3a7216..2c7f631 100644
--- a/IPython/frontend/html/notebook/static/js/savewidget.js
+++ b/IPython/frontend/html/notebook/static/js/savewidget.js
@@ -82,7 +82,7 @@ var IPython = (function (IPython) {
SaveWidget.prototype.set_document_title = function () {
nbname = this.get_notebook_name();
- document.title = 'IPy: ' + nbname;
+ document.title = nbname;
};
diff --git a/IPython/frontend/html/notebook/templates/login.html b/IPython/frontend/html/notebook/templates/login.html
index 043ca09..817b833 100644
--- a/IPython/frontend/html/notebook/templates/login.html
+++ b/IPython/frontend/html/notebook/templates/login.html
@@ -7,21 +7,18 @@
<title>IPython Notebook</title>
<link rel="stylesheet" href="static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" />
-<!-- <link rel="stylesheet" href="static/jquery/css/themes/rocket/jquery-wijmo.css" type="text/css" /> -->
-<!-- <link rel="stylesheet" href="static/jquery/css/themes/smoothness/jquery-ui-1.8.14.custom.css" type="text/css" />-->
-
<link rel="stylesheet" href="static/css/boilerplate.css" type="text/css" />
<link rel="stylesheet" href="static/css/layout.css" type="text/css" />
<link rel="stylesheet" href="static/css/base.css" type="text/css" />
-<script type="text/javascript" charset="utf-8">
-function add_next_to_action(){
- // add 'next' argument to action url, to preserve redirect
- var query = location.search.substring(1);
- var form = document.forms[0];
- var action = form.getAttribute("action");
- form.setAttribute("action", action + '?' + query);
-}
-</script>
+ <script type="text/javascript" charset="utf-8">
+ function add_next_to_action(){
+ // add 'next' argument to action url, to preserve redirect
+ var query = location.search.substring(1);
+ var form = document.forms[0];
+ var action = form.getAttribute("action");
+ form.setAttribute("action", action + '?' + query);
+ }
+ </script>
</head>
<body onload="add_next_to_action()">
diff --git a/IPython/frontend/html/notebook/templates/nbbrowser.html b/IPython/frontend/html/notebook/templates/nbbrowser.html
index 68ec273..35eb123 100644
--- a/IPython/frontend/html/notebook/templates/nbbrowser.html
+++ b/IPython/frontend/html/notebook/templates/nbbrowser.html
@@ -7,9 +7,6 @@
<title>IPython Notebook</title>
<link rel="stylesheet" href="static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" />
-<!-- <link rel="stylesheet" href="static/jquery/css/themes/rocket/jquery-wijmo.css" type="text/css" /> -->
-<!-- <link rel="stylesheet" href="static/jquery/css/themes/smoothness/jquery-ui-1.8.14.custom.css" type="text/css" />-->
-
<link rel="stylesheet" href="static/css/boilerplate.css" type="text/css" />
<link rel="stylesheet" href="static/css/layout.css" type="text/css" />
<link rel="stylesheet" href="static/css/base.css" type="text/css" />
diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html
index 2dde972..7dea60f 100644
--- a/IPython/frontend/html/notebook/templates/notebook.html
+++ b/IPython/frontend/html/notebook/templates/notebook.html
@@ -6,10 +6,6 @@
<title>IPython Notebook</title>
- <link rel="stylesheet" href="static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" />
-<!-- <link rel="stylesheet" href="static/jquery/css/themes/rocket/jquery-wijmo.css" type="text/css" /> -->
-<!-- <link rel="stylesheet" href="static/jquery/css/themes/smoothness/jquery-ui-1.8.14.custom.css" type="text/css" />-->
-
<!-- <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML" charset="utf-8"></script> -->
<script type='text/javascript' src='static/mathjax/MathJax.js?config=TeX-AMS_HTML' charset='utf-8'></script>
<script type="text/javascript">
@@ -30,6 +26,7 @@
}
</script>
+ <link rel="stylesheet" href="static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" />
<link rel="stylesheet" href="static/codemirror/lib/codemirror.css">
<link rel="stylesheet" href="static/codemirror/mode/markdown/markdown.css">
<link rel="stylesheet" href="static/codemirror/mode/rst/rst.css">
diff --git a/IPython/frontend/terminal/ipapp.py b/IPython/frontend/terminal/ipapp.py
index d49e36c..aaa0594 100755
--- a/IPython/frontend/terminal/ipapp.py
+++ b/IPython/frontend/terminal/ipapp.py
@@ -206,7 +206,7 @@ class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):
qtconsole=('IPython.frontend.qt.console.qtconsoleapp.IPythonQtConsoleApp',
"""Launch the IPython Qt Console."""
),
- notebook=('IPython.frontend.html.notebook.notebookapp.IPythonNotebookApp',
+ notebook=('IPython.frontend.html.notebook.notebookapp.NotebookApp',
"""Launch the IPython HTML Notebook Server"""
),
profile = ("IPython.core.profileapp.ProfileApp",