From b31ccdc235e6a51dba8d1ec4947c416fb54aba2f 2013-05-21 22:35:19 From: Brian E. Granger Date: 2013-05-21 22:35:19 Subject: [PATCH] Moving js/less/css dirs up one level. Too much nesting. --- 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/boilerplate.css b/IPython/frontend/html/notebook/static/base/css/boilerplate.css similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/css/boilerplate.css rename to IPython/frontend/html/notebook/static/base/css/boilerplate.css 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 Binary files a/IPython/frontend/html/notebook/static/ipython/base/images/favicon.ico and b/IPython/frontend/html/notebook/static/base/images/favicon.ico differ diff --git a/IPython/frontend/html/notebook/static/ipython/base/images/ipynblogo.png b/IPython/frontend/html/notebook/static/base/images/ipynblogo.png similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/images/ipynblogo.png rename to IPython/frontend/html/notebook/static/base/images/ipynblogo.png Binary files a/IPython/frontend/html/notebook/static/ipython/base/images/ipynblogo.png and b/IPython/frontend/html/notebook/static/base/images/ipynblogo.png differ diff --git a/IPython/frontend/html/notebook/static/ipython/base/images/ipynblogo.svg b/IPython/frontend/html/notebook/static/base/images/ipynblogo.svg similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/images/ipynblogo.svg rename to IPython/frontend/html/notebook/static/base/images/ipynblogo.svg 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/base.less b/IPython/frontend/html/notebook/static/base/less/base.less similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/base/less/base.less rename to IPython/frontend/html/notebook/static/base/less/base.less 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/config.js b/IPython/frontend/html/notebook/static/notebooks/js/config.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/config.js rename to IPython/frontend/html/notebook/static/notebooks/js/config.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/layoutmanager.js b/IPython/frontend/html/notebook/static/notebooks/js/layoutmanager.js similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/js/layoutmanager.js rename to IPython/frontend/html/notebook/static/notebooks/js/layoutmanager.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.css b/IPython/frontend/html/notebook/static/notebooks/less/style.css similarity index 100% rename from IPython/frontend/html/notebook/static/ipython/notebooks/less/style.css rename to IPython/frontend/html/notebook/static/notebooks/less/style.css 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