Commit Graph

1743 Commits

Author SHA1 Message Date
Brian E. Granger
36335a3d78 Splitting notebook.less into separate files. 2013-05-21 21:11:18 -07:00
Brian E. Granger
7227074946 Fixing monospace style vars. 2013-05-21 19:45:47 -07:00
Brian E. Granger
4036f7d24f Turing style of tooltip. 2013-05-21 19:37:49 -07:00
Brian E. Granger
ea1a7accd8 Fixing global less vars to use bootstrap. 2013-05-21 16:50:59 -07:00
Brian E. Granger
47fb1b7c25 Fixing pager style.çy 2013-05-21 16:40:22 -07:00
Brian E. Granger
380f37ce34 Updating notebook.less to use baseLineHeight from variables. 2013-05-21 16:18:42 -07:00
Brian E. Granger
9d3187bb6d Fixing styles by overriding bootstrap. 2013-05-21 16:07:14 -07:00
Brian E. Granger
7e0bd8f960 Creating override.css for each page.
This css file should only have temporary hack until we fix
out global styles. Don't add anything new to these files.
2013-05-21 15:35:22 -07:00
Brian E. Granger
6b8c543fae Renaming notebooks->notebook in less and templates. 2013-05-21 15:35:22 -07:00
Brian E. Granger
f079104b8a Renaming notebooks->notebook on client side. 2013-05-21 15:35:21 -07:00
Brian E. Granger
9136300198 Playing with the order of less imports. 2013-05-21 15:35:21 -07:00
Brian E. Granger
1a74c2c0a6 Moving static/user to static/custom to prevent future conflicts. 2013-05-21 15:35:21 -07:00
Brian E. Granger
ba974a28f7 Adding style.less to each subdir - but still use global style.less 2013-05-21 15:35:21 -07:00
Brian E. Granger
50b8059093 Finishing conversion of templates to use single style.*. 2013-05-21 15:35:21 -07:00
Brian E. Granger
baef1892b0 Updating fabfile and templates for global style.min.css. 2013-05-21 15:35:20 -07:00
Brian E. Granger
4da176975f Fixing less variable names to use_the_right_convention. 2013-05-21 15:35:20 -07:00
Brian E. Granger
121ecb1913 Going back to a single style.less and style.min.css. 2013-05-21 15:35:20 -07:00
Brian E. Granger
ee89627da3 Adding files that I mised in the last commit. 2013-05-21 15:35:20 -07:00
Brian E. Granger
7140e3045e Renaming main JS files. 2013-05-21 15:35:20 -07:00
Brian E. Granger
81d5049705 Putting custom.css/custom.js in static/user. 2013-05-21 15:35:20 -07:00
Brian E. Granger
222f8b1848 Adding link to new location of favicon.ico. 2013-05-21 15:35:20 -07:00
Brian E. Granger
57196dabdb Wrok on static/tree 2013-05-21 15:35:19 -07:00
Brian E. Granger
a1751a5539 Cleaning up less/css. 2013-05-21 15:35:19 -07:00
Brian E. Granger
6d39d633b6 More work on the less setup. 2013-05-21 15:35:19 -07:00
Brian E. Granger
926e60c5ea Moving js/less/css dirs up one level. Too much nesting. 2013-05-21 15:35:19 -07:00
Brian E. Granger
267be96a2e Changes to templates. 2013-05-21 15:35:18 -07:00
Brian E. Granger
a35b7a7e81 More movign around of things in notebook and js/less. 2013-05-21 15:35:18 -07:00
Brian E. Granger
08fba69314 Moving js files into subdirs. 2013-05-21 15:35:18 -07:00
Brian E. Granger
32c9cf4aad Moving files inside js folder. 2013-05-21 15:35:18 -07:00
Brian E. Granger
e8d285af3c Working on cleaning up our less files. 2013-05-21 15:35:18 -07:00
Brian E. Granger
92542f1c1f More renaming of less files. 2013-05-21 15:35:18 -07:00
Brian E. Granger
27e8947e79 Reorg of the js/less/css files. 2013-05-21 15:35:18 -07:00
MinRK
6b58918a63 fix default cluster count 2013-05-19 22:22:22 -07:00
Matthias Bussonnier
60b35be373 Merge pull request #3333 from t-8ch/patch-1
notebookapp: add missing whitespace to warnings
2013-05-19 09:41:32 -07:00
Brian E. Granger
5f9e6f02f1 Updating more imports. 2013-05-16 18:03:45 -07:00
Brian E. Granger
c9d167e78c Updating imports. 2013-05-16 18:01:44 -07:00
Brian E. Granger
d2100bdc06 Fixing imports for frontend tests. 2013-05-16 16:08:20 -07:00
Brian E. Granger
abeed98476 Moving web services into a subdir. 2013-05-16 15:52:27 -07:00
Brian E. Granger
105553e7b1 Fixing minor import error. 2013-05-16 11:14:03 -07:00
Brian E. Granger
8d8c2f6e5b Updating tests for refactor. 2013-05-16 11:03:11 -07:00
Brian E. Granger
55243f1c1b Refactor notebookapp __init__ method. 2013-05-15 14:51:20 -07:00
Brian E. Granger
d3a3adf668 Removing dup import. 2013-05-15 14:40:17 -07:00
Brian E. Granger
a1d2d864a0 Moving base ZMQ handlers to base/zmqhandlers.py. 2013-05-15 14:39:31 -07:00
Brian E. Granger
e1c3f81349 Renaming templates to match other names. 2013-05-15 13:01:29 -07:00
Brian E. Granger
428b727b1a Renaming api handlers and moving FileFindHandler into base handlr. 2013-05-15 12:55:40 -07:00
Brian E. Granger
f17c77eba0 Updating import statements after moving notebook files around. 2013-05-15 12:25:33 -07:00
Brian E. Granger
6b7fd467ee Reorganizaing the server side of the notebook. 2013-05-15 12:00:08 -07:00
Brian E. Granger
5359f7c99b More work on the handlers 2013-05-15 10:55:43 -07:00
Brian E. Granger
f0fb443fd4 Removing debug message. 2013-05-15 09:28:21 -07:00
Brian E. Granger
a809db93b1 Fixing url join problems. 2013-05-15 09:28:21 -07:00
Brian E. Granger
0b28fde1b8 Adding __init__.py 2013-05-15 09:28:21 -07:00
Brian E. Granger
6f891eeb6e Splitting handlers into different files.
I have also created a top-level utils.py for notebook related stuff
2013-05-15 09:28:21 -07:00
Brian E. Granger
3155653f6d Adding new files. 2013-05-15 09:28:21 -07:00
Brian E. Granger
d9e629d87a Moving handlers to subdir 2013-05-15 09:28:20 -07:00
Matthias Bussonnier
2112c51b7f Merge pull request #3294 from Carreau/jsfix
fix callbacks as optional in js kernel.execute
2013-05-11 05:52:20 -07:00
Matthias Bussonnier
d9d300de39 Typo : optionnal -> optional 2013-05-11 15:50:16 +03:00
Brian E. Granger
fa872236a2 Merge pull request #3275 from minrk/submodule-hooks
improve submodule messages / git hooks
2013-05-09 15:51:43 -07:00
Brian E. Granger
a861725303 Merge pull request #3239 from eteq/easy-close-pager
Allow "x" icon and esc key to close pager in notebook
2013-05-09 15:47:28 -07:00
Matthias BUSSONNIER
40b760d836 fix callbacks as optional in js kernel.execute
plus some doc fixes.
Mainly to fix some backward compatibility with examples here and there.
2013-05-09 14:02:07 +02:00
Erik Tollerud
c2e199abb8 use alternate method to collapse pager from notebook.js as suggested by @Carreau 2013-05-06 19:12:08 -04:00
Thomas Weißschuh
44f5fd3d87 notebookapp: add missing whitespace to warnings 2013-05-04 12:04:16 +00:00
MinRK
9b22138a9b use highlevel in notebook log format
datefmt no longer necessary
2013-05-03 17:04:32 -07:00
MinRK
19c6442a7d check submodules when starting the notebook server
shows a warning (not an error) if components are out of date.
2013-05-03 15:44:05 -07:00
MinRK
4b5ba71307 protect highlight.js against unknown languages
falls back on autodetect if specified language fails (e.g. unrecognized language).

closes #3268
2013-05-02 23:59:39 -07:00
MinRK
7782dfcb4e add missing return
closes #3260 (again)
2013-05-02 23:43:58 -07:00
Brian E. Granger
d3da03069d Merge pull request #3101 from minrk/marked
use marked / highlight.js instead of pagedown and prettify
2013-05-02 15:49:50 -07:00
MinRK
8df01f22aa finish removing prettify 2013-05-02 15:26:30 -07:00
MinRK
796fb5d0a8 unify highlight.js / codemirror style 2013-05-02 12:24:37 -07:00
MinRK
6ac2bdf086 use highlight.js to highlight markdown code blocks 2013-05-02 12:24:36 -07:00
MinRK
b6c390db06 use marked for markdown 2013-05-02 12:24:26 -07:00
MinRK
70dd6e1612 fix set_last_checkpoint when no checkpoint
closes #3260
2013-05-02 08:58:59 -07:00
MinRK
e1f4d0a85f fix a few URLs from previous PR
some of the URLs in the submodules PR were not updated
2013-05-01 21:30:27 -07:00
Brian E. Granger
4a654d1c29 Merge pull request #3240 from minrk/submodules
remove js components from the repo
2013-05-01 21:10:30 -07:00
MinRK
2cf93510f8 use less from components 2013-05-01 18:24:23 -07:00
MinRK
317debce06 remove unused components
remove command from fabfile

components live in a submodule
2013-05-01 18:19:36 -07:00
MinRK
8b5e5a5e09 restore checkpoints in a sub-list
minor styling update to the restore dialog as well
2013-05-01 17:34:23 -07:00
MinRK
c1b19755fd rename shouldn't create a checkpoint 2013-05-01 17:32:47 -07:00
MinRK
46093157d7 deleting a notebook deletes its checkpoints
also cleanup a few log messages
2013-05-01 17:32:47 -07:00
MinRK
a3c99d94bb add checkpoint status to notebook header
autosave is also there, but once the dirty flag is an event,
this should stop having the date, and just become 'autosaved / unsaved changes'
2013-05-01 17:32:46 -07:00
MinRK
030c547e58 fix Location headers 2013-05-01 17:32:46 -07:00
MinRK
1f82c03dd2 Save and Checkpoint 2013-05-01 17:32:45 -07:00
MinRK
53ac962d1a sync with previous handler changes
use IPythonHandler, avoid self.application
2013-05-01 17:32:45 -07:00
MinRK
a99a07f10b only save on close if autosaving 2013-05-01 17:32:44 -07:00
MinRK
01bba482a9 *all* user-initiated saves create a checkpoint 2013-05-01 17:32:44 -07:00
MinRK
8ca57a1779 s/autosave_notebook/set_autosave_interval/ 2013-05-01 17:32:43 -07:00
MinRK
80bba145d5 set default autosave interval to two minutes 2013-05-01 17:32:43 -07:00
MinRK
2fe8a9b2cd only autosave when dirty 2013-05-01 17:32:43 -07:00
MinRK
dd77790a00 add autosave timer
autosave interval is tuned based on the duration of saves.
Autosave will never happen more frequently than every 30 seconds,
and if saves take more than 3 seconds, autosave will fire every 10x the duration of the save (i.e. if save takes 6 seconds, it will be every 60 seconds, etc.)
2013-05-01 17:32:42 -07:00
MinRK
6da01bf362 trigger autosave on tab/window close
instead of "please don't leave!"
2013-05-01 17:32:42 -07:00
MinRK
e119a6469b add Revert to the menu bar 2013-05-01 17:32:42 -07:00
MinRK
5bc55ba984 add some checkpoint messages to the notification area 2013-05-01 17:32:41 -07:00
MinRK
db413fadbf expose notebook checkpoints in html/js
- cmd-S does a plain save
- ^M-s does checkpoint
- add save checkpoint to File menu
- save button in bar does checkpoint
2013-05-01 17:32:41 -07:00
MinRK
985289e113 checkpoint info is a dict
two keys: checkpoint_id and last_modified
2013-05-01 17:32:41 -07:00
MinRK
dd234bbc93 add ModifyCheckpoints handler
separates requests that change specified checkpoint IDs from those that do not.
2013-05-01 17:32:39 -07:00
MinRK
62d61cbbc0 add notebook checkpoint handler 2013-05-01 17:31:23 -07:00
MinRK
c4ac8eee36 add checkpoint API to FileNBManager 2013-05-01 17:29:46 -07:00
Min RK
6be220da56 Merge pull request #3235 from ellisonbg/removeprint
Remove the unused print notebook view
2013-04-30 20:12:42 -07:00
Brian E. Granger
56e4759813 Merge pull request #3238 from ellisonbg/tabstyle
Improve the design of the tab completion UI
2013-04-30 20:06:01 -07:00
Brian E. Granger
5cc0897dd6 Fixing styling of context type completions. 2013-04-30 19:44:23 -07:00
Erik Tollerud
180f465f16 Collapse -> Close in button description as suggested by @fperez 2013-04-29 20:52:40 -03:00
MinRK
1390270968 use components from external submodule 2013-04-29 16:20:07 -07:00
Erik Tollerud
13b2cadd8b changed ESC to trigger collapsing of the pager in notebook 2013-04-29 19:16:06 -04:00
Erik Tollerud
aafec25d34 Added clickable icon to collapse pager
Closes #3196
2013-04-29 19:15:52 -04:00
MinRK
09adbd4e32 remove components 2013-04-29 16:13:48 -07:00
Brian E. Granger
d9668cdb78 Merge pull request #3190 from minrk/image_size
allow formatters to specify metadata
2013-04-29 15:13:08 -07:00
Brian E. Granger
e149319692 Removing print notebook from style.less. 2013-04-29 14:13:53 -07:00
Brian E. Granger
1494b484b6 Removing print handler and URL regepx. 2013-04-29 14:13:53 -07:00
Brian E. Granger
a2c8215947 Removing print handler. 2013-04-29 14:13:53 -07:00
Brian E. Granger
51a897d87c Removing stale call to print view in JS. 2013-04-29 14:13:53 -07:00
Brian E. Granger
abaafd2363 Removing old autogrow JS code. 2013-04-29 14:13:05 -07:00
Brian E. Granger
93f5f67d37 Updating box-shadows to proper bootstrap less function. 2013-04-29 14:05:35 -07:00
Brian E. Granger
49faf2c939 Improving the tab completion UI/design 2013-04-29 13:59:53 -07:00
MinRK
034331c3fa support display_pub metadata in js frontend 2013-04-29 11:27:46 -07:00
Brian E. Granger
e77e2fe409 Fixing indentation in fabfile.py. 2013-04-29 08:53:38 -07:00
Brian E. Granger
3e08874316 Adding README.md about notebook development. 2013-04-28 21:16:25 -07:00
Brian E. Granger
bdf1cefac5 Put back the components fab function as we can still use it. 2013-04-28 21:09:32 -07:00
Brian E. Granger
8dbc143512 Fix CM related sizing issues for completer and tooltip. 2013-04-27 23:48:37 -07:00
Brian E. Granger
9d2da9e28f Removing old codemirror assets - we now use the 1 in components. 2013-04-27 23:21:57 -07:00
Brian E. Granger
c83c0449d5 Fixing CM3 style related issues.
CM3 introduced a number of changes to how various paddings are set.
Because of how we change the line-height we had to set these back
to the CM2 values. What a pain!
2013-04-27 23:18:24 -07:00
Brian E. Granger
40617eb340 Give the .CodeMirror class no background so ours shows through. 2013-04-27 22:59:53 -07:00
Brian E. Granger
68dd1370ac Fixing broken URLs to CM assets. 2013-04-27 22:32:24 -07:00
Brian E. Granger
29a1296ef6 Changing mode name from python -> ipython. 2013-04-27 22:21:13 -07:00
Brian E. Granger
137a40ac96 Fixing typo in ntoebook.html. 2013-04-27 22:18:22 -07:00
Brian E. Granger
222a4f61df Updating ipython CM mode. 2013-04-27 22:17:58 -07:00
Brian E. Granger
ea4eb9b351 Copying CodeMirror's python mode into place for our ipython mode. 2013-04-27 22:14:54 -07:00
Brian E. Granger
d2460ee0c5 Add components to static URLs. 2013-04-27 22:03:34 -07:00
Brian E. Granger
72d7b6ff39 Updating tooltip.less for CM3 behavior. 2013-04-27 22:01:44 -07:00
Brian E. Granger
6e08dc37fa In CM3, the class that needs autogrow has changed. 2013-04-27 22:00:21 -07:00
Brian E. Granger
c666acbe5e Updating tooltip.js to work with CM3. 2013-04-27 21:55:11 -07:00
Brian E. Granger
ed8d859d66 Updating path to codemirror. 2013-04-27 21:53:37 -07:00
Brian E. Granger
85908b1765 Moving cmtemp -> codemirror. 2013-04-27 21:50:57 -07:00
Brian E. Granger
154df41ac3 Moving CodeMirror -> cmtemp 2013-04-27 21:50:34 -07:00
Brian E. Granger
a36d867882 Removing tests from fabfile that are no longer needed. 2013-04-27 17:53:41 -07:00
Brian E. Granger
836f68e4ad Adding our current components directory.
This commit adds the right versions of:

