Commit Graph

568 Commits

Author SHA1 Message Date
Brian E. Granger
c900979a80 Misc changes to the notebook.
* IPythonNotebookApp->NotebookApp.
* Cleaned up html templates of unused stylesheets.
2011-10-18 17:55:25 -07:00
Brian E. Granger
7611a38721 Minor changes to handlers. 2011-10-18 17:55:25 -07:00
MinRK
4f26dae311 don't present meaningless username option in notebook
username isn't used for anything other than hash input
for authentication, so remove the field in the login form
and just use a uuid.
2011-10-18 17:55:25 -07:00
Brian E. Granger
66d5c9f8a6 Adding base_project_url and base_kernel_url as HTML data attribs.
* Also saving the notebook_id using that as well.
2011-10-18 17:55:25 -07:00
Fernando Perez
986f2e7223 Merge pull request #893 from minrk/clearoutput
Adding clear_output to kernel and HTML notebook.

This enables the clearing of output during the execution of a cell. It can be used for simple forms of animation in the notebook.
2011-10-18 17:55:13 -07:00
MinRK
033c9d9848 Add tooltips to the notebook via 'title' attr.
All buttons, show/hide clickable areas, etc. should have some tooltip describing
what they do.  There are jQuery plugins for enhanced tooltips, but this gets
the lightest version working.

closes #436
2011-10-18 17:43:29 -07:00
MinRK
24d37b6bcc add channel-selection to clear_output
example notebook updated accordingly
2011-10-17 19:27:50 -07:00
Brian Granger
10deb3b744 Adding clear_output to kernel and HTML notebook. 2011-10-17 16:19:58 -07:00
Fernando Perez
9fa9f0b15f Merge pull request #884 from fperez/nb-usability
Various Notebook usability fixes:

- add kernel restart dialog confirmation (it destroys the user session)
- add missing keybindings
- change language from 'terminal mode' to 'in-place execution' which is more descriptive
- adjust spacing/padding and colors slightly for readability and better use of space in small screens.
- add line numbering toggle to code cells.  Triggered with C-m-l.
- show keybindings in monospaced font.
- add QuickHelp button that is always visible and at the top.
- add missing keybindings for kernel interrupt/restart from the kbd.
2011-10-17 16:10:25 -07:00
Fernando Perez
55223d0414 Adjust title area sizes to improve alignment. 2011-10-17 16:07:40 -07:00
MinRK
a42f678fd1 Merge PR-883
Notify user if notebook save fails.

closes #883
2011-10-17 15:24:53 -07:00
Fernando Perez
781c5ad281 Underline quick help button key accelerator (h). 2011-10-17 15:23:57 -07:00
MinRK
8d139492ce show_keyboard_shortcuts -> toggle_keyboard_shortcuts
Now multiple calls no longer show multiple instances of the shortcut dialog.  Rather, clicking the quick help, or invoking `C-m h` will hide
the dialog if shown.
2011-10-17 15:02:05 -07:00
MinRK
53d10a61ab fix quickhelp widget
Move header.js -> quickhelp.js, as it not longer acts on whole header.
2011-10-17 14:58:08 -07:00
Thomas Kluyver
74771e4037 Add ability to open the notebook in a browser when it starts. 2011-10-17 22:33:02 +01:00
Fernando Perez
b06d0f03c6 Adjust cell background and number color after review with @minrk. 2011-10-17 14:00:38 -07:00
Fernando Perez
77c62893bc Keep kernel-related bindings together in code. 2011-10-17 00:43:47 -07:00
Fernando Perez
1a109765b8 Clean up accidentally introduced hard tabs in JS code. 2011-10-17 00:37:27 -07:00
Fernando Perez
83790b7e29 Fix text cell color, was too light to be seen on certain monitors/browsers. 2011-10-16 20:02:53 -07:00
Fernando Perez
e9d744f06c Add quick help button: broken ATM, style and binding aren't working.
Help needed here, will discuss during pull request before merging.
2011-10-16 20:02:53 -07:00
Fernando Perez
6d0715988f Change button labels in restart dialog to action words. 2011-10-16 20:02:53 -07:00
Fernando Perez
e852a86669 Add confirmation dialog to kernel restart action. 2011-10-16 20:02:53 -07:00
Fernando Perez
e41ba5a75c Refactor line num. toggle into proper function, access via C-m-l.
This makes the keybinding consistent with the rest, updated help dialog.
2011-10-16 20:02:53 -07:00
Fernando Perez
8fb9f71e42 Use monospaced font for keybinding display. 2011-10-16 20:02:53 -07:00
Fernando Perez
e8326241eb Add C-m-{'i', '.'} as keybindings for kernel interrupt/restart. 2011-10-16 20:02:53 -07:00
Fernando Perez
3db974a4f4 Padding adjustments to better use vertical and horizontal whitespace.
Verified that all prompts align correctly on linux/chrome + ffox, and
that input prompts up to 4 digits long still fit.
2011-10-16 20:02:53 -07:00
Fernando Perez
e00e604144 Add Ctrl-L as a way to toggle line-numbers for any individual code cell 2011-10-16 20:02:53 -07:00
MinRK
7041224f96 fix typo in stripping kernel args in nb and qt
closes #885
2011-10-16 19:56:47 -07:00
Felix Werner
a4bec7e65d Fixed testing of new notebook name before saving. 2011-10-16 19:35:18 +02:00
Felix Werner
f5b52442aa Notify the user of errors when saving a notebook. 2011-10-16 18:24:12 +02:00
Felix Werner
a89d947322 Update document title and last_saved_name only after a successful save. 2011-10-16 18:18:32 +02:00
Fernando Perez
13377a2d23 Merge branch 'carreau-mathjax-warning'
Warn user if MathJax can't be fetched from notebook

Closes #744.
2011-10-15 01:28:08 -07:00
Fernando Perez
87462b4259 Minor fixes to text and formatting of error message. 2011-10-15 01:27:36 -07:00
Fernando Perez
df43150509 Merge pull request #850 from fperez/codemirror
Update codemirror to 2.15 and make the code internally more version-agnostic.

Added our own README file with information about what changes we carry to upstream CodeMirror and what version we currently use.
2011-10-14 13:30:55 -07:00
Matthias BUSSONNIER
85ea4222fb Hide warning message about matjax when page load
also fix Matjax->MathJax
2011-10-14 19:28:36 +02:00
Matthias BUSSONNIER
b05d2c21a9 Matjax Warning message improvement.
merge '<script>' balises.
	Improve message text and style.
	Remove instead of hide
2011-10-14 11:10:15 +02:00
Fernando Perez
00af93da43 IPython-specific changes to CodeMirror: recognize '?' in Python mode. 2011-10-13 19:55:21 -07:00
MinRK
52592d47b1 fix missing trailing comma in kernel.js 2011-10-13 13:31:18 -07:00
Matthias BUSSONNIER
4d5e605082 Warn user if MathJax can't be fetched from notebook
closes #744
2011-10-13 20:50:41 +02:00
MinRK
4d7ef4899e enable HMAC message signing by default in notebook kernels
This is separate from previous, because it is more likely to be rejected.

It requires the the Session objects in Handlers get a reference all the way back up to the IPython App that started the environment.
2011-10-12 21:28:04 -07:00
MinRK
b01c6ef0c4 use zmq.KernelManager to manage individual kernels in notebook
This means that proper restart is now available, rather than
killing and starting a new kernel, breaking connections to
secondary frontends.
2011-10-12 21:28:04 -07:00
MinRK
e38729c9b2 fix kernel_argv scrubbing to cover args passed with space
$> ipqt --shell 12345

would not scrub the port, previously
2011-10-12 21:28:03 -07:00
MinRK
4eb4926812 use ROUTER/DEALER sockets for stdin
stdin requests are now directed to the frontend that made the execution
request that called raw_input.

allow_stdin flag added to execution_request to indicate whether stdin_requests are allowed.

StdInNotImplementedError exception class added to IPython.core.error, and is raised if raw_input is called from execute requests where allow_input is undefined.

closes gh-673
2011-10-12 14:29:22 -07:00
Fernando Perez
b8bab4a051 Update templates to new directory name for codemirror. 2011-10-09 16:36:34 -07:00
Fernando Perez
9cca38f452 Do not use version # in codemirror directory name.
Simply call it 'codemirror', so we don't have explicit version numbers
inside a bunch of files.

A file called ipython-version-N.NN will be kept to easily let us know
which version we're shipping with IPython.
2011-10-09 16:36:34 -07:00
Fernando Perez
6b0fdf2356 Update CodeMirror code to v2.15 2011-10-09 16:36:34 -07:00
Fernando Perez
99c90f43c9 Merge pull request #845 from takluyver/py3-tests
This gets the bulk of the test suite passing on Python 3 - there's just a few isolated cases where it still doesn't.
2011-10-09 11:54:13 -07:00
Fernando Perez
43a4db17e6 Merge pull request #830 from minrk/stream
Several improvements to stdout/stderr handling and visual layout of cells.

Now stdout and stderr are kept contiguous (in a single div) if they are being written to continuously, and stderr is shown with a light red background to help distinguish from stdout.

Further, input cells now have a light gray background to help distinguish them from plain stdout areas.
2011-10-08 15:52:53 -07:00
Thomas Kluyver
c61d455a77 Various fixes to tests in IPython.utils. 2011-10-08 13:08:44 +01:00
MinRK
940d636656 fix Input prompt/code alignment
with note for future reference
2011-10-07 20:59:54 -07:00
MinRK
30028c3ca0 round corner and light bg on code areas
c/o @fperez
2011-10-07 19:05:19 -07:00
Fernando Perez
eba1a8c796 Merge pull request #801 from takluyver/py3-notebook
Gets the notebook working under Python3.
2011-10-07 18:57:32 -07:00
MinRK
c022dca01a small CSS adjustments in notebook
* add think border around input area
* change background instead of foreground on stderr
* only stderr/stdout are output_stream, general text (including streams) is output_text
* reduce vertical padding on stream output, per @fperez
2011-10-07 17:01:58 -07:00
Bernardo B. Marques
8e32204222 remove all trailling spaces 2011-10-04 11:14:41 -03:00
Thomas Kluyver
609e4134ff Decode data for saving notebook, allowing saving in Python 3. 2011-10-02 16:19:30 +01:00
MinRK
788d7e6348 allow stdout/stderr to have distinct css
make stderr output darkred
2011-09-30 17:09:46 -07:00
MinRK
a9d9a8b72c support contiguous stream output in notebook
Consecutive messages to stdout or stderr will not be split
into separate divs, until a new message to different stream
arrives.

Appending will only occur when the latest output is the same
as the new one. Interleaving messages will still result in
multiple divs.
2011-09-30 17:08:04 -07:00
MinRK
56c8403ac0 allow more processing in test_for
* test_for uses import_item, instead of __import__
* test_for now allows a callback, for processing the result of import_item prior to comparison with min_zmq
* callback is only called when min_zmq is defined
* callback's default is to just return mod.__version__
* use this to check tornado version, and zmq as a version tuple
* fix pexpect check to use external.pexpect
2011-09-23 16:57:40 -07:00
MinRK
50f9bd9ceb update tornado dependency to 2.1
The notebook server will no longer try to launch with 2.0.

Test imports and install doc updated to match.
2011-09-23 15:03:16 -07:00
Thomas Kluyver
0f5c0f67c9 Fix for notebook in Python 3. 2011-09-18 17:28:59 +01:00
MinRK
5dd7dce0b2 fix installation of zmq IOLoop into tornado
incorrectly overrode the module, rather than the class in the module, which is more reliable.
2011-09-15 15:12:52 -07:00
Brian Granger
b7ab64f304 fixConsole no longer trims the final text. 2011-09-12 21:12:08 -07:00
MinRK
88236a7ab8 always use StringIO, never cStringIO
cStringIO is not unicode-safe
2011-09-12 12:28:26 -07:00
MinRK
3ee19c6563 only store hashed user_id in notebook cookie
hashed user_id is used for authentication, rather than hashed password.  Thus, user cookie is only set after authentication succeeds.
2011-09-06 15:48:20 -07:00
Brian E. Granger
98393e9a28 Merge branch 'enh/httpauth' of https://github.com/satra/ipython into satra-enh/httpauth 2011-09-06 14:13:12 -07:00
Brian E. Granger
1ae92b2d88 Merge pull request #748 from ellisonbg/tornado-iptest
Check for tornado before running frontend.html tests.
2011-09-06 14:10:58 -07:00
MinRK
d11ef986a4 authenticate Websockets with the session cookie
Now all Notebook connections are authenticated.
2011-08-30 16:27:12 -07:00
MinRK
152fe1b6f1 Authenticate all notebook requests (except websockets)
* BaseHandler renamed AuthenticatedHandler
* also clears cookies if invalid, to prevent repeated 'Invalid cookie signature' warning messages.
2011-08-30 12:13:30 -07:00
MinRK
dbfe19f6e2 notebook auth adjustments
* keyword -> password
* removed password alias
* add login.html as template
* new cookie key for each Server instance
2011-08-30 11:24:52 -07:00
Brian E. Granger
8c76fcf71c Fixing Ctrl-Enter on Firefox. 2011-08-30 09:51:06 -07:00
Brian E. Granger
408fde5aa3 Check for tornado before running frontend.html tests. 2011-08-30 09:39:57 -07:00
Satrajit Ghosh
00986be4f8 fix: added keyword to notebook aliases 2011-08-29 21:36:39 +03:00
Satrajit Ghosh
546a0147fb fix: changed keyword input field to type password 2011-08-27 22:37:44 +03:00
MinRK
549cf4ee2a fix undefined 'session_id' member in kernel.js 2011-08-26 23:18:48 -07:00
Satrajit Ghosh
c4d90c8a08 enh: added authentication ability for webapp 2011-08-27 07:09:57 +02:00
Brian E. Granger
1021c3dc88 Merge branch 'fix/https' of https://github.com/satra/ipython into satra-fix/https 2011-08-25 11:43:58 -07:00
Brian E. Granger
c6d030761e Merge branch 'placeholder' of https://github.com/minrk/ipython into minrk-placeholder 2011-08-25 11:41:26 -07:00
MinRK
3aed0a0b94 use null char to start text cell placeholders 2011-08-25 08:51:30 -07:00
Satrajit Ghosh
7d0467df1c fix: applied fernando's if simplification fix 2011-08-25 12:25:26 +02:00
Satrajit Ghosh
1ae18b5be7 fix: display secure url with proper protocol 2011-08-25 11:42:17 +02:00
Fernando Perez
d1cfedaf16 Leave commented-out stable url code for reference, with TODO. 2011-08-25 02:29:33 -07:00
Brian E. Granger
f1e4a59777 Adding messages to HTTPError raising.
These messages are not returned to the browser, but are printed
to the server logs and will help the code readability.
I have also used a more specific code in some cases.
2011-08-24 11:29:16 -07:00
Brian E. Granger
acc81dfbee Ctrl-Enter now does not delete input, but selects it. 2011-08-24 10:31:41 -07:00
Brian E. Granger
fa8ab6f37d Going back to using uuid.uuid4() for notebook ids.
We were having problems with notebook renaming when using uuid5,
as there are many places in the code where we assume that the
notebook id is unique and unchanging as long as the notebook
server runs.
2011-08-24 10:16:21 -07:00
Brian E. Granger
706819d81c Merge branch 'htmlnotebook' 2011-08-23 15:47:57 -07:00
Brian E. Granger
0b19dd7bfe Temporary fix for placeholder related CM bug. 2011-08-23 12:31:37 -07:00
Brian E. Granger
c2df8a9005 Merge branch 'mathjax' of https://github.com/minrk/ipython into minrk-mathjax 2011-08-22 16:24:53 -07:00
MinRK
ba1df9be55 underline keyboard shortcut letter on buttons 2011-08-21 17:55:45 -07:00
Fernando Perez
b8c1ab1ada Fix above/below keybinding mismatch and rename api to use above/below 2011-08-21 17:54:03 -07:00
Stefan van der Walt
3a8811e115 Add code highlighting to markdown cells. 2011-08-21 14:14:16 -07:00
MinRK
638bc02a8f update notebook template to prefer offline mathjax 2011-08-20 17:01:56 -07:00
Stefan van der Walt
dfeb4342ed Align colons in help dialog. 2011-08-20 14:56:10 -07:00
Brian E. Granger
d60edf973d Changing prev/next keyboard shortcut to use p/n. 2011-08-19 22:00:25 -07:00
Brian E. Granger
b89d656a3c Fixing console.log messages related to keyboard shortcuts. 2011-08-19 21:49:32 -07:00
Brian E. Granger
cf0c66fe4e Adding keyboard shortcut help dialog. 2011-08-19 21:24:08 -07:00
Brian E. Granger
d3e67106a1 Adding keyboard shortcuts. 2011-08-19 20:10:32 -07:00
Fernando Perez
2522a651d9 Right-align prompts to remove spurious whitespace. 2011-08-19 17:46:46 -07:00
Brian E. Granger
5b19a85fa4 Adjusting width of prompt area. 2011-08-19 17:23:54 -07:00
Brian E. Granger
6798c5cc97 All output types are not indented. 2011-08-19 17:01:12 -07:00
Brian E. Granger
919a393622 Fixing bug in new metadata implementation. 2011-08-19 16:21:09 -07:00
Brian E. Granger
5cb8bb1f27 Reorganize the L panel buttons. 2011-08-19 16:18:59 -07:00
Brian E. Granger
ab384fc787 Cell collapse/expand is not called "Toggle". 2011-08-19 15:59:51 -07:00
Brian E. Granger
133b96d086 Changing CodeMirror-scroll to overflow-y: hidden.
* It seems that our old setting of visible was causing scroll bars
  to appear if font sizes change in Chrome.
