took a crack at making notebook.html extend layout.html #1278

wants to merge 42 commits into


None yet

5 participants


It did involve shuffling a bit of the contents in the header block, as well as a main_app block to layout.html, so I don't know if this is acceptable or not.

ellisonbg and others added some commits Jan 6, 2012
@ellisonbg ellisonbg Initial work to add Wijmo based menu. 813d390
@ellisonbg ellisonbg Removing old directory. e075f09
@ellisonbg ellisonbg Implemented menu based UI using Wijmo. f5bcb68
@ellisonbg ellisonbg Cleaning up menu code.
* QuickHelp button has been removed in favor of a Help menu item.
* Keyboard shortcuts are now in the menus.
* Numerous fixes to subtle aspects of the wijmenu implementation.
@ellisonbg ellisonbg Improved notebook renaming.
There is not a rename dialog that is available in the File menu and
when you click on the notebook name.
@ellisonbg ellisonbg Beginning work on notebook duplication. 4103005
@ellisonbg ellisonbg Finishing work on "Make a Copy" functionality. baad1b9
@ellisonbg ellisonbg Minor fixes to the menu shortcuts. fe3a6c4
@ellisonbg ellisonbg Removing old wijmo themes. def8269
@ellisonbg ellisonbg Adding jquery base theme. c000f0b
@ellisonbg ellisonbg Removing old jquery. 344a0df
@ellisonbg ellisonbg Removing old jqueryui. 8d87e23
@ellisonbg ellisonbg Adding dev version of jquery-ui. 406bcc2
@ellisonbg ellisonbg Adding latest jquery. 1681e36
@ellisonbg ellisonbg Solid first go at jquery-ui based menus. 8ae049e
@ellisonbg ellisonbg Minor style changes. Using better fonts, indenting menu items. c1ab632
@ellisonbg ellisonbg More minor theme/styling changes. 096f072
@ellisonbg ellisonbg Remove Rename dialog from the DOM upon closing it. d401727
@ellisonbg ellisonbg Fixing bug in dialog closing, drafting print css. e77516b
@ellisonbg ellisonbg Improving the save notification.
* Added last saved with time/date display.
* Reimplemented save widget status updates.
@ellisonbg ellisonbg Created new print view for notebook printing. c7352db
@ellisonbg ellisonbg Fixing minor things in the printing. 01e915f
@ellisonbg ellisonbg Fixing docstring in the notebook manager. c29ee28
@ellisonbg ellisonbg Minor fixes to the css for print view. 8ca5592
@ellisonbg ellisonbg Added cell level cut/copy/paste. d10550f
@ellisonbg ellisonbg Adding keyboard sortcuts for cut/copy/paste. 88738d0
@fperez fperez Merge pull request #1229 from takluyver/i1225
Fix display of SyntaxError in Python 3, plus various cleanups to exception-handling machinery.

Closes #1225.
@minrk minrk kernel heartbeat does not share zmq context with rest of the app
This prevents the heartbeat from ever waiting for the GIL, which
could cause erroneous heartbeat failures.
@minrk minrk add test notebook and script for #1260 (GIL-related heartbeat failures)
per #1127
@takluyver takluyver Fix syntax for Python 2.6 - no set literals. a8dc95a
@minrk minrk fix null comparisons in sqlitedb backend
associated test added and passing
@minrk minrk parallel heart also gets its own Context 6c32815
@minrk minrk Merge pull request #1262 from minrk/hbgil
Heartbeat no longer shares the app's Context

Fixes in both the single and parallel kernels, preventing the heartbeat thread from sharing the zmq Context with the rest of the process.  Non-copying sends require grabbing the GIL from the zmq io-thread in order to free memory, which could let Python get in the way of the heartbeat.

Test script and notebook added to examples directory.

closes #1260
@minrk minrk match log format in Scheduler to rest of parallel apps 05f49f2
@minrk minrk add NoDB for non-recording Hub
When used, this disables database-based actions in the Hub.

Useful for minimizing Hub memory consumption.
@minrk minrk Merge pull request #1253 from ivanov/profile_auto_create
set auto_create flag for notebook apps

Fixes first use of bundled profiles when used with the notebook (e.g. ipython --profile=sympy).
@minrk minrk document TaskScheduler.hwm behavior 7c46401
@minrk minrk Merge pull request #1257 from minrk/kmclass
use self.kernel_manager_class in qtconsoleapp

Subclasses of QtConsoleApp can now override kernel_manager_class with their own version.
@minrk minrk Merge pull request #1222 from minrk/mapreference
allow Reference as callable in map/apply

This allows behaviors like:

    rf = parallel.Reference('f')
    ar =, *sequences)

where the function 'f' is defined on the engines, and can even be different.
@minrk minrk Merge pull request #1267 from minrk/nodb
add `--nodb` option for non-recording Hub

This allows simple use cases to avoid needing to call `purge_results` to prevent memory growth of the Hub.
@minrk minrk Merge pull request #1213 from punchagan/minor-typo
Fix minor typo in
IPython member

@ellisonbg can you explain this commit? It's causing problems for launchpad, since they can't handle submodules. However, this location is not part of IPython either before or after this commit, so it appears to have had exactly no effect other than breaking something in launchpad. Were you using submodules locally that were not actually part of trunk?

IPython member

See the lp import page for the relevant error messages. We are going to have to rebase IPython to remove this commit (which probably never should have happened) if we want IPython to be importable in bzr for at least the next few months before submodule support is added, even though we never actually had any submodules. As I understand it, this would be necessary for @juliantaylor's nightly ppa.

/cc @fperez

IPython member

Nasty, I wonder what's wrong with that commit: if I check out the parent 813d390, the subdirectory with codemirror2/ looks perfectly normal.

I don't understand why the commit shows up with that strange message -Subproject commit 3b731bb8c16efc8cb82b9f28a9ed91428d71a703...

In any case, if we need to do a rebase, the sooner the better... But we should announce it on-list so everyone knows what's going on.

IPython member

'Subproject commit' means it's a submodule. The parent introduced it, and this fix should have been applied with a 'fixup', rather than allowing the original commit to stand.

IPython member
IPython member
IPython member

Should I do the rebase and force push? It's trivial to do, and I've pushed the result to my newmaster branch, which shows an empty diff with master.

IPython member
IPython member

Ones created since the last bad commit ('absolute imports' and after) will probably need a rebase, but I can't be sure. I'll go ahead, and notify the list.

IPython member
IPython member

Great, I will have a look at this.

IPython member

@hhuuggoo, there's a problem with this PR: it's showing a huge list of unrelated commits, most likely because you merged from origin/master. Please make a separate branch in your own repo that only shows the changes you want us to review, in this case your commit above. We can then see those changes in isolation, discuss them and merge them once everything is OK. But in its current form it can't even be reviewed.


sure, sorry about that, I'm not sure what happened, I thought I had started with a fresh fork. let me do it again.

@hhuuggoo hhuuggoo closed this Jan 20, 2012
IPython member

Hi everyone, this has been moved to #1299 with a clean branch, we can continue there.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment