From 2e4d40382e0286ee586b65d2f3753a69f7d372b3 2013-05-21 22:35:20
From: Brian E. Granger <ellisonbg@gmail.com>
Date: 2013-05-21 22:35:20
Subject: [PATCH] Putting custom.css/custom.js in static/user.

---

diff --git a/IPython/frontend/html/notebook/static/base/css/custom.css b/IPython/frontend/html/notebook/static/user/css/custom.css
similarity index 80%
rename from IPython/frontend/html/notebook/static/base/css/custom.css
rename to IPython/frontend/html/notebook/static/user/css/custom.css
index e3f18e6..cd97f6e 100644
--- a/IPython/frontend/html/notebook/static/base/css/custom.css
+++ b/IPython/frontend/html/notebook/static/user/css/custom.css
@@ -1,7 +1,7 @@
 /*
 Placeholder for custom user CSS
 
-mainly to be overridden in profile/static/css/custom.css
+mainly to be overridden in profile/static/user/custom.css
 
 This will always be an empty file in IPython
 */
\ No newline at end of file
diff --git a/IPython/frontend/html/notebook/static/base/js/custom.js b/IPython/frontend/html/notebook/static/user/js/custom.js
similarity index 88%
rename from IPython/frontend/html/notebook/static/base/js/custom.js
rename to IPython/frontend/html/notebook/static/user/js/custom.js
index 8375f39..75d87fd 100644
--- a/IPython/frontend/html/notebook/static/base/js/custom.js
+++ b/IPython/frontend/html/notebook/static/user/js/custom.js
@@ -3,14 +3,14 @@
  *
  *
  * Placeholder for custom user javascript
- * mainly to be overridden in profile/static/js/custom.js
+ * mainly to be overridden in profile/static/user/js/custom.js
  * This will always be an empty file in IPython
  *
- * User could add any javascript in the `profile/static/js/custom.js` file
+ * User could add any javascript in the `profile/static/user/js/custom.js` file
  * (and should create it if it does not exist).
  * It will be executed by the ipython notebook at load time.
  *
- * Same thing with `profile/static/css/custom.css` to inject custom css into the notebook.
+ * Same thing with `profile/static/user/css/custom.css` to inject custom css into the notebook.
  *
  * Example :
  *
@@ -34,10 +34,10 @@
  *  to load custom script into the notebook.
  *
  *    // to load the metadata ui extension example.
- *    $.getScript('/static/js/celltoolbarpresets/example.js');
+ *    $.getScript('/static/notebooks/js/celltoolbarpresets/example.js');
  *    // or
  *    // to load the metadata ui extension to control slideshow mode / reveal js for nbconvert
- *    $.getScript('/static/js/celltoolbarpresets/slideshow.js');
+ *    $.getScript('/static/notebooks/js/celltoolbarpresets/slideshow.js');
  *
  *
  * @module IPython
diff --git a/IPython/frontend/html/notebook/templates/page.html b/IPython/frontend/html/notebook/templates/page.html
index 2d9637a..4dd13e1 100644
--- a/IPython/frontend/html/notebook/templates/page.html
+++ b/IPython/frontend/html/notebook/templates/page.html
@@ -18,7 +18,7 @@
     {% block lesscss %}
     {% endblock lesscss%}
     {% endblock %}
-    <!-- <link rel="stylesheet" href="{{ static_url("css/custom.css") }}" type="text/css" /> -->
+    <link rel="stylesheet" href="{{ static_url("user/css/custom.css") }}" type="text/css" />
 
 
     {% block meta %}
@@ -64,7 +64,7 @@
     {% endif %}
 {% endblock %}
 
-<!-- <script src="{{static_url("js/custom.js") }}" type="text/javascript" charset="utf-8"></script> -->
+<script src="{{static_url("user/js/custom.js") }}" type="text/javascript" charset="utf-8"></script>
 
 </body>