* Also changed json -> xml in Download UI.
2011-08-19 15:49:50 -07:00
Brian E. Granger
ea8b4de42d Implemented metadata for notebook format. 2011-08-19 15:44:32 -07:00
Brian E. Granger
7e7a6ab50b Notebook upload handles filenames with periods. 2011-08-19 11:41:48 -07:00
Brian E. Granger
d5fe8328e5 Converting notebooks to JSON format. 2011-08-18 23:22:55 -07:00
Brian E. Granger
0784df1b9d Making JSON the default .ipynb format. 2011-08-18 23:11:50 -07:00
Brian E. Granger
4d15c8b8e5 Fixing logic for rename behavior. 2011-08-18 21:34:15 -07:00
Brian E. Granger
8f149a2623 Help links work on Firefox. 2011-08-18 20:37:47 -07:00
Brian E. Granger
cbe3563d8d Save button becomes Rename when the notebook name changes. 2011-08-18 20:23:03 -07:00
Brian E. Granger
f35f9323e6 Better tabindex support. 2011-08-18 20:16:33 -07:00
Brian E. Granger
1293556dde Double clicking on the end space will insert a new cell. 2011-08-18 20:07:14 -07:00
Brian E. Granger
b17100a63b Merge branch 'htmlnotebook_list_notebooks' of https://github.com/stefanv/ipython into stefanv-htmlnotebook_list_notebooks 2011-08-18 19:53:18 -07:00
Brian E. Granger
7d53b7a7b2 Merge branch 'stefanv-htmlnotebook_publish' into htmlnotebook 2011-08-18 19:48:51 -07:00
Brian E. Granger
1d43249604 Adding page break logic to the print css.
* I have added page-break-inside logic to div.input and
  div.output_area.
* Fixed a bug in CodeCell that was putting the output_area class
  on the wrong div.
