Commit Graph

1336 Commits

Author SHA1 Message Date
Matthias BUSSONNIER
a05bb1cfe3 fix default empty option 2013-02-10 17:23:10 +01:00
Matthias BUSSONNIER
f74bb684f6 Make CodeMirror configurable
Both on a per class and per instance basis, using an option dict
in constructor and per class dict
2013-02-10 14:56:07 +01:00
Bussonnier Matthias
0e3b818ff9 Merge pull request #2876 from Carreau/fixctff
fix celltoolbar layout on FF

Ok, bug was due to an extra empty div... This seem to lok ok on both FF and Chrome OS X.

Think of adding 
$.getScript('/static/js/celltoolbarpresets/example.js')

to your custom.js to fully test.
2013-02-10 04:35:29 -08:00
MinRK
e1748fe10a fix last remaining KernelApp reference 2013-02-09 15:48:05 -08:00
Matthias BUSSONNIER
f54216e4f6 monkey patch codemirror with new functionality
use marijnh recommended way:
https://github.com/marijnh/CodeMirror/pull/661
2013-02-09 22:39:05 +01:00
Matthias BUSSONNIER
5f135d66ea pass baseUrl as option 2013-02-08 14:12:42 +01:00
Bussonnier Matthias
6561a98368 change more baseurl 2013-02-08 00:38:12 +01:00
Bussonnier Matthias
a0b9736397 make base project url a method on notebook list 2013-02-08 00:10:14 +01:00
Bussonnier Matthias
09e221af6b add option in menubar to set baseproject url 2013-02-07 23:56:20 +01:00
Bussonnier Matthias
7a300d7ff3 make baseProjectUrl a method in Menubar 2013-02-07 23:32:48 +01:00
MinRK
cb56d2378b exclude fabfile from tests
closes #2890
2013-02-07 09:03:42 -08:00
Matthias BUSSONNIER
2fbb909bb3 get monospace pager back 2013-02-05 18:09:22 +01:00
Matthias BUSSONNIER
93b5ea9d86 remove one useless element 2013-02-05 09:49:54 +01:00
Matthias BUSSONNIER
9ba887ed95 fix button css 2013-02-05 09:40:32 +01:00
Matthias BUSSONNIER
a9e06112ef minor css fixes 2013-02-03 12:47:37 +01:00
Matthias BUSSONNIER
c426f8d40d fix celltoolbar layout on FF 2013-02-03 12:17:01 +01:00
MinRK
d684fb8529 fix payload keys
A few changes left out from PR #2854

