Commit Graph

275 Commits

Author SHA1 Message Date
MinRK
579f5101f0 restore websocket_url configurable
allows ws to be handled via separate proxies,
as appears to be the case on OpenShift and some other hosting services.
2014-07-22 14:43:40 -07:00
Matthias BUSSONNIER
17afb5a71f remove pagemain.js
It does not seem to be usefull anymore.

The different main.js of /tree /notebook /etc do create an instance of
`page` themselves, error pages do have hardcoded styles that show header
and sites.
2014-07-20 21:40:14 +02:00
Jonathan Frederic
2478fac032 More requirejs fixes 2014-07-10 15:47:23 -05:00
Jonathan Frederic
ee76005bc2 More review changes 2014-07-10 15:47:23 -05:00
Jonathan Frederic
2d7a4a7879 Some JS test fixes 2014-07-10 15:47:23 -05:00
Jonathan Frederic
188072d190 @carreau review changes 2014-07-10 15:47:22 -05:00
Jonathan Frederic
0e9e1dd5a3 MWE,
Fixed LOTS of bugs
2014-07-10 15:47:22 -05:00
Jonathan Frederic
9bfe5fc06c Use ipython namepsace for instances. 2014-07-10 15:25:09 -05:00
Jonathan Frederic
fb32b6561f Start of work to make notebook.html requirejs friendly. 2014-07-10 15:25:08 -05:00
Jonathan Frederic
9f4a03ce79 Started work to make tree requirejs friendly. 2014-07-10 15:25:08 -05:00
Jonathan Frederic
855815d207 Make page.html require.js friendly. 2014-07-10 15:25:08 -05:00
Jonathan Frederic
8fd3515794 Post discussion with @ellisonbg 2014-06-09 12:05:39 -07:00
Jonathan Frederic
6834cb95bc Rebase cleanup, comments and nesting 2014-06-09 12:05:39 -07:00
Jonathan Frederic
dec962194f Update components to point to right branch 2014-06-09 12:05:39 -07:00
Jonathan Frederic
181b0e9cfc Address less of the conversion warnings 2014-06-09 12:05:38 -07:00
Jonathan Frederic
22c94ab404 Lots of small alignment tweaks to get Bootstrap3 looking better 2014-06-09 12:05:38 -07:00
jon
68cfaeb7c9 Fixed status indicator region 2014-06-09 12:05:38 -07:00
Jonathan Frederic
142e884943 Updated notebook template so menubar is rendered correctly 2014-06-09 12:05:38 -07:00
Jonathan Frederic
80673856a8 Fixed float 2014-06-09 12:05:37 -07:00
Jonathan Frederic
697cc58655 Change the nav bar to nav-pills 2014-06-09 12:05:37 -07:00
Jonathan Frederic
0689830c4b Fixes to make spinners in cluster list display correctly. 2014-06-09 12:05:37 -07:00
Jonathan Frederic
0483bb2ed8 Fixed cluster list. 2014-06-09 12:05:37 -07:00
Jonathan Frederic
d88daf1bb7 Ran jdfreder/bootstrap2to3 2014-06-09 12:05:37 -07:00
Jonathan Frederic
5c47651786 Get notebook running with Bootstrap3 2014-06-09 12:05:36 -07:00
Jonathan Frederic
961254292e Remove hard reference to GFM since IPythonGFM uses CM require to load it. 2014-05-21 11:06:10 -07:00
Jonathan Frederic
802f74e190 Create ipythongfm mode 2014-05-21 11:00:47 -07:00
Thomas Kluyver
0dc02c176a Merge pull request #5586 from minrk/pdf-exporter
add PDFExporter
2014-04-22 13:15:22 -07:00
Susan Tan
abaec7694b Fixed Issue #4012 Added Help menubar link to Github Flavored Markdown doc 2014-04-15 20:47:07 -04:00
MinRK
f7c1a15896 support pdf export in the notebook UI 2014-04-10 21:13:41 -07:00
Brian E. Granger
655098b3c2 Pointing to the 2.x branch in the Help menu. 2014-04-01 15:42:09 -07:00
Brian E. Granger
d5c913c4c2 Removing Editor Shortcuts - these are now in the Shortcut Modal. 2014-03-31 17:06:08 -07:00
Brian E. Granger
b91394cb7d Fixing Help menu links. 2014-03-31 17:06:08 -07:00
Aaron Meurer
75d4947e81 Point to the stable SymPy docs, not the dev docs 2014-03-26 18:07:17 -05:00
MinRK
2daf2fe293 update links in notebook help menu 2014-03-25 17:03:37 -07:00
Thomas Kluyver
80af3b4cfb Merge pull request #4802 from ivanov/ui-docs
Tour of the notebook UI (was UI elements inline with highlighting)
2014-03-07 12:09:32 -08:00
Paul Ivanov
0ba3d22501 proper styling for the tour 2014-03-04 19:00:14 -08:00
MinRK
1ae689f30c Add Trust Notebook to File menu 2014-03-03 16:10:20 -08:00
MinRK
4d35660f3c sanitize CSS
rather than removing it entirely
2014-03-03 16:10:19 -08:00
MinRK
c298670a4b use html-sanitizer instead of html-css
always scrub css (for now)
2014-03-03 16:10:17 -08:00
MinRK
2a0451fdde use google-caja for sanitization 2014-03-03 16:06:41 -08:00
Brian E. Granger
fa3f998295 Adding security.js with 1st attempt at is_safe. 2014-03-03 16:06:40 -08:00
Brian E. Granger
ff1492f8c9 Creating new base/js/keyboard.js 2014-03-03 13:10:17 -08:00
Paul Ivanov
405017875e tidy up and add to the tour
@takluyver found some typos which I fixed now
2014-02-28 20:04:22 -08:00
Paul Ivanov
a765132684 add the tour to the page 2014-02-28 20:03:46 -08:00
Paul Ivanov
f8ab13b675 Merge pull request #5215 from ivanov/running-kernels
Dashboard "Running" Tab
2014-02-27 19:57:50 -08:00
Paul Ivanov
938f4bdfc4 small whitespace cleanup, renamed drag_info
in the dashboard, I've renamed drag_info to notebook_list_info, so
applying style to notebook_list_info and running_list_info can be done
in one place.
2014-02-27 19:36:42 -08:00
Paul Ivanov
7d1da4c550 refer to notebooks, not kernels. 2014-02-26 12:35:20 -08:00
Paul Ivanov
b74b10e308 added IPython.session_list
before this, kernel_list and notebook_list each fetched and held onto
their own copy of the sessions.
2014-02-25 18:09:16 -08:00
Min RK
0117b587ab Merge pull request #4985 from damianavila/closebrackets
Enable autoCloseBrackets in CodeMirror by default.
2014-02-25 09:04:22 -08:00
Paul Ivanov
06c689caa3 remove reiterated repetitively redundant "actively" 2014-02-24 15:02:08 -08:00
Paul Ivanov
cb1bb62272 ok, Running tab is working now 2014-02-24 13:11:13 -08:00
Matthias BUSSONNIER
816df5bb34 Allow to pass option to jinja env
Mainly to pass cache_size=-1 while developping not to cache templates
2014-02-23 23:28:57 +01:00
Brian E. Granger
4bd315bda0 Merge pull request #5147 from minrk/static-url-version
Some template URL changes
2014-02-20 17:05:09 -08:00
Paul Ivanov
b3c1164798 put Running tab on the page 2014-02-20 17:01:51 -08:00
MinRK
69cba774d9 Some template static_url tweaks
- don't try to include version in static_urls that don't point to files
- use full static_urls (with extension) for backbone and underscore, so version can be computed

closes #5141
2014-02-18 14:09:56 -08:00
MinRK
a184724bdb remove base_kernel_url 2014-02-11 21:26:10 -08:00
MinRK
e1e0b19a6a s/base_project_url/base_url/
deprecate NotebookApp.base_project_url
2014-02-08 23:09:24 -08:00
Brian E. Granger
af884b797f Add edit/command mode indicator. 2014-02-05 22:58:33 -08:00
Min RK
cd7c1e6fae Merge pull request #5001 from ellisonbg/dashboard-dirs
Add directory navigation to dashboard
2014-02-05 17:21:43 -08:00
Brian E. Granger
7ab69652ea Breadcrumb home icon. 2014-02-05 15:35:46 -08:00
Jonathan Frederic
65fba24d92 FF Fix: make ext icon same line as txt 2014-02-05 12:45:52 -08:00
Brian E. Granger
378b18b2fb Nice dashboard page titles like /.../examples/notebooks/ 2014-02-04 16:29:55 -08:00
Brian E. Granger
dd126fce6d Tighten spacing of dashboard. 2014-02-04 15:53:27 -08:00
Brian E. Granger
2207a4f0dc Adding proper breadcrumb support. 2014-02-04 15:53:27 -08:00
Matthias BUSSONNIER
bb27cd0de5 more subtle kernel indicator
add casper.wait_for_busy
like wait_for_idle, but busy