2011-08-18 19:47:52 -07:00
Stefan van der Walt
55ffc1c083 Move glob to global level import. 2011-08-18 19:31:16 -07:00
Stefan van der Walt
fb2c31b2ea Allow period characters in notebook names. 2011-08-18 19:11:49 -07:00
Brian E. Granger
6243652cfd Changing notebook uuid algorithm to preserver across sessions. 2011-08-18 18:43:33 -07:00
Brian E. Granger
69d2e18f7a Merge branch 'htmlnotebook_publish' of https://github.com/stefanv/ipython into stefanv-htmlnotebook_publish 2011-08-18 14:12:12 -07:00
Brian E. Granger
b5b4cf260f Modifying CodeMirror focus hack to work better.
I had removed a text area focus event earlier today and that
broke the . key. We are still having problems with CodeMirror
elements gaining focus, but this seems to fix the issue.
2011-08-17 17:19:42 -07:00
Stefan van der Walt
823124215c Refactor static printing. 2011-08-17 17:07:58 -07:00
Brian E. Granger
cff986a539 Removed HTMLCell from UI and added better placeholder logic. 2011-08-17 15:29:22 -07:00
Brian E. Granger
0f3bc468e3 Better alert message if no WebSockets are detected. 2011-08-17 15:11:55 -07:00
Brian E. Granger
e08bdc3d6f Better WebSocket detection added. 2011-08-17 15:01:46 -07:00
Brian E. Granger
164ef7c9cb Adding code to handle MozWebSocket for FF 6. 2011-08-17 14:55:44 -07:00
Brian E. Granger
e176318797 More review changes.
* Favicon.ico is served.
* Test suit now passes.
* Help links work for for me.
* Other changes made to address inline comments.
* The printing of long lines is an extremely subtle issue and I will open an issue for it.
* zmqws.py is completely gone so the naked print is not an issue.
* ipython-notebook removed from scripts.
* Updated copyright and authors of files.
* Fixed missing docstrings in IPython.nbformat.
2011-08-17 13:21:19 -07:00
Brian E. Granger
63a148fad5 Don't scroll to bottom when last cell is selected. 2011-08-17 11:50:57 -07:00
Stefan van der Walt
49ad421c8b htmlnotebook: Suppress cell boundary when publishing. 2011-08-16 22:40:36 -07:00
Stefan van der Walt
201999642f Implement static publishing of HTML notebook. 2011-08-16 18:56:34 -07:00
Brian E. Granger
70cf4b80ba Stripping notebook server flags from kernel's argv. 2011-08-16 11:58:20 -07:00
Brian E. Granger
1271cfcfcd Removing old CodeMirror version. 2011-08-15 23:40:31 -07:00
Brian E. Granger
dfac7eca2b WebSocket url is now passed to browser when a kernel is started. 2011-08-15 23:35:01 -07:00
Matthew Brett
acf85b0824 BF - allow nose with-doctest setting in environment
IPDoctest replaces the normal doctest plugin.  Previously we did this by
initializing the builtin plugins but skipping the doctest plugin.
However, if the user has a noserc file with 'with-doctest=1' or the
environment variable 'NOSE_WITH_DOCTEST', then nose will try and
initialize the doctest plugin when it isn't there, and barf.  This
commit defers the removal of the doctest plugin to the configuration
stage, so doctest can be enabled before it is thrown away by us.
2011-08-15 19:12:12 -07:00
Brian E. Granger
e45e339344 Kernel/notebook mapping is removed when a kernel dies.
* Previously, when a kernel died due to an external cause, the
  notebook/kernel mapping was not removed, so the kernel would
  be resused even though it was dead.
* The heartbeat now properly removes the notebook/kernel mapping.
2011-08-15 15:06:11 -07:00
Brian E. Granger
3602f7f023 Date is properly removed from JSON reply before WebSocket forward.
* Both the header and parent_header have a date field that cannot
  be json serialized. This field is just removed for now, but
  in the future, we will covert the date to a ISO8601 field.
* Better error handling around this code has also been added
  to prevent the server from crashing due to malformed messages.
2011-08-15 14:43:49 -07:00
Brian E. Granger
726f8c1780 Pager is not activated if the pager text is empty.
* Things like asdf.*? used to open the pager even though there
  was nothing to show.
2011-08-15 14:25:49 -07:00
Brian E. Granger
a086fc6d83 I like ClearAll better than Clr All. 2011-08-15 14:21:28 -07:00
Brian E. Granger
c7a12effa1 Export works with filenames having spaces.
* The fix was to put the filename in double quotes in the
  Content-Disposition header.
* Export As/Clear All have been renamed to Export and Clr All
2011-08-15 14:19:36 -07:00
Brian E. Granger
bf8ba0889e Code cell gets focused after "To Code" is triggered. 2011-08-15 14:15:21 -07:00
Brian E. Granger
dcd25caf9a Adding additional whitespace at botton of notebook for TAB comp. 2011-08-15 14:10:27 -07:00
Brian E. Granger
0790979100 Fixing tab completion edge cases. 2011-08-15 14:03:17 -07:00
Brian E. Granger
60147f495f A single tab-completion match is now automatically selected. 2011-08-14 23:41:54 -07:00
Brian E. Granger
e445ad1796 Fixing latex rendering bug. 2011-08-14 23:30:11 -07:00
Brian E. Granger
75c54c887e Notebook id removed from the notebook format. 2011-08-14 22:38:46 -07:00
Brian E. Granger
3d7d0f8b0b Added a notebook dirty flag that is used when exiting page. 2011-08-14 22:01:39 -07:00
Brian E. Granger
e911393836 Browser window title follows the name of the notebook. 2011-08-14 21:48:20 -07:00
Brian E. Granger
3be2ace4f2 Autotry additional ports if 8888 if already in use. 2011-08-14 21:41:01 -07:00
Brian E. Granger
63de9cd719 Fixing bug that caused plots to not be saved.
CodeCell.append_mime_type needed a default element.
2011-08-14 21:29:07 -07:00
Brian E. Granger
a9d6f2eb2d Major refactor of kernel connection management in the notebook.
* Full kernel heartbeating is working.
* Connections between the notebook and server and now created
  a new each time there is a WebSocket connection. Each channel is
  also handled separately. This dramatically simplifies the
  server code and makes for a more scalable system.