* Bootstrap
* Jquery
* less.js
* CodeMirror

We should always use bower to manage these packages in the
future. BUT, we are not yet using this version of jquery as
we still rely on an older crazy-branch version of jquery.ui.
2013-04-27 17:42:38 -07:00
Brian E. Granger
b5ad7db080 The HTML output type accidentally got removed from the OutputArea.
This commit adds it back at the approp. point in the
OutputArea.display_order.
2013-04-27 17:04:32 -07:00
Fernando Perez
7da43f8ebb Merge pull request #3226 from ellisonbg/renamedialog
Text in rename dialog was way too big - making it <p>.
2013-04-27 15:20:40 -07:00
Brian E. Granger
3a515880ae Text in rename dialog was way too big - making it <p>. 2013-04-27 15:16:02 -07:00
Brian E. Granger
e416cb8658 Removing old restuctured text handler and web service. 2013-04-27 15:08:38 -07:00
MinRK
82f0f359ac add missing mathjax_url to new settings dict 2013-04-27 09:29:17 -07:00
Brian E. Granger
41ffe3d027 Merge pull request #3089 from minrk/stdin
add stdin to the notebook
2013-04-25 21:11:47 -07:00
MinRK
43eb765793 js comment about session id in first message 2013-04-25 21:05:07 -07:00
MinRK
f51425ed28 clarify first ws message names / messages 2013-04-25 20:43:33 -07:00
MinRK
938a5b5dbc tweak raw_input style
more crowded, less jumpy
2013-04-25 17:28:03 -07:00
David Wyde
11b72681e2 Remove references to HTMLCell (dead code). 2013-04-25 19:26:18 -05:00
MinRK
ba79b60c35 fix color in raw_input 2013-04-25 16:19:15 -07:00
MinRK
3fbb99e61a add no-op on_message for iopub 2013-04-25 16:07:51 -07:00
MinRK
31c8fb1fb6 tweak raw-input styling
should fix alignment of raw_input and prompt
2013-04-25 14:18:21 -07:00
MinRK
f09eaf7b5e cleanup stdin event submission
follow example in rename notebook: remove form, bind keydown for enter,
avoiding shift-enter submitting the cell again.
2013-04-25 14:18:21 -07:00
MinRK
5b434b705f use inline raw_input instead of a dialog 2013-04-25 12:24:38 -07:00
MinRK
f38f2b7ac4 add stdin to notebook
dumb / gross / ugly jQuery modal dialog for now,
but it works!
2013-04-25 12:24:38 -07:00
MinRK
74f8972505 specify socket identity from kernel.js
required for stdin routing
2013-04-25 12:24:37 -07:00
MinRK
510897f0aa add stdin channel to NotebookApp 2013-04-25 12:24:20 -07:00
MinRK
f4b937767e share code between zmq channel handlers 2013-04-25 12:24:18 -07:00
Brian E. Granger
0d6676f340 Merge pull request #3088 from minrk/nbsettings
cleanup IPython handler settings
2013-04-25 12:19:44 -07:00
MinRK
217e38f102 hook up proper loggers
use IPython logger as first choice, fall back on tornado logger
(for use in non-IPython apps).
2013-04-25 12:15:49 -07:00
Brian E. Granger
646dcf77a4 Merge pull request #3201 from minrk/fastcolor
use much faster regexp for ansi coloring
2013-04-25 12:07:23 -07:00
MinRK
8c5a44813c hook up tornado 3's loggers to our handlers 2013-04-25 11:58:58 -07:00
MinRK
f0f0843cf2 define clear_cookie on websocket handler
as a no-op
2013-04-25 11:29:01 -07:00
MinRK
f887f050aa cleanup IPython handler settings
move settings to the tornado settings dict,
rather than a mixture of tornado settings and application references,
and application.ipython_app references.