restore kernel notification widget
it's still used for interrupt / restart

use wait_for_busy in check_interrupt test
2014-02-04 11:40:39 +01:00
Susan Tan
466e05c165 Add notebook examples link to help menu. 2014-02-03 17:35:55 -08:00
Matthias Bussonnier
68973cf622 link to matplotlib latest. 2014-02-02 09:10:12 +01:00
damianavila
2144c8e182 Forgot to add the needed js file... 2014-02-01 11:47:47 -03:00
Matthias BUSSONNIER
38807bb59f make help menu a templates
add splitline after keyboard shortcut
float external-link icon to the right

and move the 'title' to the individual elements,
so it follows hover.
2014-02-01 11:26:00 +01:00
Brian E. Granger
b638b8718c Adding DOM ids for each menu. 2014-01-28 20:30:18 -08:00
Brian E. Granger
7c65e96941 Simplified Cell menu items related to output. 2014-01-28 19:30:51 -08:00
Brian E. Granger
f4bfcadf32 Adding back Kernel menu and Cell Type submenu. 2014-01-28 19:11:31 -08:00
Brian E. Granger
afb114e6d3 Removing unneeded select prev/next from Edit menu. 2014-01-28 19:11:31 -08:00
Brian E. Granger
54666e2e98 Cleaning up output management in code and menus. 2014-01-28 19:11:31 -08:00
Brian E. Granger
953da90a98 Removing Kernel menu. 2014-01-28 19:11:31 -08:00
Jonathan Frederic
8891750535 Fixed static_url call which is no longer optionally 1 param 2014-01-16 10:57:12 +00:00
Jonathan Frederic
3361826b5a Added require.js shims for underscore and backbone
This is necessary since underscore and backbone are no longer AMD
modules.
2014-01-16 10:57:10 +00:00
Jonathan Frederic
40a923c5b6 Lots of updates to widget(s) js
Use require.js (again)
Allow IntTextView and FloatTextView to be used without min/max
2014-01-16 10:55:59 +00:00
Jonathan Frederic
990303f3eb Removed require.js scheme since it forces async event driven model,
this model does not work with the comm/widget communication model.
We need to be able to load the dependencies before we send the
show() message to the widget manager.  Otherwise a race condition
will exist where the widget manager may recieve the show message
before the dependencies have been loaded (happened almost every time).
2014-01-16 10:55:59 +00:00
Jonathan Frederic
c9d604d54e Use require.js where possible. 2014-01-16 10:55:59 +00:00
Jonathan Frederic
e3d6467809 Don't try to load widget.js automatically since it was moved
load using init_widget_js
2014-01-16 10:55:58 +00:00
Jonathan Frederic
a1f6d0fe02 Added dependencies to page.html template and added widget.js to notebook.html 2014-01-16 10:55:57 +00:00
MinRK
063bfa9688 we don't bundle lessc anymore, remove its vestiges 2014-01-13 16:17:50 -08:00
Brian E. Granger
d8db72564a Merge pull request #3605 from ellisonbg/newux
Modal UI - a whole new world of fun....its like vim, but not!
2014-01-10 16:10:25 -08:00
Thomas Kluyver
c0f346c4e3 Merge pull request #4735 from minrk/better-errors
add some HTML error pages
2014-01-09 13:03:31 -08:00
Brian E. Granger
201217d847 Renaming execute methods. 2014-01-09 12:30:06 -08:00
MinRK
5c9dfd9b58 remove unnecessary conversion of newline to br tag
relic from when I was using div, not pre
2014-01-08 15:03:28 -08:00
Brian E. Granger
caffba142e Adding keyboard manager logic.
This is currently very broken.
2014-01-07 14:42:35 -08:00
Min RK
96c1af0ce4 Merge pull request #4715 from minrk/tornado-static-url
restore use of tornado static_url in templates
2013-12-31 10:58:09 -08:00
MinRK
84df1a5e26 add error page templates 2013-12-22 17:58:15 -08:00
MinRK
15780ad055 restore use of tornado static_url
instead of jinja macro that doesn't write hashes