prevented pager or set_next_input (%load) from working in the notebook.
2013-01-31 21:14:32 -08:00
Brian Granger
182ac53568 Fixing styling of toolbar selects on FF. 2013-01-31 13:40:40 -08:00
Brian E. Granger
25fb761da3 Merge pull request #2708 from Carreau/less-css
Less css
2013-01-31 12:18:51 -08:00
Matthias BUSSONNIER
97558508a2 fix mdcell background color 2013-01-31 19:50:48 +01:00
Matthias BUSSONNIER
478d8b9818 remove selected cell background 2013-01-31 13:30:14 +01:00
Matthias BUSSONNIER
3ba80dd0ac use super in templates 2013-01-30 19:06:21 +01:00
Matthias BUSSONNIER
023a53e3f5 re-fix cluster list 2013-01-30 19:01:33 +01:00
Matthias BUSSONNIER
a19c9c2ed6 propagate use_less flag in all pages 2013-01-30 18:54:31 +01:00
Matthias BUSSONNIER
38cc133273 move ref css ipynb 2013-01-30 15:20:43 +01:00
Matthias BUSSONNIER
fe9bcdec21 fix line below header 2013-01-30 14:53:32 +01:00
Matthias BUSSONNIER
c3b2d7d4d5 fix global font size 2013-01-30 14:46:34 +01:00
Matthias BUSSONNIER
45e4e0809a fix celltoolbar css 2013-01-30 14:43:08 +01:00
Matthias BUSSONNIER
0d68be801d some css fixes 2013-01-30 13:53:41 +01:00
MinRK
c4c8d970aa define and test IPython.kernel public API 2013-01-29 20:44:33 -08:00
MinRK
11a01f86ce move IPython.inprocess to IPython.kernel.inprocess 2013-01-29 19:34:51 -08:00
MinRK
1d0cae7b2e mv IPython.zmq to IPython.kernel.zmq 2013-01-29 15:17:07 -08:00
MinRK
77715d328a move multikernelmanager to IPython.kernel 2013-01-29 14:41:09 -08:00
MinRK
ff113b106e move zmq.KernelManagers into IPython.kernel 2013-01-29 14:19:57 -08:00
Matthias BUSSONNIER
f2f07f3d6f fix alignemtn 2013-01-29 23:07:19 +01:00
Matthias BUSSONNIER
1599ac6470 fix color 2013-01-29 22:30:28 +01:00
Matthias BUSSONNIER
030211f073 fix tooltip 2013-01-29 22:25:20 +01:00
Matthias BUSSONNIER
af47d9b287 fix border color and select height 2013-01-29 22:04:43 +01:00
MinRK
1f35decb54 move IPKernelApp from zmq.ipkernel to zmq.kernelapp
- merged IPKernelApp into KernelApp, they are no longer separate classes
- embed_kernel moved to its own file
- ipkernel now only contains the Kernel class
- associated imports updated
2013-01-28 22:27:50 -08:00
MinRK
98dd01411e test IPython.kernel 2013-01-28 22:25:58 -08:00
MinRK
8338b936db move utils.kernel (formerly entry_point and lib.kernel) to kernel.util 2013-01-28 20:23:16 -08:00
MinRK
b24d16b532 move IPython.lib.kernel to IPython.utils.kernel
where it always should have been.
2013-01-28 20:06:42 -08:00
MinRK
c699d0f6a5 fix callback testing for pyzmq version_info 2013-01-28 16:06:56 -08:00
MinRK
1c196310d4 bump minimum pyzmq version to 2.1.11
and remove the associated workarounds for old pyzmq
2013-01-28 14:21:56 -08:00
Matthias BUSSONNIER
502fbe92c9 not minify option 2013-01-26 17:29:32 +01:00
Matthias BUSSONNIER
8cfd098bbf migrate from make to fabric 2013-01-26 17:12:52 +01:00
Matthias BUSSONNIER
f2575f15be speedup tooltip 2013-01-26 11:05:37 +01:00
Matthias BUSSONNIER
7ddc6df4b7 speedup transition adn use class instead of id 2013-01-26 11:05:36 +01:00
Matthias BUSSONNIER
3b4a92742c replace tab by space comment print view action 2013-01-26 11:05:36 +01:00
Matthias BUSSONNIER
44ca075073 fix select width in toolbar 2013-01-26 11:05:36 +01:00
Matthias BUSSONNIER
09f6c1a2cc add css reference notebook 2013-01-26 11:05:36 +01:00
Matthias BUSSONNIER
3b62d50398 condense rendered_html css 2013-01-26 11:05:36 +01:00
Matthias BUSSONNIER
79a2d0bbd7 use nested rule in rendered_html less file 2013-01-26 11:05:36 +01:00
Matthias BUSSONNIER
011db71f21 fix stdr background 2013-01-26 11:05:36 +01:00
Matthias BUSSONNIER
3665ce85dc fix body overflow on dashboard 2013-01-26 11:05:35 +01:00
Matthias BUSSONNIER
cc821b35fc min and default for engine number 2013-01-26 11:05:35 +01:00
Matthias BUSSONNIER
0996bfffd3 change to cluster list
fix css and make engine input of type number
2013-01-26 11:05:35 +01:00
Matthias BUSSONNIER
d078afb51a use less as a component 2013-01-26 11:05:35 +01:00
Matthias BUSSONNIER
6217b6283e fix a few css rules
especially since the introduction of celltoolbar
2013-01-26 11:05:35 +01:00
Matthias BUSSONNIER
1991cc187e remove trailing whitespace 2013-01-26 11:05:35 +01:00
Matthias BUSSONNIER
29da710c27 use bootstrap as component with bower 2013-01-26 11:05:35 +01:00
Matthias BUSSONNIER
d173d4613b fix css toolbar 2013-01-26 11:05:34 +01:00
Bussonnier Matthias
1026e4d3b3 use varaible for background color 2013-01-26 11:05:34 +01:00
Bussonnier Matthias
df22cad01c clean css.
remove some Ui-widget where unnecessary,

