From 6d39d633b6eeefdbd38be6b2db6063cf0d628b0a Mon Sep 17 00:00:00 2001
From: "Brian E. Granger" <ellisonbg@gmail.com>
Date: Wed, 15 May 2013 16:21:39 -0700
Subject: [PATCH] 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 %}
-
-<link rel="stylesheet" href="{{static_url("css/login.css") }}" type="text/css"/>
-
-{% endblock %}
+{% block lesscss %}
+    {% if use_less %}
+        <link rel="stylesheet/less" href="{{ static_url("auth/less/style.less") }}" type="text/css" />
+    {% else %}
+        <link rel="stylesheet" href="{{ static_url("auth/css/style.min.css") }}" type="text/css"/>
+    {% endif %}
+{% endblock lesscss%}
 
 
 {% block login_widget %}
@@ -37,6 +39,6 @@
 
 {% block script %}
 
-<script src="{{static_url("js/loginmain.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{static_url("auth/js/loginmain.js") }}" type="text/javascript" charset="utf-8"></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 %}
-
-<link rel="stylesheet" href="{{static_url("css/logout.css") }}" type="text/css"/>
+{% block lesscss %}
+    {% if use_less %}
+        <link rel="stylesheet/less" href="{{ static_url("auth/less/style.less") }}" type="text/css" />
+    {% else %}
+        <link rel="stylesheet" href="{{ static_url("auth/css/style.min.css") }}" type="text/css"/>
+    {% endif %}
+{% endblock lesscss%}
 
-{% endblock %}
 
 
 {% block login_widget %}
@@ -35,6 +38,6 @@
 
 {% block script %}
 
-<script src="{{static_url("js/logoutmain.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{static_url("auth/js/logoutmain.js") }}" type="text/javascript" charset="utf-8"></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 %}
-        <link rel="stylesheet/less" href="{{ static_url("ipython/notebooks/less/style.less") }}" type="text/css" />
+        <link rel="stylesheet/less" href="{{ static_url("notebooks/less/style.less") }}" type="text/css" />
     {% else %}
-        <link rel="stylesheet" href="{{ static_url("ipython/notebooks/css/style.min.css") }}" type="text/css"/>
+        <link rel="stylesheet" href="{{ static_url("notebooks/css/style.min.css") }}" type="text/css"/>
     {% endif %}
 {% endblock lesscss%}
 
@@ -202,7 +202,7 @@ class="notebook_app"
 <script src="{{ static_url("components/codemirror/addon/mode/loadmode.js") }}" charset="utf-8"></script>
 <script src="{{ static_url("components/codemirror/addon/mode/multiplex.js") }}" charset="utf-8"></script>
 <script src="{{ static_url("components/codemirror/addon/mode/overlay.js") }}" charset="utf-8"></script>
-<script src="{{ static_url("ipython/notebooks/js/codemirror-ipython.js") }}" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/codemirror-ipython.js") }}" charset="utf-8"></script>
 <script src="{{ static_url("components/codemirror/mode/htmlmixed/htmlmixed.js") }}" charset="utf-8"></script>
 <script src="{{ static_url("components/codemirror/mode/xml/xml.js") }}" charset="utf-8"></script>
 <script src="{{ static_url("components/codemirror/mode/javascript/javascript.js") }}" charset="utf-8"></script>
@@ -216,33 +216,33 @@ class="notebook_app"
 
 <script src="{{ static_url("dateformat/date.format.js") }}" charset="utf-8"></script>
 
-<script src="{{ static_url("ipython/base/js/events.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("ipython/base/js/utils.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/layoutmanager.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/mathjaxutils.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/outputarea.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/cell.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/celltoolbar.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/codecell.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/completer.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/textcell.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/kernel.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/savewidget.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/quickhelp.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/pager.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/menubar.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/toolbar.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/maintoolbar.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/notebook.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/notificationwidget.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/notificationarea.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/tooltip.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/config.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/notebookmain.js") }}" type="text/javascript" charset="utf-8"></script>
-
-<script src="{{ static_url("js/contexthint.js") }}" charset="utf-8"></script>
-
-<script src="{{ static_url("js/celltoolbarpresets/default.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ static_url("js/celltoolbarpresets/slideshow.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("base/js/events.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("base/js/utils.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/layoutmanager.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/mathjaxutils.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/outputarea.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/cell.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/celltoolbar.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/codecell.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/completer.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/textcell.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("kernels/js/kernel.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/savewidget.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/quickhelp.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/pager.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/menubar.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/toolbar.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/maintoolbar.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/notebook.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/notificationwidget.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/notificationarea.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/tooltip.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/config.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/notebookmain.js") }}" type="text/javascript" charset="utf-8"></script>
+
+<script src="{{ static_url("notebooks/js/contexthint.js") }}" charset="utf-8"></script>
+
+<script src="{{ static_url("notebooks/js/celltoolbarpresets/default.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebooks/js/celltoolbarpresets/slideshow.js") }}" type="text/javascript" charset="utf-8"></script>
 
 {% 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 @@
     <title>{% block title %}IPython Notebook{% endblock %}</title>
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <link rel="stylesheet" href="{{static_url("jquery/css/themes/base/jquery-ui.min.css") }}" type="text/css" />
-    <link rel="stylesheet" href="{{static_url("ipython/base/css/boilerplate.css") }}" type="text/css" />
+    <link rel="stylesheet" href="{{static_url("base/css/boilerplate.css") }}" type="text/css" />
     {% block stylesheet %}
     {% block lesscss %}
     {% endblock lesscss%}
@@ -28,7 +28,7 @@
 <body {% block params %}{% endblock %}>
 
 <div id="header">
-    <span id="ipython_notebook"><div><a href="{{base_project_url}}" alt='dashboard'><img src='{{static_url("ipynblogo.png") }}' alt='IPython Notebook'/></a></div></span>
+    <span id="ipython_notebook"><div><a href="{{base_project_url}}" alt='dashboard'><img src='{{static_url("base/images/ipynblogo.png") }}' alt='IPython Notebook'/></a></div></span>
 
     {% block login_widget %}
 
@@ -53,9 +53,9 @@
 
 <script src="{{static_url("jquery/js/jquery-1.7.1.min.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{static_url("jquery/js/jquery-ui.min.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{static_url("ipython/base/js/namespace.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{static_url("ipython/base/js/page.js") }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{static_url("ipython/auth/js/loginwidget.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{static_url("base/js/namespace.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{static_url("base/js/page.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{static_url("auth/js/loginwidget.js") }}" type="text/javascript" charset="utf-8"></script>
 
 {% block script %}
     {% if use_less %}
diff --git a/IPython/frontend/html/notebook/templates/tree.html b/IPython/frontend/html/notebook/templates/tree.html
index 1e80416d4..08a93557d 100644
--- a/IPython/frontend/html/notebook/templates/tree.html
+++ b/IPython/frontend/html/notebook/templates/tree.html
@@ -1,13 +1,15 @@
-{% extends "base.html" %}
+{% extends "page.html" %}
 
 {% block title %}IPython Dashboard{% endblock %}
 
-{% block stylesheet %}
-    {{super()}}
-    <link rel="stylesheet" href="{{static_url("css/alternateuploadform.css") }}" type="text/css" />
-    <link rel="stylesheet" href="{{static_url("css/style.min.css") }}" type="text/css" />
-    <link rel="stylesheet" href="{{static_url("css/projectdashboard.css") }}" type="text/css" />
-{% endblock %}
+{% block lesscss %}
+    {% if use_less %}
+        <link rel="stylesheet/less" href="{{ static_url("tree/less/style.less") }}" type="text/css" />
+    {% else %}
+        <link rel="stylesheet" href="{{ static_url("tree/css/style.min.css") }}" type="text/css"/>
+    {% endif %}
+{% endblock lesscss%}
+
 
 
 {% block params %}
@@ -84,7 +86,7 @@ data-read-only={{read_only}}
 
 {% block script %}
     {{super()}}
-    <script src="{{static_url("js/notebooklist.js") }}" type="text/javascript" charset="utf-8"></script>
-    <script src="{{static_url("js/clusterlist.js") }}" type="text/javascript" charset="utf-8"></script>
-    <script src="{{static_url("js/projectdashboardmain.js") }}" type="text/javascript" charset="utf-8"></script>
+    <script src="{{static_url("tree/js/notebooklist.js") }}" type="text/javascript" charset="utf-8"></script>
+    <script src="{{static_url("tree/js/clusterlist.js") }}" type="text/javascript" charset="utf-8"></script>
+    <script src="{{static_url("tree/js/projectdashboardmain.js") }}" type="text/javascript" charset="utf-8"></script>
 {% endblock %}