Commit Graph

250 Commits

Author SHA1 Message Date
Min RK
0b46e2aff2 remove some custom css
mainly in navbars, where we were doing custom
things that bootstrap already did with classes.

This did require the removal of multiple class LESS inheritance for
navbar buttons, because it doesn't work properly. Seems like a LESS bug, but I'm not sure.
2014-12-07 11:16:15 -08:00
Min RK
6a1cebe4c0 minor reflow of tree header
- remove absolutely positioned text (absolute text doesn't wrap correctly)
- associate hidden upload directly with 'click here' via span
- remove column split, rely on regular reflow
2014-12-05 13:08:55 -08:00
Min RK
d9767e8c94 separate selecting default kernel from new notebook with specified kernel
adds checkmark to indicate selection
2014-12-05 12:06:55 -08:00
Min RK
0cfd8731a0 include current kernel name in new notebook dropdown 2014-12-05 12:06:55 -08:00
Min RK
d312486840 Add kernel-select dropdown to new notebook button
most recent choice is remembered in localStorage
2014-12-05 12:06:54 -08:00
Min RK
4fc163812a change kernel spec placeholder name to 'Kernel' 2014-12-05 12:06:25 -08:00
Matthias Bussonnier
b12ac2cb15 Merge pull request #7011 from jdfreder/killthelayout
Kill the layout manager
2014-12-05 19:31:24 +01:00
Jason Grout
155381072c Make the favicon a template block 2014-12-04 00:35:28 +00:00
Jonathan Frederic
e79a43e867 Fix scroll/resize handle missing behavior. 2014-12-03 14:29:20 -08:00
Jonathan Frederic
353a9afd34 Kill the layout manager 2014-12-03 14:29:20 -08:00
Min RK
f15727f6f6 Merge pull request #7032 from minrk/require-url-arg
add '?v=<date>' to require URLs
2014-11-27 13:13:14 -08:00
Min RK
cf91873644 Merge pull request #6866 from takluyver/nb-texteditor
Notebook text editor
2014-11-25 10:30:41 -08:00
Thomas Kluyver
011beaa385 Rename texteditor files & folders to edit 2014-11-25 10:07:52 -08:00
Bussonnier Matthias
cc00d48b8c Use map instead of hacking path to our need.
might help closing #7034
2014-11-25 15:58:08 +01:00
Min RK
a492ac554d add '?v=<date>' to require URLs
- resets cache on server restart
- don't cache requests on master (rely on 304 for content caching)
2014-11-24 20:58:04 -08:00
Min RK
535bbee883 Merge pull request #6978 from takluyver/nbconvert-script
Nbconvert to script for any kernel language
2014-11-24 12:56:20 -08:00
Thomas Kluyver
bc769d24f6 Add filename to header area 2014-11-22 21:58:02 -08:00
Min RK
b54cc20357 use Jupyter logo in the notebook header
and favicon
2014-11-20 14:55:59 -08:00
Thomas Kluyver
8dced9ab73 Styling to make it clearer where the editor is 2014-11-20 11:52:36 -08:00
Thomas Kluyver
6419595371 Use NotificationArea in the text editor 2014-11-20 11:52:36 -08:00
Thomas Kluyver
c1d012d703 Enable codemirror search/replace shortcuts 2014-11-20 11:52:35 -08:00
Thomas Kluyver
f49bef7b0d Saving files works 2014-11-20 11:52:35 -08:00
Thomas Kluyver
25ee73a554 Loading a file works 2014-11-20 11:52:35 -08:00
Thomas Kluyver
e6935d47c0 Basic infrastructure for new texteditor component 2014-11-20 11:51:30 -08:00
Thomas Kluyver
800e2ad25a 'Download as' script 2014-11-18 16:26:29 -08:00
Matthias Bussonnier
4cd8ee3bb2 Merge pull request #6881 from jasongrout/template-blocks
Make favicon and logo images blocks in the template
2014-11-18 16:52:06 +01:00
Jonathan Frederic
b76d4d5c05 Use es6-promise polyfill 2014-11-15 08:49:44 -08:00
Jonathan Frederic
bed3a4cfda use es6 2014-11-15 08:48:36 -08:00
Jonathan Frederic
bbcd5cb55f Bug fixes 2014-11-15 08:48:34 -08:00
MinRK
29e49329e2 use CodeMirror.runMode to highlight in markdown
instead of highlight.js
2014-11-14 14:53:52 -08:00
Min RK
388fec4f96 Merge pull request #6924 from takluyver/contents-promises
Use promises in the JS contents API
2014-11-14 14:46:37 -08:00
Thomas Kluyver
8c962df79c Load promises polyfill from a script tag
So all JS code can assume promises work, without needing to require it.
2014-11-14 12:43:44 -08:00
Jason Grout
d11f48eadb Make favicon and logo images blocks in the template 2014-11-14 15:28:40 +00:00
Kyle Kelley
d029a3f4a3 Fix link to /tree. 2014-11-13 17:50:57 -06:00
Thomas Kluyver
9b2dac3fc1 Infrastructure for AJAX requests returning ES6 promises 2014-11-13 11:42:37 -08:00
Min RK
59b54eba53 add Reconnect to kernel menu 2014-11-07 15:42:40 -08:00
Thomas Kluyver
1ae6be218d Fix require config 2014-11-03 10:19:51 -08:00
Jeff Hemmelgarn
53463898eb Move contentmanager to contents 2014-11-03 10:18:27 -08:00
KesterTong
3994d4d56a Adds configuration options to use Google Drive content manager
Adds the key contentmanager_js_source to webapp_settings that allows for specifying the content manager JavaScript source file.  Also adds a NotebookManager subclass, ClientSideNotebookManager, which does minimal logic.  This class is used when the JavaScript content manager doesn't use the Python notebook manager, but rather implements that logic client side, as is the case for the Google Drive based content manager.

A sample command line that uses the Google Drive content manager, and the ClientSideNotebookManager, is

ipython notebook --NotebookApp.webapp_settings="{'contentmanager_js_source': 'base/js/drive_contentmanager'}" --NotebookApp.notebook_manager_class="IPython.html.services.notebooks.clientsidenbmanager.ClientSideNotebookManager"
2014-11-03 10:18:04 -08:00
Thomas Kluyver
a16a3d0270 Merge pull request #6045 from minrk/nbformat4
nbformat v4
2014-11-03 09:58:33 -08:00
MinRK
dd95b1ef5f remove heading cells in v4 2014-11-01 16:41:07 -07:00
Thomas Kluyver
4025b57ed8 Only display terminals in dashboard if terminals are available 2014-10-31 15:56:53 -07:00
Thomas Kluyver
65e664b143 Add list of available terminals in the dashboard 2014-10-31 15:42:52 -07:00
Min RK
965102ba60 Merge pull request #6554 from Carreau/itsallaboutme
Add About IPython
2014-10-30 14:23:16 -07:00
Thomas Kluyver
c8af873aeb Remove override.css from the template 2014-10-25 17:15:50 -07:00
Thomas Kluyver
52be8bdf6b HTML fix 2014-10-25 17:15:36 -07:00
Bussonnier Matthias
1b200e5504 recompute dummy size dynamically + styling in css 2014-10-25 17:15:36 -07:00
Thomas Kluyver
9c0084e615 Multiple terminals and conditional initialisation 2014-10-25 17:14:40 -07:00
Thomas Kluyver
d4676bf2ad Terminal basically working
Still need to deal with things like authentication
2014-10-25 17:14:40 -07:00
Thomas Kluyver
d211ebf067 Basic infrastructure for terminal page 2014-10-25 17:14:39 -07:00
Matthias Bussonnier
d269912958 Merge pull request #6110 from minrk/binarycomm
support binary buffers in comm messages
2014-10-19 11:03:24 +02:00
MinRK
e36df49c5f tweak collapsed navbar style
- notification and indicators appear above menu on small screen
- collapsed menu button floats left
2014-10-18 18:21:07 -07:00
MinRK
5ccbd18e5d collapse the navbar on narrow windows
so it doesn't take up a bunch of vertical height when not in use
2014-10-18 18:21:07 -07:00
Matthias Bussonnier
e7c2c369e0 Add about dialog in Notebook Help Menu.
This allow to get info on version of IPython when running remotely.
The about dialog also send a kernel info request and display the banner
which is useful for non-python kernel that don't match IPython version
2014-10-16 17:04:19 +02:00
MinRK
b548e51550 use TextEncoding for string<->ArrayBuffer
requires text-encoding js polyfill, for now
2014-10-15 12:23:32 -07:00
MinRK
8e863d951c use require to load CodeMirror modes
CM's loadmode addon only works if you *don't* load CodeMirror itself with require.
2014-10-10 19:21:55 +02:00
Matthias BUSSONNIER
5b355936df Update to codemirror 4
Update to codemirror 4.6 and update most notebook to work wiht it
this include keyevent that where triggerd twice and the re-writing of
ipython-gfm anf ipython mode to work with require.
2014-10-10 19:18:56 +02:00
Bussonnier Matthias
0dcce32de7 use standard html 2014-10-02 16:14:03 +02:00
MinRK
a060056e36 remove unused dateformat
we are using moment.js for dates now
2014-09-29 14:28:29 -07:00
Matthias Bussonnier
77ec6fdfa2 Merge pull request #6205 from Carreau/momentjs
use momentjs for nicer dates
2014-08-23 22:19:08 +02:00
MinRK
fae77bd133 remove unused project_dir 2014-07-31 11:57:38 -07:00
Matthias BUSSONNIER
8b20aee32e use momentjs for nice dates 2014-07-30 23:37:07 +02:00
Min RK
c007debe3a Merge pull request #6084 from tomspur/fontawesome4
Update fontawesome to 4.1
2014-07-28 11:44:39 -07:00
Thomas Kluyver
c9631845fa Merge pull request #6126 from takluyver/kernelspecs-nb-ui
UI for changing kernels in the notebook
2014-07-28 11:33:14 -07:00
Thomas Spura
01dec53cf9 Port more icons to fontawesome-4 2014-07-27 14:53:20 +02:00
Thomas Kluyver
c71eea365e Add submenu under kernel for changing kernel 2014-07-24 18:14:11 -07:00
Matthias BUSSONNIER
849ff3bb05 Simplify and uniformise styling of kernel selector
Make the theme coherent with the logout button
2014-07-24 16:55:18 -07:00
Thomas Kluyver
41626420e2 Allow switching kernel from the notebook UI 2014-07-24 16:31:55 -07:00
MinRK
11193d4790 move some responsive bootstrap transitions
- `-md-` puts the transition at 970px
- `-sm-` puts the transition at 768px

I moved most of the `md` transitions to `sm`,
which seems more reasonable.
I also moved the cluster list to `xs` because
the columns will never be wider than a dozen or so characters.
2014-07-24 13:02:30 -07:00
Paul Ivanov
b67aac5aef Merge pull request #6119 from minrk/global-events
return global events from require(['base/js/events']).
2014-07-24 12:23:14 -07:00
Matthias Bussonnier
16d21d3267 Merge pull request #6188 from jasongrout/highlightjs-require-shim
Add a requirejs shim for highlight.js
2014-07-24 13:53:28 +02:00
Matthias Bussonnier
b290f48815 Merge pull request #6036 from minrk/restore-ws-host
restore websocket_url configurable
2014-07-24 13:41:18 +02:00
Jason Grout
3fc4442053 Move shim to the standard location 2014-07-23 21:13:42 +00:00
MinRK
e9da9fd776 don’t load custom.js in page template
we are loading it in require, and don’t want to load it twice
2014-07-23 11:05:36 -07:00
MinRK
d345546d15 add bootstrap shim for require
it was possible for bootstrap js to load before jquery,
causing failures in the dashboard.
2014-07-22 15:53:16 -07:00
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