removes any reference to application / ipython_app attributes in the handlers,
in favor of the tornado settings dict.
These were a massive pain for anyone who might want to re-use our handlers.
2013-04-25 10:06:10 -07:00
Brian E. Granger
13032d01ba Merge pull request #3011 from minrk/kernelclient
IPEP 12: add KernelClient
2013-04-25 10:04:47 -07:00
Min RK
2e5e595359 Merge pull request #3174 from Carreau/simple-class
Simple less classes

Simplify class handeling in js/css

Instead of setting several class (e.g: `cell vbox`) per dom element, use less to embed the definition of `vbox` into `cell`.

This should allow : 
   - more easy theming.
   - responsive css on  nbviewer 

There are many other places where this can be done.
2013-04-24 10:50:10 -07:00
Min RK
6ce1901e83 Merge pull request #2979 from Carreau/cm-configurable
CM configurable Take 2

Change the way configurability works.
Config dict should be passed down to the parent class where it will be
merged with the default value and propagate to this only in the base
class.

This allow to both alter the configuration on a per instance basis, or
globaly by tempering with the class instance.

This also get rid of IPython global in some cases.

-- 

Still not **perfect** but I think this is the limit of my js knowledge, there is a minimal amount of code of 4 line to propagate the configuration :

```
var options = {foo:bar}; // default options can be class parameter
var overwrite_options ={boo:baz}; // came from args, or not
options = this.mergeopt(CodeCell, options, overwrite options);
IPython.Cell.apply(this,[options]);
```
2013-04-24 10:46:56 -07:00
Min RK
33e4fdb600 Merge pull request #3181 from minrk/ifsince
backport If-Modified-Since fix from tornado

See facebook/tornado#713

closes #3177
2013-04-23 21:59:58 -07:00
MinRK
08cbf96075 don't restart channels on kernel restart
it wasn't actually necessary (proper fix in previous commit)
2013-04-23 21:47:51 -07:00
MinRK
e854617caf restart channels on kernel restart
generally not necessary, but sometimes the kernel connection can be dirty.
We have only seen this by starting a qtconsole via %qtconsole,
then killing the kernel, at which point the original notebook's connection
(at the zmq level) is never restored to the new kernel at the same endpoint.
It's weird, and probably a zmq bug, but a simple reconnect seems to solve it.
2013-04-23 21:47:51 -07:00
MinRK
05ead0496b delete notebook mapping in shutdown_kernel 2013-04-23 21:47:50 -07:00
MinRK
844758cca3 handle failed kernel restart in the notebook 2013-04-23 21:47:48 -07:00
MinRK
8204a6fb6d handle new autorestart javascript-side 2013-04-23 21:47:48 -07:00
MinRK
41f5d84680 send status messages when kernel is auto restarted 2013-04-23 21:47:48 -07:00
MinRK
5f600a5b9c cleanup boundaries of MultiKernelManager and KernelRestarter classes
- MultiKernelManager no longer has IOLoop affiliations
- move connect_[channel] method to base KernelManager
- connect_[channel] wraps in ZMQStream in IOLoopKM subclass
- add KernelRestarter base class
- use decorators to minimize code in wrapped KM methods
2013-04-23 21:47:45 -07:00
Brian Granger
14ef0ccb19 Refactoring kernel restarting. 2013-04-23 21:47:43 -07:00
Brian E. Granger
1c4f7d679a Removing heartbeat config from the MappingKernelManager. 2013-04-23 21:47:42 -07:00
Brian E. Granger
6c65e1a4fe Removing last remnant of heartbeat from IOPubHandler. 2013-04-23 21:47:42 -07:00
Brian E. Granger
4e0c180429 Starting to refactor heart beating of notebook kernels. 2013-04-23 21:47:42 -07:00
MinRK
bf69e92b57 use much faster regexp for ansi coloring
ansispan function adapted from mmalecki/ansispan