Don't show toolbar on media-print
2013-01-26 11:05:34 +01:00
Bussonnier Matthias
1ed845bce0 slight typography changes 2013-01-26 11:05:34 +01:00
Bussonnier Matthias
4bd2f4fc01 Fix project path url in dashbord
Use Bootstrap breadcrumbs for later navigation purpouse
2013-01-26 11:05:34 +01:00
Bussonnier Matthias
654a7d3189 fix cell type selector css 2013-01-26 11:05:34 +01:00
Bussonnier Matthias
d5a6b1f382 Add and remove boostra squashed commit
To reduce branch size as bootstrap is huge

add default bootstrap theme
does not import code in bootstrap
remove bootstrap
2013-01-26 11:04:46 +01:00
Bussonnier Matthias
bf04da4384 readd flexible-box-model 2013-01-26 11:01:28 +01:00
Bussonnier Matthias
d71a490c12 make file and other less 2013-01-26 11:01:28 +01:00
Bussonnier Matthias
412b54b21f fix print css less 2013-01-26 11:01:28 +01:00
Bussonnier Matthias
452efb67ed less flag in templates 2013-01-26 11:01:28 +01:00
Bussonnier Matthias
cf4bc5080a generate style.css 2013-01-26 11:01:28 +01:00
Bussonnier Matthias
d46b6ad3b9 add less flag 2013-01-26 11:01:28 +01:00
Bussonnier Matthias
689922031c main_app -> ipython-main-app 2013-01-26 11:01:27 +01:00
Matthias BUSSONNIER
e383eb10bf remove useless classes 2013-01-26 11:01:27 +01:00
Matthias BUSSONNIER
33cd3b7f1f use less for tooltip 2013-01-26 11:01:27 +01:00
Matthias BUSSONNIER
430f44dd72 Revert "remove less.css"
This reverts commit 076a0fac5a12d4b674f2343f484a2c983a410219.
2013-01-26 11:01:27 +01:00
Matthias BUSSONNIER
ff8339641b start mixins 2013-01-26 11:01:27 +01:00
Matthias BUSSONNIER
53a48ac7eb start to migrate to variables 2013-01-26 11:01:27 +01:00
Matthias BUSSONNIER
c4ad378cbb start introducing less 2013-01-26 11:01:27 +01:00
W. Trevor King
d1506a5a02 frontend.html.notebook: Use utils.localinterfaces.LOCALHOST 2013-01-25 14:45:39 -05:00
Min RK
9f5baaf821 Merge pull request #2811 from minrk/ipc_defaults
Still more KernelManager cleanup

Finish up some more work from #2775

closes #2722

- [x] ip/transport configurables only live on KernelManager objects, not ConsoleApp
- [x] fix default ipc paths in `ipython kernel` and `ipython notebook` cases
- [x] fix ipc file cleanup in a few more cases
- [x] add `--transport` alias for all appropriate entry points
2013-01-24 11:58:24 -08:00
Brian E. Granger
11d65e3bac Minor changes.
* Removed Tooltip._cmfocus as it was doing nothing.
* Removed debug console.log in notification area.
2013-01-21 23:20:50 -08:00
Brian E. Granger
8698f6af46 Removing call to $.browser which went away in jQuery 1.9.
I have also cleaned up some calls to console.log.
2013-01-21 23:17:19 -08:00
Brian E. Granger
b9193360a2 Refactoring WebSocket connection failure logic.
This completely decouples the connection failed event in kernel.js
from its handling in notificationarea.js.
2013-01-21 18:39:14 -08:00
Brian E. Granger
0d94e67a47 Making completer.js independent of IPython.notebook. 2013-01-21 17:00:08 -08:00
Brian E. Granger
e5d355dfd1 Fixing notebook.css to make more robust in embedding. 2013-01-21 16:57:43 -08:00
Brian E. Granger
7714f3d058 Removing IPython.notebook references from tooltip.js 2013-01-21 16:48:22 -08:00
MinRK
827c17a74f change ol format order
from: I.A.1.a.i