2011-08-14 17:58:25 -07:00
Brian E. Granger
b264e21a6d Clear all output is implemented. 2011-08-13 16:18:16 -07:00
Brian E. Granger
24a3464921 Disabling auto-save at exit. 2011-08-13 16:08:30 -07:00
Brian E. Granger
058c0b4767 HTML output cells are now styled with the rendered_html class. 2011-08-13 15:55:58 -07:00
Brian E. Granger
c72b41883f Adding tracebacks, evalue and etype to the nbformat and notebook. 2011-08-13 15:53:35 -07:00
Brian E. Granger
0c3bba9641 Adding time delay to show the notebook saving more clearly. 2011-08-11 16:55:46 -07:00
Brian E. Granger
1abacb4fce HTML/Markdown cells no longer saved their rendered output. 2011-08-11 16:48:22 -07:00
Brian E. Granger
0b5b3ed341 Added collapsed field to the code cell. 2011-08-11 16:44:50 -07:00
Brian E. Granger
0529d43ae7 Fixing padding of output cells. 2011-08-11 15:39:48 -07:00
Brian E. Granger
c2ce42121b %loadpy works in the notebook and bug with inline plotting fixed. 2011-08-11 14:51:53 -07:00
Brian E. Granger
3db421fb73 Autoindentation fixed and enabled by default. 2011-08-11 14:30:44 -07:00
Brian E. Granger
0db7ab16a3 Finishing display system work.
* Added image/jpeg MIME type to notebook format, the core display
  logic and the notebook.
* Finished HTML, SVG, Image, Math, Javascript, JSON classes.
2011-08-11 14:17:01 -07:00
Brian E. Granger
3ad866c73d Reducing/adjusting the padding of cells to make the notebook more
compact.

* Reduced padding between cells from 15px to 5px.
* Prompt width is now dynamic to grow/shrink as the prompt number
  increases in width.
* Reduced padding between input and output from 15px to 5px.
2011-08-11 09:39:04 -07:00
Brian E. Granger
90a20054a0 Updating notebook configuration.
* ipython_notebook_config.py is now created and staged.
* New certfile/keyfile config=True attributes for enabling SSL/TLS.
* Examples of usage added.
* New handling for --ip=*
* Aliases added.
2011-08-10 09:28:47 -07:00
Brian E. Granger
8a55d6bf22 Adding minor help strings for keyboard shortcuts. 2011-08-09 21:12:44 -07:00
Brian E. Granger
da63e8cbe8 Minor fixes to config system for notebook. 2011-08-09 16:38:09 -07:00
Brian E. Granger
20adfc4ced Updates to the css style of rendered html text cells. 2011-08-09 16:05:32 -07:00
Brian E. Granger
217616a505 Fixed text cell rendering bug. 2011-08-09 14:36:38 -07:00
Brian E. Granger
a70cbfc382 Implemented smart autoindenting. 2011-08-09 14:09:03 -07:00
Brian E. Granger
bc5dd6d359 Markdown cells are now saved and restored in notebooks. 2011-08-09 13:09:36 -07:00
Brian Granger
c56f76980e Reordering Export button and renaming Export->Export As 2011-08-09 12:38:59 -07:00
Brian Granger
f90b5761a2 Refactoring of text/markdown/rst/html cells. 2011-08-09 11:37:14 -07:00
Brian E. Granger
81a1099f87 Starting work on a Markdown cell. 2011-08-09 10:05:20 -07:00
Brian E. Granger
b62857f151 Fixing HTML cell syntax highlighting. 2011-08-08 14:33:48 -07:00
Brian E. Granger
b7bcdabc9a Updating CodeMirror to v 2.12.
For now I am keeping the old codemirror2 directory in here until
we finish debugging the new version.
2011-08-08 14:03:36 -07:00
Brian E. Granger
9964704b73 New HTMl cell working with CodeMirror editing. 2011-08-08 11:12:11 -07:00
Brian E. Granger
a003af7977 Starting to rename text cell to html cell. 2011-08-08 08:44:51 -07:00
Brian E. Granger
875e7da94b Added saving and loading of output of all types. 2011-08-07 20:38:51 -07:00
Brian E. Granger
188e6271e1 Using beforeunload to save at exit and kill the kernel. 2011-08-07 12:26:33 -07:00
Brian E. Granger
8cf1812395 Fixed subtle bug in kernel restarting.
* Old routers were not being shutdown and removed.
* We were incorrectly associating the new kernel with the notebook
  (we were using the *old* kernel_id for this).
* General clean ups in the kernel manager.
2011-08-07 11:17:54 -07:00
Brian E. Granger
a0cbccaa03 Adding kernel/notebook associations. 2011-08-06 21:33:55 -07:00
Brian E. Granger
ad84abcf36 Improvements to file uploaded, mime types and .py reader.
* The .py notebook reader now uses that ast module to split
  a plain python file into blocks. These blocks become cells in
  the notebook.
* Proper mime types are used for xml (application/xml), json
  (application/json) and python (application/x-python).
* Other fixes to file uploading.
2011-08-06 17:47:18 -07:00
Brian E. Granger
458c48b229 File upload/import working from notebook browser. 2011-08-05 22:06:45 -07:00
Brian E. Granger
e0cc1a6c48 Implemented delete functionality in nb browser.
* Dialog confirms the notebook delete.
* Notebook element is removed from list upon deletion.
2011-08-05 11:04:43 -07:00
Brian E. Granger
c106630a2f Implemented basic notebook browser and fixed numerous bugs. 2011-08-04 22:57:01 -07:00
Brian E. Granger
b11824ef1b Massive work on the notebook document format.
* Finished nbformat work and debugged the versioning API.
* Integrated the nbformat with the notebook. Save/New/Open/Export
  are all now working.