The easiest way to see how slow the old way was is to create a very large traceback (e.g. max recursion), which bring everything to a screeching halt (even future page loads, if the output is saved).  Now a max recursion error draws in a second or two.

closes #3198
2013-04-19 13:01:02 -07:00
Juergen Hasch
dd68727ff0 Add COMMAND keycode 2013-04-17 21:31:09 +02:00
Juergen Hasch
99af7b8a58 set <select> width to auto 2013-04-16 19:58:26 +02:00
Juergen Hasch
eb646bbf72 Improve special key handling in completer 2013-04-16 19:55:50 +02:00
Juergen Hasch
18aa1bd914 Add new keycodes 2013-04-16 19:34:20 +02:00
MinRK
09913471e7 backport If-Modified-Since fix from tornado
See facebook/tornado#713

closes #3177
2013-04-15 13:27:04 -07:00
Matthias BUSSONNIER
9a8301c9fd merge box-flex1 class into .output-area css definition 2013-04-14 15:46:10 +02:00
Matthias BUSSONNIER
afdb9b8cea include vbox into .cell css definition 2013-04-14 15:31:41 +02:00
Matthias BUSSONNIER
d5c744d74b include hbox in outpuarea css 2013-04-14 15:28:49 +02:00
Matthias BUSSONNIER
947c32bfc4 use hbox mixin instead of class
this will allow dynamic css in nbviewer like vbox-ing for low res
without JS or change in html
2013-04-14 15:25:14 +02:00
MinRK
cd0d29206f move check_for_zmq to utils.zmqrelated 2013-04-12 21:33:49 -07:00
MinRK
7ad15715a0 remove workarounds for no-longer-supported pyzmq versions 2013-04-12 21:25:18 -07:00
MinRK
5139e190d8 move DEFAULT_STATIC_FILES_PATH to frontend.html.notebook
and move the friendly version checks to notebookapp.py

DEFAULT_STATIC_FILES_PATH is now accessible without pyzmq/tornado/jinja being importable.
If someone tries to use old pyzmq or tornado directly with handlers,
the version check won't happen, but that's probably the right thing to do anyway.
2013-04-12 21:25:16 -07:00
Brian E. Granger
d53839666f Merge pull request #3144 from minrk/bower
minor bower tweaks
2013-04-12 21:20:55 -07:00
Min RK
98c672ad51 Merge pull request #3147 from meteogrid/rproxy_support
Notebook support for a reverse proxy which handles SSL

Added a "trust_xheaders" config option to NotebookApp to enable the passing of the xheaders flag to tornado.HTTPServer. This is necessary so tornado can generate the correct wss:// scheme
2013-04-12 16:15:53 -07:00
Brian E. Granger
0490978989 Merge pull request #3058 from minrk/redirect
add redirect handler for notebooks by name
2013-04-12 15:09:31 -07:00
MinRK
296587664d don't test for .ipynb in redirect handler
regex already guarantees it
2013-04-12 15:07:54 -07:00
Min RK
073f894e82 Merge pull request #3148 from ivanov/tornado-AI_ADDRCONFIG-patch
fix `gaierror: [Errno -9] Address family for hostname not supported`

error from unassociated interfaces.

related to facebook/tornado#593 - but the fix was only applied to 3.0

I've verified that this fix works for tornado 2.1, 2.4, 2.4.1, and the behavior it fixes does not trigger on tornado 3.0

closes #3045
2013-04-10 10:25:40 -07:00
Paul Ivanov
113ba6157f addressing @minrk's PR feedback
* check tornado version
* log.warn about the monkeypatching
2013-04-09 17:58:56 -07:00
Matthias BUSSONNIER
834b146cca JS Configurablity Take 2
Change the way configurability works.
Config dict should be passed down to the parent class where it will be
merged with the default value and propagate to this only in the base
class.

This allow to both alter the configuration on a per instance basis, or
globaly by tempering with the class instance.

This also get rid of IPython global in some cases.
2013-04-09 15:15:51 +02:00
Paul Ivanov
836d20e5e1 closes #3045, #3123 for tornado < version 3.0
related to facebook/tornado#593

I've verified that this fix works for tornado 2.1, 2.4, 2.4.1, and the
behavior it fixes does not trigger on tornado 3.0
2013-04-08 17:16:09 -07:00
Alberto Valverde
9e38b20e8f Added trust_xheaders config option to delegate it to HTTPServer.
This is neccesary if the notebook app is proxied behind a reverse
proxy that handles SSL.
2013-04-08 17:08:29 +02:00
MinRK
0323bea194 add fab components
installs components with bower
2013-04-07 12:50:55 -07:00
MinRK
2fc4821c2f tweak heading-anchor css
avoids blue links after visiting
2013-04-07 12:43:58 -07:00
MinRK
4976c6fb16 minor heading-link tweaks
- use id instead of name
- replace spaces with `_`

for html compliance
2013-04-07 12:15:57 -07:00
Min RK
a4b1bea069 Merge pull request #3136 from jfeser/8b94eddb4d15ce6f0c98675116d4609bdaaf99d9
Strip useless ANSI escape codes in notebook

