Show More
@@ -194,15 +194,15 b' class ProfileCreate(BaseIPythonApplication):' | |||||
194 | else: |
|
194 | else: | |
195 | apps.append(IPythonQtConsoleApp) |
|
195 | apps.append(IPythonQtConsoleApp) | |
196 | try: |
|
196 | try: | |
197 |
from IPython.frontend.html.notebook.notebookapp import |
|
197 | from IPython.frontend.html.notebook.notebookapp import NotebookApp | |
198 | except ImportError: |
|
198 | except ImportError: | |
199 | pass |
|
199 | pass | |
200 | except Exception: |
|
200 | except Exception: | |
201 |
self.log.debug('Unexpected error when importing |
|
201 | self.log.debug('Unexpected error when importing NotebookApp', | |
202 | exc_info=True |
|
202 | exc_info=True | |
203 | ) |
|
203 | ) | |
204 | else: |
|
204 | else: | |
205 |
apps.append( |
|
205 | apps.append(NotebookApp) | |
206 | if self.parallel: |
|
206 | if self.parallel: | |
207 | from IPython.parallel.apps.ipcontrollerapp import IPControllerApp |
|
207 | from IPython.parallel.apps.ipcontrollerapp import IPControllerApp | |
208 | from IPython.parallel.apps.ipengineapp import IPEngineApp |
|
208 | from IPython.parallel.apps.ipengineapp import IPEngineApp |
@@ -125,11 +125,11 b" notebook_flags = ['no-browser']" | |||||
125 | aliases = dict(ipkernel_aliases) |
|
125 | aliases = dict(ipkernel_aliases) | |
126 |
|
126 | |||
127 | aliases.update({ |
|
127 | aliases.update({ | |
128 |
'ip': ' |
|
128 | 'ip': 'NotebookApp.ip', | |
129 |
'port': ' |
|
129 | 'port': 'NotebookApp.port', | |
130 |
'keyfile': ' |
|
130 | 'keyfile': 'NotebookApp.keyfile', | |
131 |
'certfile': ' |
|
131 | 'certfile': 'NotebookApp.certfile', | |
132 |
'ws-hostname': ' |
|
132 | 'ws-hostname': 'NotebookApp.ws_hostname', | |
133 | 'notebook-dir': 'NotebookManager.notebook_dir', |
|
133 | 'notebook-dir': 'NotebookManager.notebook_dir', | |
134 | }) |
|
134 | }) | |
135 |
|
135 | |||
@@ -141,10 +141,10 b" notebook_aliases = [u'port', u'ip', u'keyfile', u'certfile', u'ws-hostname'," | |||||
141 | u'notebook-dir'] |
|
141 | u'notebook-dir'] | |
142 |
|
142 | |||
143 | #----------------------------------------------------------------------------- |
|
143 | #----------------------------------------------------------------------------- | |
144 |
# |
|
144 | # NotebookApp | |
145 | #----------------------------------------------------------------------------- |
|
145 | #----------------------------------------------------------------------------- | |
146 |
|
146 | |||
147 |
class |
|
147 | class NotebookApp(BaseIPythonApplication): | |
148 |
|
148 | |||
149 | name = 'ipython-notebook' |
|
149 | name = 'ipython-notebook' | |
150 | default_config_file_name='ipython_notebook_config.py' |
|
150 | default_config_file_name='ipython_notebook_config.py' | |
@@ -213,7 +213,7 b' class IPythonNotebookApp(BaseIPythonApplication):' | |||||
213 | return prefix + self.ws_hostname + u':' + unicode(self.port) |
|
213 | return prefix + self.ws_hostname + u':' + unicode(self.port) | |
214 |
|
214 | |||
215 | def parse_command_line(self, argv=None): |
|
215 | def parse_command_line(self, argv=None): | |
216 |
super( |
|
216 | super(NotebookApp, self).parse_command_line(argv) | |
217 | if argv is None: |
|
217 | if argv is None: | |
218 | argv = sys.argv[1:] |
|
218 | argv = sys.argv[1:] | |
219 |
|
219 | |||
@@ -254,14 +254,14 b' class IPythonNotebookApp(BaseIPythonApplication):' | |||||
254 | self.notebook_manager.list_notebooks() |
|
254 | self.notebook_manager.list_notebooks() | |
255 |
|
255 | |||
256 | def init_logging(self): |
|
256 | def init_logging(self): | |
257 |
super( |
|
257 | super(NotebookApp, self).init_logging() | |
258 | # This prevents double log messages because tornado use a root logger that |
|
258 | # This prevents double log messages because tornado use a root logger that | |
259 | # self.log is a child of. The logging module dipatches log messages to a log |
|
259 | # self.log is a child of. The logging module dipatches log messages to a log | |
260 | # and all of its ancenstors until propagate is set to False. |
|
260 | # and all of its ancenstors until propagate is set to False. | |
261 | self.log.propagate = False |
|
261 | self.log.propagate = False | |
262 |
|
262 | |||
263 | def initialize(self, argv=None): |
|
263 | def initialize(self, argv=None): | |
264 |
super( |
|
264 | super(NotebookApp, self).initialize(argv) | |
265 | self.init_configurables() |
|
265 | self.init_configurables() | |
266 | self.web_app = NotebookWebApplication( |
|
266 | self.web_app = NotebookWebApplication( | |
267 | self, self.kernel_manager, self.notebook_manager, self.log |
|
267 | self, self.kernel_manager, self.notebook_manager, self.log | |
@@ -309,7 +309,7 b' class IPythonNotebookApp(BaseIPythonApplication):' | |||||
309 | #----------------------------------------------------------------------------- |
|
309 | #----------------------------------------------------------------------------- | |
310 |
|
310 | |||
311 | def launch_new_instance(): |
|
311 | def launch_new_instance(): | |
312 |
app = |
|
312 | app = NotebookApp() | |
313 | app.initialize() |
|
313 | app.initialize() | |
314 | app.start() |
|
314 | app.start() | |
315 |
|
315 |
@@ -82,7 +82,7 b' var IPython = (function (IPython) {' | |||||
82 |
|
82 | |||
83 | SaveWidget.prototype.set_document_title = function () { |
|
83 | SaveWidget.prototype.set_document_title = function () { | |
84 | nbname = this.get_notebook_name(); |
|
84 | nbname = this.get_notebook_name(); | |
85 |
document.title = |
|
85 | document.title = nbname; | |
86 | }; |
|
86 | }; | |
87 |
|
87 | |||
88 |
|
88 |
@@ -7,9 +7,6 b'' | |||||
7 | <title>IPython Notebook</title> |
|
7 | <title>IPython Notebook</title> | |
8 |
|
8 | |||
9 | <link rel="stylesheet" href="static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" /> |
|
9 | <link rel="stylesheet" href="static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" /> | |
10 | <!-- <link rel="stylesheet" href="static/jquery/css/themes/rocket/jquery-wijmo.css" type="text/css" /> --> |
|
|||
11 | <!-- <link rel="stylesheet" href="static/jquery/css/themes/smoothness/jquery-ui-1.8.14.custom.css" type="text/css" />--> |
|
|||
12 |
|
||||
13 | <link rel="stylesheet" href="static/css/boilerplate.css" type="text/css" /> |
|
10 | <link rel="stylesheet" href="static/css/boilerplate.css" type="text/css" /> | |
14 | <link rel="stylesheet" href="static/css/layout.css" type="text/css" /> |
|
11 | <link rel="stylesheet" href="static/css/layout.css" type="text/css" /> | |
15 | <link rel="stylesheet" href="static/css/base.css" type="text/css" /> |
|
12 | <link rel="stylesheet" href="static/css/base.css" type="text/css" /> |
@@ -7,9 +7,6 b'' | |||||
7 | <title>IPython Notebook</title> |
|
7 | <title>IPython Notebook</title> | |
8 |
|
8 | |||
9 | <link rel="stylesheet" href="static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" /> |
|
9 | <link rel="stylesheet" href="static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" /> | |
10 | <!-- <link rel="stylesheet" href="static/jquery/css/themes/rocket/jquery-wijmo.css" type="text/css" /> --> |
|
|||
11 | <!-- <link rel="stylesheet" href="static/jquery/css/themes/smoothness/jquery-ui-1.8.14.custom.css" type="text/css" />--> |
|
|||
12 |
|
||||
13 | <link rel="stylesheet" href="static/css/boilerplate.css" type="text/css" /> |
|
10 | <link rel="stylesheet" href="static/css/boilerplate.css" type="text/css" /> | |
14 | <link rel="stylesheet" href="static/css/layout.css" type="text/css" /> |
|
11 | <link rel="stylesheet" href="static/css/layout.css" type="text/css" /> | |
15 | <link rel="stylesheet" href="static/css/base.css" type="text/css" /> |
|
12 | <link rel="stylesheet" href="static/css/base.css" type="text/css" /> |
@@ -6,10 +6,6 b'' | |||||
6 |
|
6 | |||
7 | <title>IPython Notebook</title> |
|
7 | <title>IPython Notebook</title> | |
8 |
|
8 | |||
9 | <link rel="stylesheet" href="static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" /> |
|
|||
10 | <!-- <link rel="stylesheet" href="static/jquery/css/themes/rocket/jquery-wijmo.css" type="text/css" /> --> |
|
|||
11 | <!-- <link rel="stylesheet" href="static/jquery/css/themes/smoothness/jquery-ui-1.8.14.custom.css" type="text/css" />--> |
|
|||
12 |
|
||||
13 | <!-- <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML" charset="utf-8"></script> --> |
|
9 | <!-- <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> |
|
10 | <script type='text/javascript' src='static/mathjax/MathJax.js?config=TeX-AMS_HTML' charset='utf-8'></script> | |
15 | <script type="text/javascript"> |
|
11 | <script type="text/javascript"> | |
@@ -30,6 +26,7 b'' | |||||
30 | } |
|
26 | } | |
31 | </script> |
|
27 | </script> | |
32 |
|
28 | |||
|
29 | <link rel="stylesheet" href="static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" /> | |||
33 | <link rel="stylesheet" href="static/codemirror/lib/codemirror.css"> |
|
30 | <link rel="stylesheet" href="static/codemirror/lib/codemirror.css"> | |
34 | <link rel="stylesheet" href="static/codemirror/mode/markdown/markdown.css"> |
|
31 | <link rel="stylesheet" href="static/codemirror/mode/markdown/markdown.css"> | |
35 | <link rel="stylesheet" href="static/codemirror/mode/rst/rst.css"> |
|
32 | <link rel="stylesheet" href="static/codemirror/mode/rst/rst.css"> |
@@ -206,7 +206,7 b' class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):' | |||||
206 | qtconsole=('IPython.frontend.qt.console.qtconsoleapp.IPythonQtConsoleApp', |
|
206 | qtconsole=('IPython.frontend.qt.console.qtconsoleapp.IPythonQtConsoleApp', | |
207 | """Launch the IPython Qt Console.""" |
|
207 | """Launch the IPython Qt Console.""" | |
208 | ), |
|
208 | ), | |
209 |
notebook=('IPython.frontend.html.notebook.notebookapp. |
|
209 | notebook=('IPython.frontend.html.notebook.notebookapp.NotebookApp', | |
210 | """Launch the IPython HTML Notebook Server""" |
|
210 | """Launch the IPython HTML Notebook Server""" | |
211 | ), |
|
211 | ), | |
212 | profile = ("IPython.core.profileapp.ProfileApp", |
|
212 | profile = ("IPython.core.profileapp.ProfileApp", |
General Comments 0
You need to be logged in to leave comments.
Login now