Commit Graph

64 Commits

Author SHA1 Message Date
Thomas Kluyver
9790e43997 Merge pull request #7605 from minrk/f-the-pager
fix the pager and tooltip locations
2015-01-27 13:24:12 -08:00
Min RK
2d0b8b1d6a use default_url for logo link 2015-01-27 10:39:50 -08:00
Min RK
e18a502484 "fix" the pager
- pull the pager element out of `#site`
- fix top to `auto` instead of `inherit`
2015-01-26 21:42:22 -08:00
Min RK
b84ad79b2f don't use fixed header
instead, use static header and flex box to accomplish the same thing.

fixes various issues related to scrolling, anchors, etc.
2015-01-20 17:11:51 -08:00
Jason Grout
5dea7ad30b Split apart the body attributes and classes in the notebook templates 2015-01-08 23:41:50 +00:00
Jonathan Frederic
cda53215ba Improve edit app 2014-12-18 15:19:36 -08:00
Min RK
26136f44d2 Merge pull request #7088 from Carreau/kernel.js
Load the per kernel kernel.js and kernel.css
2014-12-15 10:33:35 -08:00
Bussonnier Matthias
1b2305c475 emit valid html:
Not closed div, <a> don't have alt but title, chrome frame has been
closed for at least a year, IE shoudl use edge mode. div cannot embed
span.
2014-12-12 15:28:51 +01:00
Matthias BUSSONNIER
4239dc03f3 load the per kernel kernel.js and kernel.css
As per discussion, each kernel can provide a file name kernel.js that
we try to load at kernel switching. If such a file exist we assume that
the kernel pathches the javasscript and that this javascript cannot be
unpatched, and further switching of the kernel cannot be undone without
reloading the page. (separate PR for UI)

if a kernel provide kernel.js, the it should consist into a AMD module
definition that uses require.js the module shoudl define a function name
`onload` that will be called at the appropriate moment before the kernel
starts.
2014-12-10 10:45:26 +01:00
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
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
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
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
b54cc20357 use Jupyter logo in the notebook header
and favicon
2014-11-20 14:55:59 -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
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
d211ebf067 Basic infrastructure for terminal page 2014-10-25 17:14:39 -07: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
MinRK
a060056e36 remove unused dateformat
we are using moment.js for dates now
2014-09-29 14:28:29 -07:00
Matthias BUSSONNIER
8b20aee32e use momentjs for nice dates 2014-07-30 23:37:07 +02: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
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
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
0e9e1dd5a3 MWE,
Fixed LOTS of bugs
2014-07-10 15:47:22 -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
dec962194f Update components to point to right branch 2014-06-09 12:05:39 -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
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