ANSI color escape codes get handled specially by the notebook, but other kinds of codes just get printed out. Strip these codes out of the notebook output.

closes #2385
2013-04-06 12:14:51 -07:00
Jack Feser
5f5ac70660 Strip non color related ANSI escape sequences from notebook output.
This fixes issue #2385.
2013-04-04 21:32:34 -05:00
David Wyde
72c94c4f1c Fix an incorrect comment. 2013-04-02 17:46:50 -05:00
David Wyde
904be21a9f Prevent errors when up/down arrows are pressed in an empty notebook.
Notebook.get_selected_cell() returns `null` in an empty notebook.
2013-04-02 17:44:27 -05:00
Matthias Bussonnier
a8873230bf Merge pull request #3102 from minrk/spellcheck
set `spellcheck=false` in CodeCell inputarea
2013-04-01 07:09:12 -07:00
Matthias Bussonnier
061d27e877 Merge pull request #3064 from minrk/header-anchors
add anchors to heading cells
2013-04-01 07:08:28 -07:00
MinRK
7a648670af set spellcheck=false in CodeCell inputarea
prevents autocorrect from firing in Safari (weirdly, autocorrect does not have this effect).

Note: must be `false`, not `off`

closes #3087
2013-03-27 22:16:41 -07:00
Matthias Bussonnier
7bc51fd945 Merge pull request #3078 from minrk/link_re
fix regular expression for detecting links in stdout
2013-03-27 12:20:38 -07:00
Matthias Bussonnier
98aba52c58 Merge pull request #3054 from minrk/auto-cluster-size
restore default behavior for automatic cluster size
2013-03-27 12:03:10 -07:00
MinRK
4cd0d6e7bb fix regular expression for detecting links in stdout
The previous expression was matching both the beginning and the end of the line,
which would end up swallowing the next match,
ultimately matching every other URL in the string.

This removes the end-of-line check, so it will match every URL.

The wrapURLs function to make URLs easier to identify does not seem to have been necessary,
and has thus been removed.

closes #2834
2013-03-25 16:56:05 -07:00
David Wyde
7a10342d6f Add YUIDoc in notebook.js. 2013-03-25 12:42:41 -05:00
Paul Ivanov
9ca886dc11 check for SIGUSR1 before using it, closes #3074
thanks @takluyver for spotting this
2013-03-25 08:30:31 -07:00
Min RK
b218a55a5d Merge pull request #3051 from minrk/vbox-ff-fail
add width:100% to vbox for webkit / FF consistency

closes #3049
2013-03-24 19:37:29 -07:00
MinRK
b110a02e7a s/heading-link/heading-anchor/ 2013-03-24 12:59:41 -07:00
MinRK
ede5a66198 put the anchor inside the header tag
instead of the other way around.

This way, only clicking the text loads the hash link,
rather than the whole area.
2013-03-24 12:47:12 -07:00
Min RK
d4c6bef1f5 Merge pull request #3033 from ivanov/print-server-info
on resume, print server info again
2013-03-24 11:19:53 -07:00
Paul Ivanov
6334a481b2 print info string on interrupt, log it on startup 2013-03-24 10:53:59 -07:00
MinRK
10b209f93e add redirect handler for notebooks by name
Now you can visit `localhost:8888/My Notebook.ipynb`,
and it will redirect you to the UUID url.
This allows cross-notebook links, etc. with `[other notebook](Notebook Name.ipynb)`
2013-03-23 13:30:45 -07:00
MinRK
7e6b5d98c7 trigger hash on notebook load
enables direct links to anchors within notebooks
2013-03-23 12:46:03 -07:00
MinRK
ba4b1d6e1c add anchor and link to heading cells 2013-03-23 12:44:35 -07:00
MinRK
276d8b68bb restore default behavior for automatic cluster size
the up/down buttons still work, but it doesn't populate everything with 2,
which was wrong.
2013-03-22 10:54:36 -07:00
MinRK
7fcc683e6f add width:100% to vbox for webkit / FF consistency
closes #3049
2013-03-21 12:21:49 -07:00
Paul Ivanov
fd467e75b6 make SIGUSR1 and SIGINFO trigger printing of info
Directory and url/port information for the notebook server is now
printed when it receives one of these signals. SIGINFO is available only
on BSD-based systems, and is triggered via Ctrl-T.
2013-03-18 18:09:28 -07:00
Paul Ivanov
218087104d log the notebook server directory
suggestion provided by @Carreau
2013-03-18 15:39:45 -07:00
Paul Ivanov
786396cbb0 on resume, print server info again
This commit makes it possible to differentiate between many different
long-running notebook servers, where the original ip address and port
information printed at the beginning has scrolled out of the screen.

We save the server location string that gets printed on startup, and
re-print it when the user attempts to interrupt the server with Ctrl-C

Thanks to @minrk for discussion on how this should work.

