From 27e8947e793a6523b4f74bd70116a2ab400b3973 Mon Sep 17 00:00:00 2001 From: "Brian E. Granger" Date: Wed, 15 May 2013 13:53:22 -0700 Subject: [PATCH 01/41] Reorg of the js/less/css files. --- IPython/frontend/html/notebook/README.md | 50 ++++++++++++++++-- .../auth/less/login.less} | 0 .../auth/less/logout.less} | 0 .../static/{js => ipython/auth}/loginmain.js | 0 .../{js => ipython/auth}/loginwidget.js | 0 .../static/{js => ipython/auth}/logoutmain.js | 0 .../static/{ => ipython/base}/css/custom.css | 0 .../static/{js => ipython/base}/custom.js | 0 .../static/{js => ipython/base}/events.js | 0 .../{ => ipython/base/images}/favicon.ico | Bin .../page.css => ipython/base/less/page.less} | 0 .../static/{js => ipython/base}/namespace.js | 0 .../static/{js => ipython/base}/page.js | 0 .../static/{js => ipython/base}/pagemain.js | 0 .../static/{js => ipython/base}/utils.js | 0 .../static/{js => ipython/kernels}/kernel.js | 0 .../static/{js => ipython/notebooks}/cell.js | 0 .../{js => ipython/notebooks}/celltoolbar.js | 0 .../notebooks}/celltoolbarpresets/default.js | 0 .../notebooks}/celltoolbarpresets/example.js | 0 .../celltoolbarpresets/slideshow.js | 0 .../{js => ipython/notebooks}/codecell.js | 0 .../notebooks}/codemirror-ipython.js | 0 .../{js => ipython/notebooks}/completer.js | 0 .../{js => ipython/notebooks}/contexthint.js | 0 .../notebooks/less/celltoolbar.less} | 0 .../{js => ipython/notebooks}/maintoolbar.js | 0 .../{js => ipython/notebooks}/mathjaxutils.js | 0 .../{js => ipython/notebooks}/menubar.js | 0 .../{js => ipython/notebooks}/notebook.js | 0 .../{js => ipython/notebooks}/notebookmain.js | 0 .../notebooks}/notificationarea.js | 0 .../notebooks}/notificationwidget.js | 0 .../{js => ipython/notebooks}/outputarea.js | 0 .../static/{js => ipython/notebooks}/pager.js | 0 .../{js => ipython/notebooks}/quickhelp.js | 0 .../{js => ipython/notebooks}/savewidget.js | 0 .../{js => ipython/notebooks}/textcell.js | 0 .../{js => ipython/notebooks}/toolbar.js | 0 .../{js => ipython/notebooks}/tooltip.js | 0 .../{js => ipython/tree}/clusterlist.js | 0 .../tree/less/alternateuploadform.less} | 0 .../tree/less/tree.less} | 0 .../{js => ipython/tree}/notebooklist.js | 0 .../tree}/projectdashboardmain.js | 0 45 files changed, 47 insertions(+), 3 deletions(-) rename IPython/frontend/html/notebook/static/{css/login.css => ipython/auth/less/login.less} (100%) rename IPython/frontend/html/notebook/static/{css/logout.css => ipython/auth/less/logout.less} (100%) rename IPython/frontend/html/notebook/static/{js => ipython/auth}/loginmain.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/auth}/loginwidget.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/auth}/logoutmain.js (100%) rename IPython/frontend/html/notebook/static/{ => ipython/base}/css/custom.css (100%) rename IPython/frontend/html/notebook/static/{js => ipython/base}/custom.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/base}/events.js (100%) rename IPython/frontend/html/notebook/static/{ => ipython/base/images}/favicon.ico (100%) rename IPython/frontend/html/notebook/static/{css/page.css => ipython/base/less/page.less} (100%) rename IPython/frontend/html/notebook/static/{js => ipython/base}/namespace.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/base}/page.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/base}/pagemain.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/base}/utils.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/kernels}/kernel.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/cell.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/celltoolbar.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/celltoolbarpresets/default.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/celltoolbarpresets/example.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/celltoolbarpresets/slideshow.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/codecell.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/codemirror-ipython.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/completer.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/contexthint.js (100%) rename IPython/frontend/html/notebook/static/{css/celltoolbar.css => ipython/notebooks/less/celltoolbar.less} (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/maintoolbar.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/mathjaxutils.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/menubar.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/notebook.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/notebookmain.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/notificationarea.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/notificationwidget.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/outputarea.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/pager.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/quickhelp.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/savewidget.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/textcell.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/toolbar.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/notebooks}/tooltip.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/tree}/clusterlist.js (100%) rename IPython/frontend/html/notebook/static/{css/alternateuploadform.css => ipython/tree/less/alternateuploadform.less} (100%) rename IPython/frontend/html/notebook/static/{css/projectdashboard.css => ipython/tree/less/tree.less} (100%) rename IPython/frontend/html/notebook/static/{js => ipython/tree}/notebooklist.js (100%) rename IPython/frontend/html/notebook/static/{js => ipython/tree}/projectdashboardmain.js (100%) diff --git a/IPython/frontend/html/notebook/README.md b/IPython/frontend/html/notebook/README.md index cf2889af4..e52816791 100644 --- a/IPython/frontend/html/notebook/README.md +++ b/IPython/frontend/html/notebook/README.md @@ -1,6 +1,6 @@ # IPython Notebook development -# Development dependencies +## Development dependencies Developers of the IPython Notebook will need to install the following tools: @@ -9,7 +9,7 @@ Developers of the IPython Notebook will need to install the following tools: * less (`npm install -g less`) * bower (`npm install -g bower`) -# Components +## Components We are moving to a model where our JavaScript dependencies are managed using [bower](http://bower.io/). These packages are installed in `static/components` @@ -22,8 +22,52 @@ we maintain our own fork of CodeMirror that is used with bower. This fork should track the upstream CodeMirror exactly; the only difference is that we are adding semantic versioned tags to our repo. -# less +## less If you edit our `.less` files you will need to run the less compiler to build our minified css files. This can be done by running `fab css` from this directory. +## JavaScript Documentation + + +How to Build/ view the doc for JavaScript. JavaScript documentation should follow a +style close to JSDoc one, so you should be able to build them with your favorite +documentation builder. Still the documentation comment are mainly written to be read +with YUI doc. You can either build a static version, or start a YUIdoc server that +will live update the doc at every page request. + + + +To do so, you will need to install YUIdoc. + +### Install NodeJS + +Node is a browser less javascript interpreter. To install it please refer to +the documentation for your platform. Install also NPM (node package manager) if +it does not come bundled with it. + +### Get YUIdoc + +npm does by default install package in `./node_modules` instead of doing a +system wide install. I'll leave you to yuidoc docs if you want to make a system +wide install. + +First, cd into js directory : +```bash +cd IPython/frontend/html/notebook/static/js/ +# install yuidoc +npm install yuidocjs +``` + + +### Run YUIdoc server + +From IPython/frontend/html/notebook/static/js/ +```bash +# run yuidoc for install dir +./node_modules/yuidocjs/lib/cli.js --server . +``` + +Follow the instruction and the documentation should be available on localhost:3000 + +Omitting `--server` will build a static version in the `out` folder by default. \ No newline at end of file diff --git a/IPython/frontend/html/notebook/static/css/login.css b/IPython/frontend/html/notebook/static/ipython/auth/less/login.less similarity index 100% rename from IPython/frontend/html/notebook/static/css/login.css rename to IPython/frontend/html/notebook/static/ipython/auth/less/login.less diff --git a/IPython/frontend/html/notebook/static/css/logout.css b/IPython/frontend/html/notebook/static/ipython/auth/less/logout.less similarity index 100% rename from IPython/frontend/html/notebook/static/css/logout.css rename to IPython/frontend/html/notebook/static/ipython/auth/less/logout.less diff --git a/IPython/frontend/html/notebook/static/js/loginmain.js b/IPython/frontend/html/notebook/static/ipython/auth/loginmain.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/loginmain.js rename to IPython/frontend/html/notebook/static/ipython/auth/loginmain.js diff --git a/IPython/frontend/html/notebook/static/js/loginwidget.js b/IPython/frontend/html/notebook/static/ipython/auth/loginwidget.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/loginwidget.js rename to IPython/frontend/html/notebook/static/ipython/auth/loginwidget.js diff --git a/IPython/frontend/html/notebook/static/js/logoutmain.js b/IPython/frontend/html/notebook/static/ipython/auth/logoutmain.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/logoutmain.js rename to IPython/frontend/html/notebook/static/ipython/auth/logoutmain.js diff --git a/IPython/frontend/html/notebook/static/css/custom.css b/IPython/frontend/html/notebook/static/ipython/base/css/custom.css similarity index 100% rename from IPython/frontend/html/notebook/static/css/custom.css rename to IPython/frontend/html/notebook/static/ipython/base/css/custom.css diff --git a/IPython/frontend/html/notebook/static/js/custom.js b/IPython/frontend/html/notebook/static/ipython/base/custom.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/custom.js rename to IPython/frontend/html/notebook/static/ipython/base/custom.js diff --git a/IPython/frontend/html/notebook/static/js/events.js b/IPython/frontend/html/notebook/static/ipython/base/events.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/events.js rename to IPython/frontend/html/notebook/static/ipython/base/events.js diff --git a/IPython/frontend/html/notebook/static/favicon.ico b/IPython/frontend/html/notebook/static/ipython/base/images/favicon.ico similarity index 100% rename from IPython/frontend/html/notebook/static/favicon.ico rename to IPython/frontend/html/notebook/static/ipython/base/images/favicon.ico diff --git a/IPython/frontend/html/notebook/static/css/page.css b/IPython/frontend/html/notebook/static/ipython/base/less/page.less similarity index 100% rename from IPython/frontend/html/notebook/static/css/page.css rename to IPython/frontend/html/notebook/static/ipython/base/less/page.less diff --git a/IPython/frontend/html/notebook/static/js/namespace.js b/IPython/frontend/html/notebook/static/ipython/base/namespace.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/namespace.js rename to IPython/frontend/html/notebook/static/ipython/base/namespace.js diff --git a/IPython/frontend/html/notebook/static/js/page.js b/IPython/frontend/html/notebook/static/ipython/base/page.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/page.js rename to IPython/frontend/html/notebook/static/ipython/base/page.js diff --git a/IPython/frontend/html/notebook/static/js/pagemain.js b/IPython/frontend/html/notebook/static/ipython/base/pagemain.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/pagemain.js rename to IPython/frontend/html/notebook/static/ipython/base/pagemain.js diff --git a/IPython/frontend/html/notebook/static/js/utils.js b/IPython/frontend/html/notebook/static/ipython/base/utils.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/utils.js rename to IPython/frontend/html/notebook/static/ipython/base/utils.js diff --git a/IPython/frontend/html/notebook/static/js/kernel.js b/IPython/frontend/html/notebook/static/ipython/kernels/kernel.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/kernel.js rename to IPython/frontend/html/notebook/static/ipython/kernels/kernel.js diff --git a/IPython/frontend/html/notebook/static/js/cell.js b/IPython/frontend/html/notebook/static/ipython/notebooks/cell.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/cell.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/cell.js diff --git a/IPython/frontend/html/notebook/static/js/celltoolbar.js b/IPython/frontend/html/notebook/static/ipython/notebooks/celltoolbar.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/celltoolbar.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/celltoolbar.js diff --git a/IPython/frontend/html/notebook/static/js/celltoolbarpresets/default.js b/IPython/frontend/html/notebook/static/ipython/notebooks/celltoolbarpresets/default.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/celltoolbarpresets/default.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/celltoolbarpresets/default.js diff --git a/IPython/frontend/html/notebook/static/js/celltoolbarpresets/example.js b/IPython/frontend/html/notebook/static/ipython/notebooks/celltoolbarpresets/example.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/celltoolbarpresets/example.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/celltoolbarpresets/example.js diff --git a/IPython/frontend/html/notebook/static/js/celltoolbarpresets/slideshow.js b/IPython/frontend/html/notebook/static/ipython/notebooks/celltoolbarpresets/slideshow.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/celltoolbarpresets/slideshow.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/celltoolbarpresets/slideshow.js diff --git a/IPython/frontend/html/notebook/static/js/codecell.js b/IPython/frontend/html/notebook/static/ipython/notebooks/codecell.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/codecell.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/codecell.js diff --git a/IPython/frontend/html/notebook/static/js/codemirror-ipython.js b/IPython/frontend/html/notebook/static/ipython/notebooks/codemirror-ipython.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/codemirror-ipython.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/codemirror-ipython.js diff --git a/IPython/frontend/html/notebook/static/js/completer.js b/IPython/frontend/html/notebook/static/ipython/notebooks/completer.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/completer.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/completer.js diff --git a/IPython/frontend/html/notebook/static/js/contexthint.js b/IPython/frontend/html/notebook/static/ipython/notebooks/contexthint.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/contexthint.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/contexthint.js diff --git a/IPython/frontend/html/notebook/static/css/celltoolbar.css b/IPython/frontend/html/notebook/static/ipython/notebooks/less/celltoolbar.less similarity index 100% rename from IPython/frontend/html/notebook/static/css/celltoolbar.css rename to IPython/frontend/html/notebook/static/ipython/notebooks/less/celltoolbar.less diff --git a/IPython/frontend/html/notebook/static/js/maintoolbar.js b/IPython/frontend/html/notebook/static/ipython/notebooks/maintoolbar.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/maintoolbar.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/maintoolbar.js diff --git a/IPython/frontend/html/notebook/static/js/mathjaxutils.js b/IPython/frontend/html/notebook/static/ipython/notebooks/mathjaxutils.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/mathjaxutils.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/mathjaxutils.js diff --git a/IPython/frontend/html/notebook/static/js/menubar.js b/IPython/frontend/html/notebook/static/ipython/notebooks/menubar.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/menubar.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/menubar.js diff --git a/IPython/frontend/html/notebook/static/js/notebook.js b/IPython/frontend/html/notebook/static/ipython/notebooks/notebook.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/notebook.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/notebook.js diff --git a/IPython/frontend/html/notebook/static/js/notebookmain.js b/IPython/frontend/html/notebook/static/ipython/notebooks/notebookmain.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/notebookmain.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/notebookmain.js diff --git a/IPython/frontend/html/notebook/static/js/notificationarea.js b/IPython/frontend/html/notebook/static/ipython/notebooks/notificationarea.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/notificationarea.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/notificationarea.js diff --git a/IPython/frontend/html/notebook/static/js/notificationwidget.js b/IPython/frontend/html/notebook/static/ipython/notebooks/notificationwidget.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/notificationwidget.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/notificationwidget.js diff --git a/IPython/frontend/html/notebook/static/js/outputarea.js b/IPython/frontend/html/notebook/static/ipython/notebooks/outputarea.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/outputarea.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/outputarea.js diff --git a/IPython/frontend/html/notebook/static/js/pager.js b/IPython/frontend/html/notebook/static/ipython/notebooks/pager.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/pager.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/pager.js diff --git a/IPython/frontend/html/notebook/static/js/quickhelp.js b/IPython/frontend/html/notebook/static/ipython/notebooks/quickhelp.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/quickhelp.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/quickhelp.js diff --git a/IPython/frontend/html/notebook/static/js/savewidget.js b/IPython/frontend/html/notebook/static/ipython/notebooks/savewidget.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/savewidget.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/savewidget.js diff --git a/IPython/frontend/html/notebook/static/js/textcell.js b/IPython/frontend/html/notebook/static/ipython/notebooks/textcell.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/textcell.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/textcell.js diff --git a/IPython/frontend/html/notebook/static/js/toolbar.js b/IPython/frontend/html/notebook/static/ipython/notebooks/toolbar.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/toolbar.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/toolbar.js diff --git a/IPython/frontend/html/notebook/static/js/tooltip.js b/IPython/frontend/html/notebook/static/ipython/notebooks/tooltip.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/tooltip.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/tooltip.js diff --git a/IPython/frontend/html/notebook/static/js/clusterlist.js b/IPython/frontend/html/notebook/static/ipython/tree/clusterlist.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/clusterlist.js rename to IPython/frontend/html/notebook/static/ipython/tree/clusterlist.js diff --git a/IPython/frontend/html/notebook/static/css/alternateuploadform.css b/IPython/frontend/html/notebook/static/ipython/tree/less/alternateuploadform.less similarity index 100% rename from IPython/frontend/html/notebook/static/css/alternateuploadform.css rename to IPython/frontend/html/notebook/static/ipython/tree/less/alternateuploadform.less diff --git a/IPython/frontend/html/notebook/static/css/projectdashboard.css b/IPython/frontend/html/notebook/static/ipython/tree/less/tree.less similarity index 100% rename from IPython/frontend/html/notebook/static/css/projectdashboard.css rename to IPython/frontend/html/notebook/static/ipython/tree/less/tree.less diff --git a/IPython/frontend/html/notebook/static/js/notebooklist.js b/IPython/frontend/html/notebook/static/ipython/tree/notebooklist.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/notebooklist.js rename to IPython/frontend/html/notebook/static/ipython/tree/notebooklist.js diff --git a/IPython/frontend/html/notebook/static/js/projectdashboardmain.js b/IPython/frontend/html/notebook/static/ipython/tree/projectdashboardmain.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/projectdashboardmain.js rename to IPython/frontend/html/notebook/static/ipython/tree/projectdashboardmain.js From 92542f1c1f68b765555eb5e33eb80b44318a8c71 Mon Sep 17 00:00:00 2001 From: "Brian E. Granger" Date: Wed, 15 May 2013 14:33:06 -0700 Subject: [PATCH 02/41] More renaming of less files. --- .../static/{ => ipython/base}/less/flexible-box-model.less | 0 .../notebook/static/{ => ipython/notebooks}/less/highlight.less | 0 .../notebook/static/{ => ipython/notebooks}/less/notebook.less | 0 .../static/{ => ipython/notebooks}/less/renderedhtml.less | 0 .../html/notebook/static/{ => ipython/notebooks}/less/style.less | 0 .../notebook/static/{ => ipython/notebooks}/less/tooltip.less | 0 .../notebook/static/{ => ipython/notebooks}/less/variables.less | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename IPython/frontend/html/notebook/static/{ => ipython/base}/less/flexible-box-model.less (100%) rename IPython/frontend/html/notebook/static/{ => ipython/notebooks}/less/highlight.less (100%) rename IPython/frontend/html/notebook/static/{ => ipython/notebooks}/less/notebook.less (100%) rename IPython/frontend/html/notebook/static/{ => ipython/notebooks}/less/renderedhtml.less (100%) rename IPython/frontend/html/notebook/static/{ => ipython/notebooks}/less/style.less (100%) rename IPython/frontend/html/notebook/static/{ => ipython/notebooks}/less/tooltip.less (100%) rename IPython/frontend/html/notebook/static/{ => ipython/notebooks}/less/variables.less (100%) diff --git a/IPython/frontend/html/notebook/static/less/flexible-box-model.less b/IPython/frontend/html/notebook/static/ipython/base/less/flexible-box-model.less similarity index 100% rename from IPython/frontend/html/notebook/static/less/flexible-box-model.less rename to IPython/frontend/html/notebook/static/ipython/base/less/flexible-box-model.less diff --git a/IPython/frontend/html/notebook/static/less/highlight.less b/IPython/frontend/html/notebook/static/ipython/notebooks/less/highlight.less similarity index 100% rename from IPython/frontend/html/notebook/static/less/highlight.less rename to IPython/frontend/html/notebook/static/ipython/notebooks/less/highlight.less diff --git a/IPython/frontend/html/notebook/static/less/notebook.less b/IPython/frontend/html/notebook/static/ipython/notebooks/less/notebook.less similarity index 100% rename from IPython/frontend/html/notebook/static/less/notebook.less rename to IPython/frontend/html/notebook/static/ipython/notebooks/less/notebook.less diff --git a/IPython/frontend/html/notebook/static/less/renderedhtml.less b/IPython/frontend/html/notebook/static/ipython/notebooks/less/renderedhtml.less similarity index 100% rename from IPython/frontend/html/notebook/static/less/renderedhtml.less rename to IPython/frontend/html/notebook/static/ipython/notebooks/less/renderedhtml.less diff --git a/IPython/frontend/html/notebook/static/less/style.less b/IPython/frontend/html/notebook/static/ipython/notebooks/less/style.less similarity index 100% rename from IPython/frontend/html/notebook/static/less/style.less rename to IPython/frontend/html/notebook/static/ipython/notebooks/less/style.less diff --git a/IPython/frontend/html/notebook/static/less/tooltip.less b/IPython/frontend/html/notebook/static/ipython/notebooks/less/tooltip.less similarity index 100% rename from IPython/frontend/html/notebook/static/less/tooltip.less rename to IPython/frontend/html/notebook/static/ipython/notebooks/less/tooltip.less diff --git a/IPython/frontend/html/notebook/static/less/variables.less b/IPython/frontend/html/notebook/static/ipython/notebooks/less/variables.less similarity index 100% rename from IPython/frontend/html/notebook/static/less/variables.less rename to IPython/frontend/html/notebook/static/ipython/notebooks/less/variables.less From e8d285af3c2a6b99f562957283b78806b4fe53ad Mon Sep 17 00:00:00 2001 From: "Brian E. Granger" Date: Wed, 15 May 2013 15:44:00 -0700 Subject: [PATCH 03/41] Working on cleaning up our less files. --- .../base/less/{flexible-box-model.less => flexbox.less} | 0 .../html/notebook/static/ipython/base/less/variables.less | 5 +++++ .../html/notebook/static/ipython/notebooks/less/style.less | 5 +++-- .../notebook/static/ipython/notebooks/less/variables.less | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) rename IPython/frontend/html/notebook/static/ipython/base/less/{flexible-box-model.less => flexbox.less} (100%) create mode 100644 IPython/frontend/html/notebook/static/ipython/base/less/variables.less diff --git a/IPython/frontend/html/notebook/static/ipython/base/less/flexible-box-model.less b/IPython/frontend/html/notebook/static/ipython/base/less/flexbox.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/less/flexible-box-model.less rename to IPython/frontend/html/notebook/static/ipython/base/less/flexbox.less diff --git a/IPython/frontend/html/notebook/static/ipython/base/less/variables.less b/IPython/frontend/html/notebook/static/ipython/base/less/variables.less new file mode 100644 index 000000000..fe3b15dfc --- /dev/null +++ b/IPython/frontend/html/notebook/static/ipython/base/less/variables.less @@ -0,0 +1,5 @@ +// Our customizations to bootstrap + +@textColor: @black; + +@baseFontSize: 10pt; \ No newline at end of file diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/less/style.less b/IPython/frontend/html/notebook/static/ipython/notebooks/less/style.less index 1b607f1e0..1dd538c27 100644 --- a/IPython/frontend/html/notebook/static/ipython/notebooks/less/style.less +++ b/IPython/frontend/html/notebook/static/ipython/notebooks/less/style.less @@ -1,6 +1,7 @@ -@import "bootstrap-custom.less"; +@import "../../base/less/base.less"; @import "variables.less"; -@import "flexible-box-model.less"; @import "notebook.less"; @import "renderedhtml.less"; @import "tooltip.less"; +@import "celltoolbar.less"; +@import "highlight.less"; diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/less/variables.less b/IPython/frontend/html/notebook/static/ipython/notebooks/less/variables.less index 29692cfb0..72cf639ee 100644 --- a/IPython/frontend/html/notebook/static/ipython/notebooks/less/variables.less +++ b/IPython/frontend/html/notebook/static/ipython/notebooks/less/variables.less @@ -7,6 +7,7 @@ @borderwidth : 1px; @fontBaseColor : black; +@baseFontSize: 30pt; From 32c9cf4aad4873a54f9192f9eabec4824f5af3bc Mon Sep 17 00:00:00 2001 From: "Brian E. Granger" Date: Wed, 15 May 2013 15:45:17 -0700 Subject: [PATCH 04/41] Moving files inside js folder. --- .../frontend/html/notebook/static/ipython/base/{ => js}/custom.js | 0 .../frontend/html/notebook/static/ipython/base/{ => js}/events.js | 0 .../html/notebook/static/ipython/base/{ => js}/namespace.js | 0 .../frontend/html/notebook/static/ipython/base/{ => js}/page.js | 0 .../html/notebook/static/ipython/base/{ => js}/pagemain.js | 0 .../frontend/html/notebook/static/ipython/base/{ => js}/utils.js | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename IPython/frontend/html/notebook/static/ipython/base/{ => js}/custom.js (100%) rename IPython/frontend/html/notebook/static/ipython/base/{ => js}/events.js (100%) rename IPython/frontend/html/notebook/static/ipython/base/{ => js}/namespace.js (100%) rename IPython/frontend/html/notebook/static/ipython/base/{ => js}/page.js (100%) rename IPython/frontend/html/notebook/static/ipython/base/{ => js}/pagemain.js (100%) rename IPython/frontend/html/notebook/static/ipython/base/{ => js}/utils.js (100%) diff --git a/IPython/frontend/html/notebook/static/ipython/base/custom.js b/IPython/frontend/html/notebook/static/ipython/base/js/custom.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/custom.js rename to IPython/frontend/html/notebook/static/ipython/base/js/custom.js diff --git a/IPython/frontend/html/notebook/static/ipython/base/events.js b/IPython/frontend/html/notebook/static/ipython/base/js/events.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/events.js rename to IPython/frontend/html/notebook/static/ipython/base/js/events.js diff --git a/IPython/frontend/html/notebook/static/ipython/base/namespace.js b/IPython/frontend/html/notebook/static/ipython/base/js/namespace.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/namespace.js rename to IPython/frontend/html/notebook/static/ipython/base/js/namespace.js diff --git a/IPython/frontend/html/notebook/static/ipython/base/page.js b/IPython/frontend/html/notebook/static/ipython/base/js/page.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/page.js rename to IPython/frontend/html/notebook/static/ipython/base/js/page.js diff --git a/IPython/frontend/html/notebook/static/ipython/base/pagemain.js b/IPython/frontend/html/notebook/static/ipython/base/js/pagemain.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/pagemain.js rename to IPython/frontend/html/notebook/static/ipython/base/js/pagemain.js diff --git a/IPython/frontend/html/notebook/static/ipython/base/utils.js b/IPython/frontend/html/notebook/static/ipython/base/js/utils.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/utils.js rename to IPython/frontend/html/notebook/static/ipython/base/js/utils.js From 08fba693148b5842f434b946e830d14aa52fd392 Mon Sep 17 00:00:00 2001 From: "Brian E. Granger" Date: Wed, 15 May 2013 15:54:18 -0700 Subject: [PATCH 05/41] Moving js files into subdirs. --- .../html/notebook/static/ipython/auth/{ => js}/loginmain.js | 0 .../html/notebook/static/ipython/auth/{ => js}/loginwidget.js | 0 .../html/notebook/static/ipython/auth/{ => js}/logoutmain.js | 0 .../html/notebook/static/ipython/kernels/{ => js}/kernel.js | 0 .../html/notebook/static/ipython/notebooks/{ => js}/cell.js | 0 .../notebook/static/ipython/notebooks/{ => js}/celltoolbar.js | 0 .../html/notebook/static/ipython/notebooks/{ => js}/codecell.js | 0 .../static/ipython/notebooks/{ => js}/codemirror-ipython.js | 0 .../html/notebook/static/ipython/notebooks/{ => js}/completer.js | 0 .../notebook/static/ipython/notebooks/{ => js}/contexthint.js | 0 .../notebook/static/ipython/notebooks/{ => js}/maintoolbar.js | 0 .../notebook/static/ipython/notebooks/{ => js}/mathjaxutils.js | 0 .../html/notebook/static/ipython/notebooks/{ => js}/menubar.js | 0 .../html/notebook/static/ipython/notebooks/{ => js}/notebook.js | 0 .../notebook/static/ipython/notebooks/{ => js}/notebookmain.js | 0 .../static/ipython/notebooks/{ => js}/notificationarea.js | 0 .../static/ipython/notebooks/{ => js}/notificationwidget.js | 0 .../html/notebook/static/ipython/notebooks/{ => js}/outputarea.js | 0 .../html/notebook/static/ipython/notebooks/{ => js}/pager.js | 0 .../html/notebook/static/ipython/notebooks/{ => js}/quickhelp.js | 0 .../html/notebook/static/ipython/notebooks/{ => js}/savewidget.js | 0 .../html/notebook/static/ipython/notebooks/{ => js}/textcell.js | 0 .../html/notebook/static/ipython/notebooks/{ => js}/toolbar.js | 0 .../html/notebook/static/ipython/notebooks/{ => js}/tooltip.js | 0 .../html/notebook/static/ipython/tree/{ => js}/clusterlist.js | 0 .../html/notebook/static/ipython/tree/{ => js}/notebooklist.js | 0 .../notebook/static/ipython/tree/{ => js}/projectdashboardmain.js | 0 27 files changed, 0 insertions(+), 0 deletions(-) rename IPython/frontend/html/notebook/static/ipython/auth/{ => js}/loginmain.js (100%) rename IPython/frontend/html/notebook/static/ipython/auth/{ => js}/loginwidget.js (100%) rename IPython/frontend/html/notebook/static/ipython/auth/{ => js}/logoutmain.js (100%) rename IPython/frontend/html/notebook/static/ipython/kernels/{ => js}/kernel.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/cell.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/celltoolbar.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/codecell.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/codemirror-ipython.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/completer.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/contexthint.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/maintoolbar.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/mathjaxutils.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/menubar.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/notebook.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/notebookmain.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/notificationarea.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/notificationwidget.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/outputarea.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/pager.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/quickhelp.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/savewidget.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/textcell.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/toolbar.js (100%) rename IPython/frontend/html/notebook/static/ipython/notebooks/{ => js}/tooltip.js (100%) rename IPython/frontend/html/notebook/static/ipython/tree/{ => js}/clusterlist.js (100%) rename IPython/frontend/html/notebook/static/ipython/tree/{ => js}/notebooklist.js (100%) rename IPython/frontend/html/notebook/static/ipython/tree/{ => js}/projectdashboardmain.js (100%) diff --git a/IPython/frontend/html/notebook/static/ipython/auth/loginmain.js b/IPython/frontend/html/notebook/static/ipython/auth/js/loginmain.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/auth/loginmain.js rename to IPython/frontend/html/notebook/static/ipython/auth/js/loginmain.js diff --git a/IPython/frontend/html/notebook/static/ipython/auth/loginwidget.js b/IPython/frontend/html/notebook/static/ipython/auth/js/loginwidget.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/auth/loginwidget.js rename to IPython/frontend/html/notebook/static/ipython/auth/js/loginwidget.js diff --git a/IPython/frontend/html/notebook/static/ipython/auth/logoutmain.js b/IPython/frontend/html/notebook/static/ipython/auth/js/logoutmain.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/auth/logoutmain.js rename to IPython/frontend/html/notebook/static/ipython/auth/js/logoutmain.js diff --git a/IPython/frontend/html/notebook/static/ipython/kernels/kernel.js b/IPython/frontend/html/notebook/static/ipython/kernels/js/kernel.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/kernels/kernel.js rename to IPython/frontend/html/notebook/static/ipython/kernels/js/kernel.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/cell.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/cell.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/cell.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/cell.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/celltoolbar.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/celltoolbar.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/celltoolbar.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/celltoolbar.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/codecell.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/codecell.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/codecell.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/codecell.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/codemirror-ipython.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/codemirror-ipython.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/codemirror-ipython.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/codemirror-ipython.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/completer.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/completer.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/completer.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/completer.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/contexthint.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/contexthint.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/contexthint.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/contexthint.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/maintoolbar.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/maintoolbar.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/maintoolbar.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/maintoolbar.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/mathjaxutils.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/mathjaxutils.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/mathjaxutils.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/mathjaxutils.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/menubar.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/menubar.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/menubar.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/menubar.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/notebook.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/notebook.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/notebook.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/notebook.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/notebookmain.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/notebookmain.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/notebookmain.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/notebookmain.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/notificationarea.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/notificationarea.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/notificationarea.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/notificationarea.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/notificationwidget.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/notificationwidget.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/notificationwidget.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/notificationwidget.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/outputarea.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/outputarea.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/outputarea.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/outputarea.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/pager.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/pager.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/pager.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/pager.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/quickhelp.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/quickhelp.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/quickhelp.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/quickhelp.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/savewidget.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/savewidget.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/savewidget.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/savewidget.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/textcell.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/textcell.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/textcell.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/textcell.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/toolbar.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/toolbar.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/toolbar.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/toolbar.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/tooltip.js b/IPython/frontend/html/notebook/static/ipython/notebooks/js/tooltip.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/tooltip.js rename to IPython/frontend/html/notebook/static/ipython/notebooks/js/tooltip.js diff --git a/IPython/frontend/html/notebook/static/ipython/tree/clusterlist.js b/IPython/frontend/html/notebook/static/ipython/tree/js/clusterlist.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/tree/clusterlist.js rename to IPython/frontend/html/notebook/static/ipython/tree/js/clusterlist.js diff --git a/IPython/frontend/html/notebook/static/ipython/tree/notebooklist.js b/IPython/frontend/html/notebook/static/ipython/tree/js/notebooklist.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/tree/notebooklist.js rename to IPython/frontend/html/notebook/static/ipython/tree/js/notebooklist.js diff --git a/IPython/frontend/html/notebook/static/ipython/tree/projectdashboardmain.js b/IPython/frontend/html/notebook/static/ipython/tree/js/projectdashboardmain.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/tree/projectdashboardmain.js rename to IPython/frontend/html/notebook/static/ipython/tree/js/projectdashboardmain.js From a35b7a7e819631b6398fd12542a0406f59a87d3a Mon Sep 17 00:00:00 2001 From: "Brian E. Granger" Date: Wed, 15 May 2013 16:05:10 -0700 Subject: [PATCH 06/41] More movign around of things in notebook and js/less. --- .../notebook/static/ipython/base/less/mixins.less | 11 +++++++++++ .../notebook/static/ipython/base/less/variables.less | 4 +--- .../static/ipython/notebooks/less/variables.less | 12 ++---------- .../html/notebook/templates/{base.html => page.html} | 0 4 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 IPython/frontend/html/notebook/static/ipython/base/less/mixins.less rename IPython/frontend/html/notebook/templates/{base.html => page.html} (100%) diff --git a/IPython/frontend/html/notebook/static/ipython/base/less/mixins.less b/IPython/frontend/html/notebook/static/ipython/base/less/mixins.less new file mode 100644 index 000000000..203299788 --- /dev/null +++ b/IPython/frontend/html/notebook/static/ipython/base/less/mixins.less @@ -0,0 +1,11 @@ +// Mixin CSS classes + +.border-box-sizing { + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; +} + +.corner-all { + border-radius: @corner_radius; +} \ No newline at end of file diff --git a/IPython/frontend/html/notebook/static/ipython/base/less/variables.less b/IPython/frontend/html/notebook/static/ipython/base/less/variables.less index fe3b15dfc..084d40fd3 100644 --- a/IPython/frontend/html/notebook/static/ipython/base/less/variables.less +++ b/IPython/frontend/html/notebook/static/ipython/base/less/variables.less @@ -1,5 +1,3 @@ -// Our customizations to bootstrap +// Our customizations to bootstrap no here. @textColor: @black; - -@baseFontSize: 10pt; \ No newline at end of file diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/less/variables.less b/IPython/frontend/html/notebook/static/ipython/notebooks/less/variables.less index 72cf639ee..2e45ab9c8 100644 --- a/IPython/frontend/html/notebook/static/ipython/notebooks/less/variables.less +++ b/IPython/frontend/html/notebook/static/ipython/notebooks/less/variables.less @@ -1,3 +1,5 @@ +// Bootstrap customizations specific to this page. + @corner_radius: 4px; @notebook_background : white; @cell_selected_background: darken(@notebook_background, 2%); @@ -6,14 +8,4 @@ @light_border_color: darken(@cell_selected_background, 17%); @borderwidth : 1px; @fontBaseColor : black; - @baseFontSize: 30pt; - - - - -// utilities mixins - -.corner-all { - border-radius:@corner_radius; -} diff --git a/IPython/frontend/html/notebook/templates/base.html b/IPython/frontend/html/notebook/templates/page.html similarity index 100% rename from IPython/frontend/html/notebook/templates/base.html rename to IPython/frontend/html/notebook/templates/page.html From 267be96a2e13b77012b2ba5eab4bfdda775ba635 Mon Sep 17 00:00:00 2001 From: "Brian E. Granger" Date: Wed, 15 May 2013 16:11:29 -0700 Subject: [PATCH 07/41] Changes to templates. --- .../html/notebook/templates/notebooks.html | 16 +++++++++++----- .../frontend/html/notebook/templates/page.html | 18 ++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/IPython/frontend/html/notebook/templates/notebooks.html b/IPython/frontend/html/notebook/templates/notebooks.html index 897074d34..2a4f0f86d 100644 --- a/IPython/frontend/html/notebook/templates/notebooks.html +++ b/IPython/frontend/html/notebook/templates/notebooks.html @@ -13,12 +13,18 @@ window.mathjax_url = "{{mathjax_url}}"; - - {{super()}} {% endblock %} +{% block lesscss %} + {% if use_less %} + + {% else %} + + {% endif %} +{% endblock lesscss%} + {% block params %} data-project={{project}} @@ -196,7 +202,7 @@ class="notebook_app" - + @@ -210,8 +216,8 @@ class="notebook_app" - - + + diff --git a/IPython/frontend/html/notebook/templates/page.html b/IPython/frontend/html/notebook/templates/page.html index 816038eac..58804827c 100644 --- a/IPython/frontend/html/notebook/templates/page.html +++ b/IPython/frontend/html/notebook/templates/page.html @@ -12,18 +12,12 @@ {% block title %}IPython Notebook{% endblock %} - - + {% block stylesheet %} {% block lesscss %} - {% if use_less %} - - {% else %} - - {% endif %} {% endblock lesscss%} {% endblock %} - + {% block meta %} @@ -59,9 +53,9 @@ - - - + + + {% block script %} {% if use_less %} @@ -69,7 +63,7 @@ {% endif %} {% endblock %} - + From 926e60c5ea4acc460f91a103ca798cc55c290469 Mon Sep 17 00:00:00 2001 From: "Brian E. Granger" Date: Wed, 15 May 2013 16:12:28 -0700 Subject: [PATCH 08/41] Moving js/less/css dirs up one level. Too much nesting. --- .../static/{ipython => }/auth/js/loginmain.js | 0 .../static/{ipython => }/auth/js/loginwidget.js | 0 .../static/{ipython => }/auth/js/logoutmain.js | 0 .../static/{ipython => }/auth/less/login.less | 0 .../static/{ipython => }/auth/less/logout.less | 0 .../static/{ipython => }/base/css/custom.css | 0 .../static/{ipython => }/base/images/favicon.ico | Bin .../notebook/static/{ipython => }/base/js/custom.js | 0 .../notebook/static/{ipython => }/base/js/events.js | 0 .../static/{ipython => }/base/js/namespace.js | 0 .../notebook/static/{ipython => }/base/js/page.js | 0 .../static/{ipython => }/base/js/pagemain.js | 0 .../notebook/static/{ipython => }/base/js/utils.js | 0 .../static/{ipython => }/base/less/flexbox.less | 0 .../static/{ipython => }/base/less/mixins.less | 0 .../static/{ipython => }/base/less/page.less | 0 .../static/{ipython => }/base/less/variables.less | 0 .../static/{ipython => }/kernels/js/kernel.js | 0 .../notebooks/celltoolbarpresets/default.js | 0 .../notebooks/celltoolbarpresets/example.js | 0 .../notebooks/celltoolbarpresets/slideshow.js | 0 .../static/{ipython => }/notebooks/js/cell.js | 0 .../{ipython => }/notebooks/js/celltoolbar.js | 0 .../static/{ipython => }/notebooks/js/codecell.js | 0 .../notebooks/js/codemirror-ipython.js | 0 .../static/{ipython => }/notebooks/js/completer.js | 0 .../{ipython => }/notebooks/js/contexthint.js | 0 .../{ipython => }/notebooks/js/maintoolbar.js | 0 .../{ipython => }/notebooks/js/mathjaxutils.js | 0 .../static/{ipython => }/notebooks/js/menubar.js | 0 .../static/{ipython => }/notebooks/js/notebook.js | 0 .../{ipython => }/notebooks/js/notebookmain.js | 0 .../{ipython => }/notebooks/js/notificationarea.js | 0 .../notebooks/js/notificationwidget.js | 0 .../static/{ipython => }/notebooks/js/outputarea.js | 0 .../static/{ipython => }/notebooks/js/pager.js | 0 .../static/{ipython => }/notebooks/js/quickhelp.js | 0 .../static/{ipython => }/notebooks/js/savewidget.js | 0 .../static/{ipython => }/notebooks/js/textcell.js | 0 .../static/{ipython => }/notebooks/js/toolbar.js | 0 .../static/{ipython => }/notebooks/js/tooltip.js | 0 .../{ipython => }/notebooks/less/celltoolbar.less | 0 .../{ipython => }/notebooks/less/highlight.less | 0 .../{ipython => }/notebooks/less/notebook.less | 0 .../{ipython => }/notebooks/less/renderedhtml.less | 0 .../static/{ipython => }/notebooks/less/style.less | 0 .../{ipython => }/notebooks/less/tooltip.less | 0 .../{ipython => }/notebooks/less/variables.less | 0 .../static/{ipython => }/tree/js/clusterlist.js | 0 .../static/{ipython => }/tree/js/notebooklist.js | 0 .../{ipython => }/tree/js/projectdashboardmain.js | 0 .../tree/less/alternateuploadform.less | 0 .../static/{ipython => }/tree/less/tree.less | 0 53 files changed, 0 insertions(+), 0 deletions(-) rename IPython/frontend/html/notebook/static/{ipython => }/auth/js/loginmain.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/auth/js/loginwidget.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/auth/js/logoutmain.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/auth/less/login.less (100%) rename IPython/frontend/html/notebook/static/{ipython => }/auth/less/logout.less (100%) rename IPython/frontend/html/notebook/static/{ipython => }/base/css/custom.css (100%) rename IPython/frontend/html/notebook/static/{ipython => }/base/images/favicon.ico (100%) rename IPython/frontend/html/notebook/static/{ipython => }/base/js/custom.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/base/js/events.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/base/js/namespace.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/base/js/page.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/base/js/pagemain.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/base/js/utils.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/base/less/flexbox.less (100%) rename IPython/frontend/html/notebook/static/{ipython => }/base/less/mixins.less (100%) rename IPython/frontend/html/notebook/static/{ipython => }/base/less/page.less (100%) rename IPython/frontend/html/notebook/static/{ipython => }/base/less/variables.less (100%) rename IPython/frontend/html/notebook/static/{ipython => }/kernels/js/kernel.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/celltoolbarpresets/default.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/celltoolbarpresets/example.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/celltoolbarpresets/slideshow.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/cell.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/celltoolbar.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/codecell.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/codemirror-ipython.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/completer.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/contexthint.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/maintoolbar.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/mathjaxutils.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/menubar.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/notebook.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/notebookmain.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/notificationarea.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/notificationwidget.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/outputarea.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/pager.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/quickhelp.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/savewidget.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/textcell.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/toolbar.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/js/tooltip.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/less/celltoolbar.less (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/less/highlight.less (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/less/notebook.less (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/less/renderedhtml.less (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/less/style.less (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/less/tooltip.less (100%) rename IPython/frontend/html/notebook/static/{ipython => }/notebooks/less/variables.less (100%) rename IPython/frontend/html/notebook/static/{ipython => }/tree/js/clusterlist.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/tree/js/notebooklist.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/tree/js/projectdashboardmain.js (100%) rename IPython/frontend/html/notebook/static/{ipython => }/tree/less/alternateuploadform.less (100%) rename IPython/frontend/html/notebook/static/{ipython => }/tree/less/tree.less (100%) diff --git a/IPython/frontend/html/notebook/static/ipython/auth/js/loginmain.js b/IPython/frontend/html/notebook/static/auth/js/loginmain.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/auth/js/loginmain.js rename to IPython/frontend/html/notebook/static/auth/js/loginmain.js diff --git a/IPython/frontend/html/notebook/static/ipython/auth/js/loginwidget.js b/IPython/frontend/html/notebook/static/auth/js/loginwidget.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/auth/js/loginwidget.js rename to IPython/frontend/html/notebook/static/auth/js/loginwidget.js diff --git a/IPython/frontend/html/notebook/static/ipython/auth/js/logoutmain.js b/IPython/frontend/html/notebook/static/auth/js/logoutmain.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/auth/js/logoutmain.js rename to IPython/frontend/html/notebook/static/auth/js/logoutmain.js diff --git a/IPython/frontend/html/notebook/static/ipython/auth/less/login.less b/IPython/frontend/html/notebook/static/auth/less/login.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/auth/less/login.less rename to IPython/frontend/html/notebook/static/auth/less/login.less diff --git a/IPython/frontend/html/notebook/static/ipython/auth/less/logout.less b/IPython/frontend/html/notebook/static/auth/less/logout.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/auth/less/logout.less rename to IPython/frontend/html/notebook/static/auth/less/logout.less diff --git a/IPython/frontend/html/notebook/static/ipython/base/css/custom.css b/IPython/frontend/html/notebook/static/base/css/custom.css similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/css/custom.css rename to IPython/frontend/html/notebook/static/base/css/custom.css diff --git a/IPython/frontend/html/notebook/static/ipython/base/images/favicon.ico b/IPython/frontend/html/notebook/static/base/images/favicon.ico similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/images/favicon.ico rename to IPython/frontend/html/notebook/static/base/images/favicon.ico diff --git a/IPython/frontend/html/notebook/static/ipython/base/js/custom.js b/IPython/frontend/html/notebook/static/base/js/custom.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/js/custom.js rename to IPython/frontend/html/notebook/static/base/js/custom.js diff --git a/IPython/frontend/html/notebook/static/ipython/base/js/events.js b/IPython/frontend/html/notebook/static/base/js/events.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/js/events.js rename to IPython/frontend/html/notebook/static/base/js/events.js diff --git a/IPython/frontend/html/notebook/static/ipython/base/js/namespace.js b/IPython/frontend/html/notebook/static/base/js/namespace.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/js/namespace.js rename to IPython/frontend/html/notebook/static/base/js/namespace.js diff --git a/IPython/frontend/html/notebook/static/ipython/base/js/page.js b/IPython/frontend/html/notebook/static/base/js/page.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/js/page.js rename to IPython/frontend/html/notebook/static/base/js/page.js diff --git a/IPython/frontend/html/notebook/static/ipython/base/js/pagemain.js b/IPython/frontend/html/notebook/static/base/js/pagemain.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/js/pagemain.js rename to IPython/frontend/html/notebook/static/base/js/pagemain.js diff --git a/IPython/frontend/html/notebook/static/ipython/base/js/utils.js b/IPython/frontend/html/notebook/static/base/js/utils.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/js/utils.js rename to IPython/frontend/html/notebook/static/base/js/utils.js diff --git a/IPython/frontend/html/notebook/static/ipython/base/less/flexbox.less b/IPython/frontend/html/notebook/static/base/less/flexbox.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/less/flexbox.less rename to IPython/frontend/html/notebook/static/base/less/flexbox.less diff --git a/IPython/frontend/html/notebook/static/ipython/base/less/mixins.less b/IPython/frontend/html/notebook/static/base/less/mixins.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/less/mixins.less rename to IPython/frontend/html/notebook/static/base/less/mixins.less diff --git a/IPython/frontend/html/notebook/static/ipython/base/less/page.less b/IPython/frontend/html/notebook/static/base/less/page.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/less/page.less rename to IPython/frontend/html/notebook/static/base/less/page.less diff --git a/IPython/frontend/html/notebook/static/ipython/base/less/variables.less b/IPython/frontend/html/notebook/static/base/less/variables.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/less/variables.less rename to IPython/frontend/html/notebook/static/base/less/variables.less diff --git a/IPython/frontend/html/notebook/static/ipython/kernels/js/kernel.js b/IPython/frontend/html/notebook/static/kernels/js/kernel.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/kernels/js/kernel.js rename to IPython/frontend/html/notebook/static/kernels/js/kernel.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/celltoolbarpresets/default.js b/IPython/frontend/html/notebook/static/notebooks/celltoolbarpresets/default.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/celltoolbarpresets/default.js rename to IPython/frontend/html/notebook/static/notebooks/celltoolbarpresets/default.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/celltoolbarpresets/example.js b/IPython/frontend/html/notebook/static/notebooks/celltoolbarpresets/example.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/celltoolbarpresets/example.js rename to IPython/frontend/html/notebook/static/notebooks/celltoolbarpresets/example.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/celltoolbarpresets/slideshow.js b/IPython/frontend/html/notebook/static/notebooks/celltoolbarpresets/slideshow.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/celltoolbarpresets/slideshow.js rename to IPython/frontend/html/notebook/static/notebooks/celltoolbarpresets/slideshow.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/cell.js b/IPython/frontend/html/notebook/static/notebooks/js/cell.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/cell.js rename to IPython/frontend/html/notebook/static/notebooks/js/cell.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/celltoolbar.js b/IPython/frontend/html/notebook/static/notebooks/js/celltoolbar.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/celltoolbar.js rename to IPython/frontend/html/notebook/static/notebooks/js/celltoolbar.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/codecell.js b/IPython/frontend/html/notebook/static/notebooks/js/codecell.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/codecell.js rename to IPython/frontend/html/notebook/static/notebooks/js/codecell.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/codemirror-ipython.js b/IPython/frontend/html/notebook/static/notebooks/js/codemirror-ipython.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/codemirror-ipython.js rename to IPython/frontend/html/notebook/static/notebooks/js/codemirror-ipython.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/completer.js b/IPython/frontend/html/notebook/static/notebooks/js/completer.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/completer.js rename to IPython/frontend/html/notebook/static/notebooks/js/completer.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/contexthint.js b/IPython/frontend/html/notebook/static/notebooks/js/contexthint.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/contexthint.js rename to IPython/frontend/html/notebook/static/notebooks/js/contexthint.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/maintoolbar.js b/IPython/frontend/html/notebook/static/notebooks/js/maintoolbar.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/maintoolbar.js rename to IPython/frontend/html/notebook/static/notebooks/js/maintoolbar.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/mathjaxutils.js b/IPython/frontend/html/notebook/static/notebooks/js/mathjaxutils.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/mathjaxutils.js rename to IPython/frontend/html/notebook/static/notebooks/js/mathjaxutils.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/menubar.js b/IPython/frontend/html/notebook/static/notebooks/js/menubar.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/menubar.js rename to IPython/frontend/html/notebook/static/notebooks/js/menubar.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/notebook.js b/IPython/frontend/html/notebook/static/notebooks/js/notebook.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/notebook.js rename to IPython/frontend/html/notebook/static/notebooks/js/notebook.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/notebookmain.js b/IPython/frontend/html/notebook/static/notebooks/js/notebookmain.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/notebookmain.js rename to IPython/frontend/html/notebook/static/notebooks/js/notebookmain.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/notificationarea.js b/IPython/frontend/html/notebook/static/notebooks/js/notificationarea.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/notificationarea.js rename to IPython/frontend/html/notebook/static/notebooks/js/notificationarea.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/notificationwidget.js b/IPython/frontend/html/notebook/static/notebooks/js/notificationwidget.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/notificationwidget.js rename to IPython/frontend/html/notebook/static/notebooks/js/notificationwidget.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/outputarea.js b/IPython/frontend/html/notebook/static/notebooks/js/outputarea.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/outputarea.js rename to IPython/frontend/html/notebook/static/notebooks/js/outputarea.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/pager.js b/IPython/frontend/html/notebook/static/notebooks/js/pager.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/pager.js rename to IPython/frontend/html/notebook/static/notebooks/js/pager.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/quickhelp.js b/IPython/frontend/html/notebook/static/notebooks/js/quickhelp.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/quickhelp.js rename to IPython/frontend/html/notebook/static/notebooks/js/quickhelp.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/savewidget.js b/IPython/frontend/html/notebook/static/notebooks/js/savewidget.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/savewidget.js rename to IPython/frontend/html/notebook/static/notebooks/js/savewidget.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/textcell.js b/IPython/frontend/html/notebook/static/notebooks/js/textcell.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/textcell.js rename to IPython/frontend/html/notebook/static/notebooks/js/textcell.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/toolbar.js b/IPython/frontend/html/notebook/static/notebooks/js/toolbar.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/toolbar.js rename to IPython/frontend/html/notebook/static/notebooks/js/toolbar.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/js/tooltip.js b/IPython/frontend/html/notebook/static/notebooks/js/tooltip.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/tooltip.js rename to IPython/frontend/html/notebook/static/notebooks/js/tooltip.js diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/less/celltoolbar.less b/IPython/frontend/html/notebook/static/notebooks/less/celltoolbar.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/less/celltoolbar.less rename to IPython/frontend/html/notebook/static/notebooks/less/celltoolbar.less diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/less/highlight.less b/IPython/frontend/html/notebook/static/notebooks/less/highlight.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/less/highlight.less rename to IPython/frontend/html/notebook/static/notebooks/less/highlight.less diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/less/notebook.less b/IPython/frontend/html/notebook/static/notebooks/less/notebook.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/less/notebook.less rename to IPython/frontend/html/notebook/static/notebooks/less/notebook.less diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/less/renderedhtml.less b/IPython/frontend/html/notebook/static/notebooks/less/renderedhtml.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/less/renderedhtml.less rename to IPython/frontend/html/notebook/static/notebooks/less/renderedhtml.less diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/less/style.less b/IPython/frontend/html/notebook/static/notebooks/less/style.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/less/style.less rename to IPython/frontend/html/notebook/static/notebooks/less/style.less diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/less/tooltip.less b/IPython/frontend/html/notebook/static/notebooks/less/tooltip.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/less/tooltip.less rename to IPython/frontend/html/notebook/static/notebooks/less/tooltip.less diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/less/variables.less b/IPython/frontend/html/notebook/static/notebooks/less/variables.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/less/variables.less rename to IPython/frontend/html/notebook/static/notebooks/less/variables.less diff --git a/IPython/frontend/html/notebook/static/ipython/tree/js/clusterlist.js b/IPython/frontend/html/notebook/static/tree/js/clusterlist.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/tree/js/clusterlist.js rename to IPython/frontend/html/notebook/static/tree/js/clusterlist.js diff --git a/IPython/frontend/html/notebook/static/ipython/tree/js/notebooklist.js b/IPython/frontend/html/notebook/static/tree/js/notebooklist.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/tree/js/notebooklist.js rename to IPython/frontend/html/notebook/static/tree/js/notebooklist.js diff --git a/IPython/frontend/html/notebook/static/ipython/tree/js/projectdashboardmain.js b/IPython/frontend/html/notebook/static/tree/js/projectdashboardmain.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/tree/js/projectdashboardmain.js rename to IPython/frontend/html/notebook/static/tree/js/projectdashboardmain.js diff --git a/IPython/frontend/html/notebook/static/ipython/tree/less/alternateuploadform.less b/IPython/frontend/html/notebook/static/tree/less/alternateuploadform.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/tree/less/alternateuploadform.less rename to IPython/frontend/html/notebook/static/tree/less/alternateuploadform.less diff --git a/IPython/frontend/html/notebook/static/ipython/tree/less/tree.less b/IPython/frontend/html/notebook/static/tree/less/tree.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/tree/less/tree.less rename to IPython/frontend/html/notebook/static/tree/less/tree.less From 6d39d633b6eeefdbd38be6b2db6063cf0d628b0a Mon Sep 17 00:00:00 2001 From: "Brian E. Granger" Date: Wed, 15 May 2013 16:21:39 -0700 Subject: [PATCH 09/41] More work on the less setup. --- .../html/notebook/static/auth/less/style.less | 4 ++ .../{ => js}/celltoolbarpresets/default.js | 0 .../{ => js}/celltoolbarpresets/example.js | 0 .../{ => js}/celltoolbarpresets/slideshow.js | 0 .../html/notebook/templates/login.html | 16 +++-- .../html/notebook/templates/logout.html | 15 +++-- .../html/notebook/templates/notebooks.html | 64 +++++++++---------- .../html/notebook/templates/page.html | 10 +-- .../html/notebook/templates/tree.html | 22 ++++--- 9 files changed, 71 insertions(+), 60 deletions(-) create mode 100644 IPython/frontend/html/notebook/static/auth/less/style.less rename IPython/frontend/html/notebook/static/notebooks/{ => js}/celltoolbarpresets/default.js (100%) rename IPython/frontend/html/notebook/static/notebooks/{ => js}/celltoolbarpresets/example.js (100%) rename IPython/frontend/html/notebook/static/notebooks/{ => js}/celltoolbarpresets/slideshow.js (100%) diff --git a/IPython/frontend/html/notebook/static/auth/less/style.less b/IPython/frontend/html/notebook/static/auth/less/style.less new file mode 100644 index 000000000..464f817a5 --- /dev/null +++ b/IPython/frontend/html/notebook/static/auth/less/style.less @@ -0,0 +1,4 @@ +@import "../../base/less/base.less"; +@import "variables.less"; +@import "login.less"; +@import "logout.less"; diff --git a/IPython/frontend/html/notebook/static/notebooks/celltoolbarpresets/default.js b/IPython/frontend/html/notebook/static/notebooks/js/celltoolbarpresets/default.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebooks/celltoolbarpresets/default.js rename to IPython/frontend/html/notebook/static/notebooks/js/celltoolbarpresets/default.js diff --git a/IPython/frontend/html/notebook/static/notebooks/celltoolbarpresets/example.js b/IPython/frontend/html/notebook/static/notebooks/js/celltoolbarpresets/example.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebooks/celltoolbarpresets/example.js rename to IPython/frontend/html/notebook/static/notebooks/js/celltoolbarpresets/example.js diff --git a/IPython/frontend/html/notebook/static/notebooks/celltoolbarpresets/slideshow.js b/IPython/frontend/html/notebook/static/notebooks/js/celltoolbarpresets/slideshow.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebooks/celltoolbarpresets/slideshow.js rename to IPython/frontend/html/notebook/static/notebooks/js/celltoolbarpresets/slideshow.js diff --git a/IPython/frontend/html/notebook/templates/login.html b/IPython/frontend/html/notebook/templates/login.html index c5afd27e3..c2a5fd581 100644 --- a/IPython/frontend/html/notebook/templates/login.html +++ b/IPython/frontend/html/notebook/templates/login.html @@ -1,10 +1,12 @@ -{% extends "base.html" %} +{% extends "page.html" %} -{% block stylesheet %} - - - -{% endblock %} +{% block lesscss %} + {% if use_less %} + + {% else %} + + {% endif %} +{% endblock lesscss%} {% block login_widget %} @@ -37,6 +39,6 @@ {% block script %} - + {% endblock %} diff --git a/IPython/frontend/html/notebook/templates/logout.html b/IPython/frontend/html/notebook/templates/logout.html index 3a4920d83..78ade2d59 100644 --- a/IPython/frontend/html/notebook/templates/logout.html +++ b/IPython/frontend/html/notebook/templates/logout.html @@ -1,10 +1,13 @@ -{% extends "base.html" %} +{% extends "page.html" %} -{% block stylesheet %} - - +{% block lesscss %} + {% if use_less %} + + {% else %} + + {% endif %} +{% endblock lesscss%} -{% endblock %} {% block login_widget %} @@ -35,6 +38,6 @@ {% block script %} - + {% endblock %} diff --git a/IPython/frontend/html/notebook/templates/notebooks.html b/IPython/frontend/html/notebook/templates/notebooks.html index 2a4f0f86d..db2e4c7be 100644 --- a/IPython/frontend/html/notebook/templates/notebooks.html +++ b/IPython/frontend/html/notebook/templates/notebooks.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "page.html" %} {% block stylesheet %} @@ -19,9 +19,9 @@ window.mathjax_url = "{{mathjax_url}}"; {% block lesscss %} {% if use_less %} - + {% else %} - + {% endif %} {% endblock lesscss%} @@ -202,7 +202,7 @@ class="notebook_app" - + @@ -216,33 +216,33 @@ class="notebook_app" - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% endblock %} diff --git a/IPython/frontend/html/notebook/templates/page.html b/IPython/frontend/html/notebook/templates/page.html index 58804827c..6afc8c195 100644 --- a/IPython/frontend/html/notebook/templates/page.html +++ b/IPython/frontend/html/notebook/templates/page.html @@ -12,7 +12,7 @@ {% block title %}IPython Notebook{% endblock %} - + {% block stylesheet %} {% block lesscss %} {% endblock lesscss%} @@ -28,7 +28,7 @@