closes #4714
2013-12-18 14:17:35 -08:00
Thomas Kluyver
390b13a82c Add option to download as reST 2013-12-13 14:46:51 -08:00
Thomas Kluyver
a3c2f1b5f9 Add menu entries for getting converted views of a notebook 2013-12-13 14:46:51 -08:00
Matthias Bussonnier
4039e246fc Merge pull request #4306 from minrk/raw-cell-metadata
add raw_mimetype metadata to raw cells
2013-12-07 07:48:22 -08:00
damianavila
012d8b207e Added link to shorcuts in the notebook menu. 2013-11-26 16:16:48 -03:00
MinRK
d087a213b3 add raw cell toolbar preset 2013-11-20 14:50:12 -08:00
MinRK
66fe540412 rename Raw Text to Raw NBConvert in menu 2013-11-20 14:47:50 -08:00
Paul Ivanov
4ffe489e72 Merge pull request #4415 from ivanov/more-tooltips
More tooltips in the Notebook menu
2013-10-28 13:51:39 -07:00
MinRK
f8ddcffacb allow require("nbextensions/extname") to load from IPYTHONDIR/nbextensions 2013-10-24 15:32:28 -07:00
MinRK
5c83cd3e52 move comm.js to kernel service 2013-10-22 19:44:44 -07:00
MinRK
99680e21bd move comm.js to base 2013-10-22 19:43:56 -07:00
MinRK
3665cc241f rename widget to comm 2013-10-22 19:40:34 -07:00
MinRK
6643cffa23 add javascript-side widgets 2013-10-22 19:40:32 -07:00
Paul Ivanov
8fb1d7391c added some tooltips for the File menu 2013-10-21 23:42:03 -07:00
Paul Ivanov
474bd780ce tooltips for View and Insert menus 2013-10-21 23:36:44 -07:00
Paul Ivanov
0f9a478abd Kernel and Help menu tooltips 2013-10-21 23:31:27 -07:00
Paul Ivanov
69d06c02d7 add more tooltips for Cell menu 2013-10-21 23:24:48 -07:00
Paul Ivanov
bd22e4ae90 added descriptions which were deleted from JS 2013-10-21 22:40:48 -07:00
MinRK
4a12890d65 disable download-as-pt
since it doesn't work. Adds a note about nbconvert needed to bring it back.
2013-10-17 14:09:19 -07:00
MinRK
e16a5807c7 fixup bad rebase 2013-10-17 14:09:18 -07:00
MinRK
141d088a51 logo link to current tree level
rather than top level
2013-10-17 14:09:13 -07:00
MinRK
dd93a2211a add utils.js to tree template 2013-10-17 14:09:13 -07:00
MinRK
c79dcc8e73 quote data attributes
prevents errors when these are empty strings
2013-10-17 14:09:13 -07:00
MinRK
14fd50f80b Simplify Tree handlers
- 404 on missing path
- only need one handler for each of redirect and dashboard,
  don't need duplicates.
- project property on Handlers is unclear
2013-10-17 14:09:12 -07:00
Zachary Sailer
d16fe2f826 manual rebase html notebook templates 2013-10-17 14:07:50 -07:00
MinRK
4a04553acd add Edit Notebook Metadata to Edit menu 2013-10-06 12:33:35 -07:00
Paul Ivanov
2778e98945 DOC: fix links to matplotlib, notebook docs
I've added a link to pandas, made all matplotlib links point to
matplotlib.org, and fixed a link in the notebook help menu to point to
our new notebook.html, now that htmlnotebook.html is a redirect.

Whoever ends up merging this PR should backport it to 1.x.
2013-08-13 20:56:19 -07:00
MinRK
a186b25626 explicitly load python mode before IPython mode
ensures IPython mode gets defined at startup,
which can sometimes fail because the Python mode was loaded dynamically.

closes #3636
2013-08-05 13:51:23 -07:00
MinRK
03883d82e4 remove bad if logged_in preventing new-notebook without login 2013-07-25 12:07:40 -07:00
MinRK
f9dd129e1c remove notebook read-only view
it is largely broken, and had problematic security issues.
2013-07-23 13:22:05 -07:00
MinRK
127a0669ff enable comment/uncomment selection
with `(cmd|ctrl)-/`

closes #1540
2013-07-17 14:27:07 -07:00
MinRK
409a1bb6e1 remove boilerplate.css
it is redundant with bootstrap reset
2013-07-13 14:44:55 -07:00
Matthias BUSSONNIER
2272edf715 correct static path for CM modes autoload
this shoudl also allow to require CM python mode for ipython mode and
only pass a config options.
2013-07-07 18:56:07 +02:00
MinRK
d12a9b19c9 use bootstrap disabled instead of ui-state-disabled
in menubar
2013-07-02 10:42:12 -07:00
MinRK
cf726d6a40 mv IPython.html.notebook -> IPython.html 2013-06-27 11:14:10 -07:00