##// END OF EJS Templates
Merge pull request #3235 from ellisonbg/removeprint...
Min RK -
r10488:ddc8bac0 merge
parent child Browse files
Show More
@@ -380,19 +380,6 b' class NamedNotebookHandler(IPythonHandler):'
380 )
380 )
381
381
382
382
383 class PrintNotebookHandler(IPythonHandler):
384
385 @authenticate_unless_readonly
386 def get(self, notebook_id):
387 if not self.notebook_manager.notebook_exists(notebook_id):
388 raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)
389 self.write( self.render_template('printnotebook.html',
390 project=self.project,
391 notebook_id=notebook_id,
392 kill_kernel=False,
393 mathjax_url=self.mathjax_url,
394 ))
395
396 #-----------------------------------------------------------------------------
383 #-----------------------------------------------------------------------------
397 # Kernel handlers
384 # Kernel handlers
398 #-----------------------------------------------------------------------------
385 #-----------------------------------------------------------------------------
@@ -68,9 +68,8 b' from .handlers import (LoginHandler, LogoutHandler,'
68 ProjectDashboardHandler, NewHandler, NamedNotebookHandler,
68 ProjectDashboardHandler, NewHandler, NamedNotebookHandler,
69 MainKernelHandler, KernelHandler, KernelActionHandler, IOPubHandler, StdinHandler,
69 MainKernelHandler, KernelHandler, KernelActionHandler, IOPubHandler, StdinHandler,
70 ShellHandler, NotebookRootHandler, NotebookHandler, NotebookCopyHandler,
70 ShellHandler, NotebookRootHandler, NotebookHandler, NotebookCopyHandler,
71 AuthenticatedFileHandler, PrintNotebookHandler,
71 AuthenticatedFileHandler, MainClusterHandler, ClusterProfileHandler,
72 MainClusterHandler, ClusterProfileHandler, ClusterActionHandler,
72 ClusterActionHandler, FileFindHandler, NotebookRedirectHandler,
73 FileFindHandler, NotebookRedirectHandler,
74 )
73 )
75 from .nbmanager import NotebookManager
74 from .nbmanager import NotebookManager
76 from .filenbmanager import FileNotebookManager
75 from .filenbmanager import FileNotebookManager
@@ -154,7 +153,6 b' class NotebookWebApplication(web.Application):'
154 (r"/%s" % _notebook_id_regex, NamedNotebookHandler),
153 (r"/%s" % _notebook_id_regex, NamedNotebookHandler),
155 (r"/%s" % _notebook_name_regex, NotebookRedirectHandler),
154 (r"/%s" % _notebook_name_regex, NotebookRedirectHandler),
156 (r"/%s/copy" % _notebook_id_regex, NotebookCopyHandler),
155 (r"/%s/copy" % _notebook_id_regex, NotebookCopyHandler),
157 (r"/%s/print" % _notebook_id_regex, PrintNotebookHandler),
158 (r"/kernels", MainKernelHandler),
156 (r"/kernels", MainKernelHandler),
159 (r"/kernels/%s" % _kernel_id_regex, KernelHandler),
157 (r"/kernels/%s" % _kernel_id_regex, KernelHandler),
160 (r"/kernels/%s/%s" % (_kernel_id_regex, _kernel_action_regex), KernelActionHandler),
158 (r"/kernels/%s/%s" % (_kernel_id_regex, _kernel_action_regex), KernelActionHandler),
@@ -942,7 +942,7 b' a.heading-anchor:link,a.heading-anchor:visited{text-decoration:none;color:inheri'
942 div.raw_input{padding-top:0px;padding-bottom:0px;height:1em;line-height:1em;font-family:monospace;}
942 div.raw_input{padding-top:0px;padding-bottom:0px;height:1em;line-height:1em;font-family:monospace;}
943 span.input_prompt{font-family:inherit;}
943 span.input_prompt{font-family:inherit;}
944 input.raw_input{font-family:inherit;font-size:inherit;color:inherit;width:auto;margin:-2px 0px 0px 1px;padding-left:1px;padding-top:2px;height:1em;}
944 input.raw_input{font-family:inherit;font-size:inherit;color:inherit;width:auto;margin:-2px 0px 0px 1px;padding-left:1px;padding-top:2px;height:1em;}
945 @media print{body{overflow:visible !important;} div#notebook{overflow:visible !important;} .ui-widget-content{border:0px;} #save_widget{margin:0px !important;} #header,#pager,#pager_splitter,#menubar,#toolbar{display:none !important;} .cell{border:none !important;} .toolbar{display:none;}}.rendered_html{color:black;}.rendered_html em{font-style:italic;}
945 .rendered_html{color:black;}.rendered_html em{font-style:italic;}
946 .rendered_html strong{font-weight:bold;}
946 .rendered_html strong{font-weight:bold;}
947 .rendered_html u{text-decoration:underline;}
947 .rendered_html u{text-decoration:underline;}
948 .rendered_html :link{text-decoration:underline;}
948 .rendered_html :link{text-decoration:underline;}
@@ -96,9 +96,6 b' var IPython = (function (IPython) {'
96 notebook_id + '?format=py';
96 notebook_id + '?format=py';
97 window.location.assign(url);
97 window.location.assign(url);
98 });
98 });
99 this.element.find('button#print_notebook').click(function () {
100 IPython.print_widget.print_notebook();
101 });
102 this.element.find('#kill_and_exit').click(function () {
99 this.element.find('#kill_and_exit').click(function () {
103 IPython.notebook.kernel.kill();
100 IPython.notebook.kernel.kill();
104 setTimeout(function(){window.close();}, 200);
101 setTimeout(function(){window.close();}, 200);
@@ -2,6 +2,5 b''
2 @import "variables.less";
2 @import "variables.less";
3 @import "flexible-box-model.less";
3 @import "flexible-box-model.less";
4 @import "notebook.less";
4 @import "notebook.less";
5 @import "printnotebook.less";
6 @import "renderedhtml.less";
5 @import "renderedhtml.less";
7 @import "tooltip.less";
6 @import "tooltip.less";
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now