to: 1.A.a.i
2013-01-19 18:03:25 -08:00
MinRK
fa989a99a1 ip/transport live in KernelManager now
remove them as configurables in the Application objects
2013-01-18 21:21:17 -08:00
Brian E. Granger
f7b78af056 Merge pull request #2789 from ellisonbg/celltoolbar-style
Fixing styling issues with CellToolbar.
2013-01-18 12:29:00 -08:00
Brian Granger
4c5cbb71ea Removing unneeded ui-widget class. 2013-01-18 10:41:04 -08:00
MinRK
0fb7232c77 fix KeyError creating ZMQStreams in notebook
typo in PR #2775 prevented connections from being established
2013-01-18 00:04:01 -08:00
Min RK
40fb853bc7 Merge pull request #2775 from ellisonbg/kernelid
General cleanup of kernel manager code.

This does some general cleanup of MultiKernelManager to better reflect how it is actually being used.

Sometimes there is a need to create kernel_id's elsewhere in code.  This minor change allows a kernel_id to be created outside of the MultiKernelManager and passed in as a kwarg.  An exception is raised if the id is already used.

Tasks:

- [x] Fix cleanup of ipc files.
- [x] Allow kernel_id to be passed to MultiKernelManager.start_kernel.
- [x] Add ipc support to MultiKernelManager.
- [x] Add more tests for MultiKernelManager.
- [x] Rename sub channel to iopub channel everywhere.
- [x] Use consistent naming for all channel classes in zmq, inprocess and qt.
- [x] Move BlockingChannelMixin to zmq.blockingkernelmanager.
- [x] Create ABC for KernelManager.
- [x] Make the InProcessKernelManager a Configurable.
- [x] Cleanup docstrings in ABCs.
- [x] Add tests for KernelManager.
- [x] Check over MultiKernelManager.
- [x] Make KernelManager,kill_kernel private in ABC and implementations.
- [x] Find bug that is causing the kernel manager tests to hang unless the shell channel linger is set to 0.
- [x] Decide about critical logging in ipkernel.
- [x] Debug lack of stderr redirect in tests.
2013-01-17 22:06:47 -08:00
Brian Granger
fc7a20a8e1 Decoupling the celltoolbar select UI from CellToolbar.
The select menu for celltoolbar presets should live entirely in
the maintoolbar code - it was 1/2 in CellToolbar itself. This
fixes this issue using events and an additional method on
CellToolbar (list_presets).
2013-01-17 16:42:24 -08:00
Brian Granger
fd34f3d536 Minor tweaks to the css to enable single cell hide/show. 2013-01-17 15:39:07 -08:00
Brian Granger
b6c7d7965c Further cleanup for celltoolbars. 2013-01-17 15:26:08 -08:00
Matthias BUSSONNIER
a27a0f4980 gshow 2013-01-17 15:26:08 -08:00
Brian E. Granger
dcf874e93f Fixing styling issues with CellToolbar.
* Width of CellToolbar was off on Linux Chrome+Firefox.
* Minor styling cleanups.
2013-01-17 15:26:07 -08:00
Brian E. Granger
0fb34356a3 Fixing last few things with the test suite for kernel managers. 2013-01-16 21:12:09 -08:00
Brian E. Granger
deb05ec4a2 Make KernelManager.kill_kernel private.
* kill_kernel -> _kill_kernel.
* Removed it from the ABC and implementations where approp.
2013-01-16 19:45:27 -08:00
Min RK
def9d4c51e Merge pull request #2796 from kmike/cookie-fix
py3k: fix unicode/bytes cookie parsing under Python 3.x
2013-01-16 16:51:20 -08:00
Brian Granger
b7dd63d720 Creating an ABC for kernel managers and channels. 2013-01-16 14:53:34 -08:00
Brian E. Granger
2900b67ff3 Adding calls to shell_channel.stop() to shutdown.
But this hangs the test suite for IPython.frontend.html.notebook.
2013-01-16 13:58:29 -08:00
Brian E. Granger
afaad23a57 Adding tested ipc support to MultiKernelManager. 2013-01-16 13:58:28 -08:00
Brian E. Granger
64bec56589 Refactoring kernel_died method to make subclass friendly. 2013-01-16 13:58:28 -08:00
Brian E. Granger
f37d707c08 Creating application.config attribute.
This creates less coupling between the handlers and the outer
IPython application.
2013-01-16 13:58:28 -08:00
Brian E. Granger
ac1a8b0458 Removing return value of restart_kernel.
The kernel_id is *always* the same under a restart and there
is no need to return it. The restart handler does pass
the original kernel_id back to the browser as it currently uses it.
2013-01-16 13:58:28 -08:00
Brian E. Granger
82f4cf5574 General cleanup of kernelmanger.MultiKernelManager. 2013-01-16 13:58:27 -08:00
Brian E. Granger
ea2dc2ecd5 Allow caller of MultiKernelManager.start_kernel to pass kernel_id. 2013-01-16 13:58:27 -08:00
Mikhail Korobov
57cecc70c2 P3K: fix cookie parsing under Python 3.x (+ duplicate import is removed) 2013-01-17 02:51:06 +06:00
Brian E. Granger
4fadfecbb7 Merge pull request #2724 from pberkes/embedded-ipython-v2
In-process kernel support (take 3)
2013-01-16 12:32:21 -08:00
Brian E. Granger
eff5fa878d Merge pull request #2687 from Carreau/metaui-slideshow
[WIP] Metaui slideshow
2013-01-15 15:12:28 -08:00
Matthias BUSSONNIER
3e60977364 load slideshow by default 2013-01-15 21:05:17 +01:00
debjan
47466fb8ea Chrome frame awareness 2013-01-15 03:21:22 +01:00
Matthias BUSSONNIER
7163dc717f Uppercase and update path 2013-01-14 22:23:23 +01:00
Matthias BUSSONNIER
94279745b9 Change Slide denomination
> Slide
> Subslide
> Fragment
> Skip
> Notes
2013-01-14 21:35:56 +01:00
Matthias BUSSONNIER
705081cc04 add slideshow extension/preset for celltoolbar 2013-01-14 21:26:08 +01:00
Matthias BUSSONNIER
3e52d29b61 fix example.js 2013-01-14 19:28:04 +01:00
Matthias BUSSONNIER
7401054c94 Capitalize 2013-01-14 19:10:55 +01:00
Matthias BUSSONNIER
33b810fe53 fix celltoolbar select css 2013-01-14 08:48:38 +01:00
Matthias BUSSONNIER
4e20188968 Load default.js (for celltoolbar) by default
And change text.
2013-01-14 08:42:10 +01:00
Matthias BUSSONNIER
4e3f8edb88 add default celltoolbar UI 2013-01-14 08:40:58 +01:00
Matthias BUSSONNIER
69859c1057 change set_preset to activate_preset
update docs
2013-01-14 08:40:57 +01:00
Matthias BUSSONNIER
f76279d858 remove commented css 2013-01-14 08:40:57 +01:00
Matthias BUSSONNIER
28e90b40d2 fix lock cell button
'flase' is true while false is false
2013-01-14 08:40:57 +01:00
Matthias BUSSONNIER
c236253e80 change - to Hidden 2013-01-14 08:40:57 +01:00
Matthias BUSSONNIER
eb5911a3c1 create celltoolbar in cell.js and inherit 2013-01-14 08:40:57 +01:00
Matthias BUSSONNIER
08225b2ed4 slightly generalize utils generator 2013-01-14 08:40:57 +01:00
Matthias BUSSONNIER
8b7db8d6da remove useless jquery selector 2013-01-14 08:40:57 +01:00
Matthias BUSSONNIER
f88001f481 fix css size 2013-01-14 08:40:57 +01:00
Matthias BUSSONNIER
1e4eb5c527 do not use alert on invalid json 2013-01-14 08:40:56 +01:00
Matthias BUSSONNIER
ffa1cf20a3 remove relative position 2013-01-14 08:40:56 +01:00
Matthias BUSSONNIER
4b957111ed remove most of the duplicate example 2013-01-14 08:40:56 +01:00
Matthias BUSSONNIER
a16c361a4b rename _button_list to _ui_controls_list 2013-01-14 08:40:56 +01:00
Matthias BUSSONNIER
c313127651 rename file metaui->celltoolbar 2013-01-14 08:40:56 +01:00
Matthias BUSSONNIER
f55a0a05b8 rename metaui -> celltoolbar 2013-01-14 08:40:55 +01:00
Matthias BUSSONNIER
3cc81dbb8f convention, jQuery variable start with $
all this.xxxx = $(...) change to
    this.$xxxx