Also added a docstring to the start() method
2013-03-18 13:53:40 -07:00
Olivier Verdier
a7a73c4285 fix time format to international time format
use the ISO 8601 standard
see http://en.wikipedia.org/wiki/ISO_8601#Times
2013-03-18 16:21:22 +01:00
Harry Moreno
21fc8cd23b changed instances of 'outout' to 'output' in alt text's 2013-03-15 15:56:58 -07:00
Matthias BUSSONNIER
3b37cd80e4 fix css in .output_area pre
font: inherit conflict with monospace, wich in some cases
leads to non-monospace font (nbviewer for example)
2013-03-05 21:03:27 +01:00
Matthias BUSSONNIER
f84acbbaff fix run-all (that-> this) 2013-02-25 23:19:42 +01:00
Brian E. Granger
4843a7acd2 Merge pull request #2942 from Carreau/cm-ipython-css
Move CM IPython theme out of codemirror folder
2013-02-22 09:32:41 -08:00
Brian E. Granger
66049a99f0 Merge pull request #2929 from Carreau/cleanup-cell-insertion
Cleanup cell insertion
2013-02-22 09:24:08 -08:00
Matthias BUSSONNIER
914dfb9f61 fix one more == to === 2013-02-22 13:08:56 +01:00
Matthias BUSSONNIER
10e92b3034 fix i/index in move up/down and == -> === 2013-02-22 13:07:16 +01:00
Matthias BUSSONNIER
0033b3e6c5 fix notebook deletion.
do not thrust what "that" is in a 3 level deep
callback
2013-02-22 09:56:33 +01:00
MinRK
acf3b2bf21 fix logic for append_javascript
PR #2911 results in appending javascript even if dynamic is false,
so in current master all javascript outputs are actually run at load.
2013-02-19 13:59:37 -08:00
Matthias BUSSONNIER
e4cbf5e717 move CM IPython theme out of codemirror folder 2013-02-16 19:21:27 +01:00
Matthias BUSSONNIER
6ed926be7b fix baseUrl 2013-02-16 17:43:14 +01:00
Bussonnier Matthias
9cd9e5db73 Merge pull request #2903 from Carreau/toggle-line-number
Specify toggle value on cell line number
2013-02-16 07:20:55 -08:00
Bussonnier Matthias
a1a32e82ff Merge pull request #2911 from Carreau/output-order-conf
display order in output area configurable
2013-02-16 07:11:32 -08:00
Bussonnier Matthias
f99f0571d7 Merge pull request #2897 from Carreau/baseurl-meth
Dont rely on BaseProjectUrl data in body tag
2013-02-16 07:10:10 -08:00
Bussonnier Matthias
0a25fb8749 Merge pull request #2894 from Carreau/cm-configurable
Cm configurable
2013-02-16 07:09:31 -08:00
Matthias BUSSONNIER
f6298c6c7f use show method in toggle method 2013-02-16 11:59:26 +01:00
Matthias BUSSONNIER
1f402a1dac remove unused/not working function 2013-02-16 11:47:31 +01:00
Matthias BUSSONNIER
e965757a33 simplify logic 2013-02-16 11:44:13 +01:00
Bussonnier Matthias
b8fe73ba3c Merge pull request #2932 from takluyver/get-static-files
Simplify using notebook static files from external code
2013-02-14 23:54:24 -08:00
Thomas Kluyver
9e2894caa2 Simplify using notebook static files from external code. 2013-02-14 16:52:54 +00:00
Bussonnier Matthias
1467f5b59f abstract, cleanup and document
Separate the methods that actually insert dom element for easier
testing.

Cleanup, and order methods more logically

add "docstring"
2013-02-13 22:35:42 +01:00
Bussonnier Matthias
0c5c5b9c83 Merge pull request #2906 from Carreau/mkypatch-cm
Unpatch/Monkey patch CM
2013-02-13 13:00:45 -08:00
Matthias BUSSONNIER
44385d9c7f jslint 2013-02-12 23:13:09 +01:00
Matthias BUSSONNIER
bd59389626 fix bad logic 2013-02-12 21:32:17 +01:00
MinRK
b7fe08c91c add disabled state to undo-delete-cell when unavailable. 2013-02-12 10:53:10 -08:00
MinRK
7566379d14 add menu item for undo delete cell
closes #2920
2013-02-12 10:47:06 -08:00
Matthias BUSSONNIER
d9480a5643 refactor cellc 2013-02-12 18:06:02 +01:00
Matthias BUSSONNIER
2d07627cb1 factor valid cell index logic 2013-02-12 17:28:13 +01:00
Matthias BUSSONNIER
763e7a31ce doc fixes 2013-02-12 16:56:34 +01:00
Matthias BUSSONNIER
70713da4d4 Method to show hide linenumber of cell
mostly convenience methods to wrap codemirror one,
plus doc and 1 doc fix (missing curly bracket)
2013-02-10 19:49:33 +01:00
Bussonnier Matthias
1445b189d4 Merge pull request #2885 from Carreau/monospace-pager
get monospace pager back
2013-02-10 10:43:24 -08:00
Matthias BUSSONNIER
fc2ee6289b display order in output area configurable 2013-02-10 18:55:48 +01:00
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