2011-08-04 13:55:04 -07:00
MinRK
8e64e13bbb support html representations in the notebook frontend
html gets highest priority, because it is the native language
of the frontend.
2011-07-29 11:04:04 -07:00
Brian E. Granger
59a9cd1777 Updates to basic notebook format.
* The format now handles multiple output blocks.
* XML now as worksheets, cells and outputs tags.
2011-07-29 10:15:22 -07:00
Brian E. Granger
10963a588e Adding Cell.grow back to fix bug.
This can go away once we star to use CodeMirror for TextCells.
2011-07-28 09:17:03 -07:00
Brian Granger
8207ecc086 Fixing minor resize bug on the Mac. 2011-07-27 15:21:22 -07:00
Brian E. Granger
cad3c34d62 Hacks to prevent FLOUC (flash of unformatted content). 2011-07-27 15:09:23 -07:00
Brian E. Granger
4f57e3c7fe Fixes to terminal mode execution (ctrl-enter). 2011-07-27 13:36:41 -07:00
Brian E. Granger
b6b4107e59 Notebook now uses tab for autocompletion. 2011-07-27 13:16:38 -07:00
Brian E. Granger
96be322070 Removing default input prompt number.
In a notebook setting being able to delete and add cells makes it
virtually impossible to correctly guess what the next input
prompt number should be. We now follow the convention that our
prompts look like "In [ ]:" before execution.
2011-07-27 09:16:36 -07:00
Brian E. Granger
5519c01de3 CTRL-ENTER now runs a cell in "terminal mode"
In this mode, a new cell is not created after the current cell
is run. Once the cell is run, the current input is cleared, so
it acts just like the terminal.
2011-07-27 09:13:29 -07:00
Brian E. Granger
64273fa929 Autocompletion working with CTRL-SPACE. 2011-07-26 16:45:46 -07:00
Brian Granger
e09906c1a8 Added complete method of JS kernel object. 2011-07-26 14:22:41 -07:00
Brian Granger
f24bd4f635 Colors now working in tracebacks and the pager.
For now I am just converting ANSI color escape sequences to HTML
<span> tags that have css classes for coloring.
2011-07-22 22:28:36 -07:00
Brian E. Granger
4558e8af5f Prevent shift-enter from propagating and performing default. 2011-07-22 17:18:56 -07:00
Brian E. Granger
239b087e8f Updating font-sizing to use the YUI protocol. 2011-07-22 17:07:35 -07:00
Brian E. Granger
27b5357678 Fixing execution related things.
* Extra enter on FF is fixed by hooking into CodeMirror's
  onKeyEvent hook. We now have CodeMirror ignore shift-enter
  completely as we handle it ourselves.
* The cell execution logic in notebook.js has been refactored and
  the Run All/Selected buttons have been hooked up.
2011-07-22 16:04:54 -07:00
Brian E. Granger
5fb6787570 Work on save widget, kernel status widget and notebook section. 2011-07-22 11:20:29 -07:00
Brian E. Granger
41e20d3f3e Minors fixes and initial work on save widget.
* Fixed width of buttons in left panel.
* Started to create a save widget for the header.
2011-07-20 20:42:35 -07:00
Brian E. Granger
60a89580ea Help section implemented and working. 2011-07-20 20:42:35 -07:00
Brian E. Granger
a0c36fbe7a Controls in cell section have a solid layout. 2011-07-20 20:42:35 -07:00
Brian Granger
b4015cd010 Minor fixes to fonts and spacing. 2011-07-20 20:42:35 -07:00
Brian E. Granger
3db8ae6073 Initial draft of panel section and the cell section working. 2011-07-20 20:42:35 -07:00
Brian E. Granger
4db2677391 Improving the scrolling model. 2011-07-20 20:42:35 -07:00
Brian E. Granger
c538958f71 Left panel is now working. 2011-07-20 20:42:35 -07:00
Brian E. Granger
3c07de2208 More accuract height calculations for the pager collapse/expand. 2011-07-20 20:42:35 -07:00
Brian E. Granger
4e0dd9ddbb Pager is working again. 2011-07-20 20:42:35 -07:00
Brian E. Granger
9efad482a9 More work updating the notebook to use dynamics resizing. 2011-07-20 20:42:35 -07:00
Brian E. Granger
76d7a1fdac Adding note about vbox related scroll bugs. 2011-07-20 20:42:35 -07:00
Brian Granger
122b449011 Updating jQuery to 1.6.2 and jQuery UI to 1.8.14.
I have also added a focus.html files for testing focus related
events.
2011-07-20 20:42:35 -07:00
Brian E. Granger
b46517689b Refactoring pager into its own class. 2011-07-20 20:42:35 -07:00
Brian E. Granger
68091df3f1 Initial payload handling.
* Syntax highlighting fixed for things like "math?".
* Basic pager is working.
2011-07-20 20:42:35 -07:00
Brian E. Granger
d99e820c94 Starting to refactor the notebook layout 2011-07-20 20:42:35 -07:00
Brian E. Granger
861a481f29 Actually kill old kernels upon restart. 2011-07-20 20:42:35 -07:00
Brian E. Granger
ed3a348817 Using $.proxy to clean up callbacks. 2011-07-20 20:42:35 -07:00
Brian E. Granger
215fbc4a29 Implemented module and namespace pattern in js notebook. 2011-07-20 20:42:34 -07:00
Brian E. Granger
d9cf4fa390 Updating main notebook template to use split scripts. 2011-07-20 20:42:34 -07:00
Brian E. Granger
1fd4434be4 Splitting notebook.js into muliple files for development ease. 2011-07-20 20:42:34 -07:00
Brian E. Granger
0c261d5466 Updating the notebook to work with the latex master.
* PNG figures are now used for matplotlib.
* NEW msg format is used where msg_type is in the header.
* Session is used for sending/recving.
2011-07-20 20:42:34 -07:00
Brian E. Granger
47ca4892b1 More work on updating the notebook zmq forwarding. 2011-07-20 20:42:34 -07:00
Brian E. Granger
60a21ecc14 Work to adapt routers to new Session message protocol. 2011-07-20 20:42:34 -07:00
Brian E. Granger
a66bf72d2b Notebook app debugging.
* Logging is now working with a default of INFO.
* Other misc bug fixes.
2011-07-20 20:42:34 -07:00
Brian E. Granger
d04eb09f2e Refactoring the notebook app to support the new config system. 2011-07-20 20:42:34 -07:00
Brian E. Granger
52b29af5bd Refactored htmlnotebook session and kernel manager.
* The KernelManager now manages multiple kernels with a uniform
  API.