I'm thinking of potentially doing it also in parameters that are
expected to be jQuery enabled.
2013-01-14 08:40:55 +01:00
Matthias BUSSONNIER
1c97a7232f enable dropdown preset change 2013-01-14 08:40:55 +01:00
Matthias BUSSONNIER
040a27cacc add a small default metaui-toolbar
just a question mark which pop-up a small text
2013-01-14 08:40:55 +01:00
Matthias BUSSONNIER
d18d975a50 create metadata-dropdowm-menu generator 2013-01-14 08:40:54 +01:00
Matthias BUSSONNIER
70f8001b14 Split metadataui into multiple file
Add example metadata UI into multiple categorized files.
And document how to load it using custom.js.
2013-01-14 08:40:54 +01:00
Matthias BUSSONNIER
1ae472cf1c add utils and docs for metadata UI
add aconvenient utils to generate UI for checkboxes

and use it to generate 3 checkboxes for
new_section
new_subsection
new_fragment
2013-01-14 08:40:54 +01:00
Matthias BUSSONNIER
8022cff041 Add a per cell toolbar.
This add a per-cell globally toggleable toolbar
the main purpouse is to easily edit metadata.

this come with a few example like adding checkbox,
dropdown list, simple button, button with icon...

please see the js-doc of
IPython/frontend/html/notebook/static/js/MetaUI.js
for more info
2013-01-14 08:40:54 +01:00
Brian E. Granger
60d158af2a Removing unused code in the notebook MappingKernelManager.
This cleans up the API for restarts in the notebook's kernel
manager classes.
2013-01-11 10:39:21 -08:00
Bussonnier Matthias
730eff0a1e Merge pull request #2728 from Carreau/shifttab
also bind shift tab for tooltip + config

This does not change the curent behavior, only add the shift+tab shortcut.

Note that the shift tab shortcut has a slightly different behavior. You can select part of a line and pressing shift-tab will show you the tooltip only for the selection.

This is disabled for multiline selection to still allow to unindent block of code, Keep in mind that the real real shortcut for indent unindent is Ctrl+] or [ . Select/tab is not really supported by codemirror.

Finally the "tooltip_on_tab" behavior is globally configurable via IPython.config so that it could be easily switched to false.

It can be overridden via js console for test purpose.

IPython.config.tooltip_on_tab = true | false
Take effect immediately, only on current notebook.

or globally via custom.js

var user_conf = {tooltip_on_tab:false | true};
$.extend(IPython.config, user_conf)
2013-01-05 02:31:12 -08:00
Bussonnier Matthias
6c148e175a Merge pull request #2723 from Carreau/fixes-2720
diverse fixes for project url

- Force leading and trailing slashes in base_project/kernel_url
- Add support for the prefix in template for static files
- Fix some forgotten quotes
- remove old make_static_url which is now a jinja2 macro
2013-01-03 02:32:40 -08:00
mr.Shu
5df5cc8035 added blockquote CSS 2012-12-31 11:45:29 +01:00
Bussonnier Matthias
5eb3850ae1 shift tqb for tooltip 2012-12-29 23:00:58 +01:00