* The SessionManager now manages the full set of channels+streams
  and the IPython.zmq.session.Session object for a single kernel.
2011-07-20 20:42:34 -07:00
Brian E. Granger
ff6d76c9e5 Renaming NotebookApplication to NotebookWebApplication. 2011-07-20 20:42:34 -07:00
Brian E. Granger
1140eeb679 Initial reorg of files complete.
I have moved things around to get ready for making the notebook
a full blown app, but have not actually made it an app.  That is
next.
2011-07-20 20:42:34 -07:00
Brian E. Granger
29bd45d3d5 Fixing import statments in handlers and notebookapp. 2011-07-20 20:42:34 -07:00
Brian E. Granger
6e2fd5206e Creating files to new notebook app. 2011-07-20 20:42:34 -07:00
Brian Granger
3c9e42586f Much improved nagivation for the notebook cells.
* Up/Down arrow now used to navigate cells.
* For text cells, shift-enter renders, enter edits.
2011-07-20 20:42:33 -07:00
Brian Granger
a91129b49a Better handling of up/down arrows for CodeCells. 2011-07-20 20:42:33 -07:00
Brian Granger
6a8c7da009 CodeMirror code editing added.
* codemirror2 repo has been added to IPython.
* Custom coloring used to match the qtconsole.
2011-07-20 20:42:33 -07:00
Brian Granger
2f9f482a6c General CSS cleanup.
* Created layout.css for common layout related mixins.
* monospace is the default font for now.
2011-07-20 20:42:33 -07:00
Brian Granger
c7dbb124f2 Updating notebook examples, and notebook js/html. 2011-07-20 20:42:33 -07:00
Brian Granger
0dd637b4d5 Added note about tornado version to main script. 2011-07-20 20:42:33 -07:00
Brian Granger
a24e75c2a2 Adding logic to look for CDN version of MathJax and fallback to local. 2011-07-20 20:42:33 -07:00
Brian Granger
36aafb3b86 Fine tuning of notebook styles.
* Padding added to L/R of notebook div (40px).
* Margin added to T/B of cells (15px).
* Margin added to T of output div (15px).
* More elements using border-box layout mode.
2011-07-20 20:42:33 -07:00
Brian Granger
1cae7230d9 Shift-Enter only selects the next cell if it is a CodeCell. 2011-07-20 20:42:33 -07:00
Brian Granger
9edf46f9dc Cells call grow by hand when they reload from JSON. 2011-07-20 20:42:33 -07:00
Brian Granger
cc4a8cff40 Added basic styling to text cells. 2011-07-20 20:42:33 -07:00
Brian Granger
680bcc4825 Basic exception display in the notebook is working. 2011-07-20 20:42:33 -07:00
Brian Granger
3b5f4b3dbe Fixes to the latex rendering by adjusting the MathJax config. 2011-07-20 20:42:32 -07:00
Brian Granger
040a285de3 Refactoring of the output and display system.
* LaTeX rendering now works.
* Font's are reworked in the css style sheet.
* Testing on FF and Chrome.
2011-07-20 20:42:32 -07:00
Brian Granger
6e36522cdf Initial latex printing for sympy and fixes to autogrow. 2011-07-20 20:42:32 -07:00
Brian Granger
005820c005 Basic notebook saving and loading.
* The logic in the server and javascript frontend is there for
  a basic JSON notebook format with a .ipynb extension.
* To save a new notebook: "%notebook save filename.ipynb"
* To save a notebook that is already saved: "%notebook save"
* To load a notebook from the cwd: "notebook load filename.ipynb"
2011-07-20 20:42:32 -07:00
Brian Granger
b584914bfb Work on the notebook's code cell.
* Cleaned up the js code for creating the code cell.
* Added a div around the input text area to allow the text area
  to have a width of 100%.
* Added CodeCell.toJSON.
2011-07-20 20:42:32 -07:00
Brian Granger
bba15fb958 Further font adjustments to the notebook.
* Using Fernando's recommended monospaced font list.
* Increased tool/tab menus to 10 pt.
2011-07-20 20:42:32 -07:00
Brian Granger
ffc2dffeca Tweaking and cleanup of notebook.css.
* Adjusted font sizes for improved readability.
* Got rid of unused css attributes and styles.
* Changed font of Title to Verdana.
2011-07-20 20:42:32 -07:00
Brian Granger
d8ca0d5d5b Fixes to notebook scrolling and layout.
We are now using the flexible box model, so the layout won't work
on IE9, but it already doesn't work on IE9 because of WS support.
2011-07-20 20:42:32 -07:00