From 37aa8ffad09a9476148c82cd78c5d3a8aa787ccc 2013-10-17 21:07:50
From: Zachary Sailer <zachsailer@gmail.com>
Date: 2013-10-17 21:07:50
Subject: [PATCH] manual rebase html notebook templates

---

diff --git a/IPython/html/templates/notebook.html b/IPython/html/templates/notebook.html
index 0ee4706..9a3adce 100644
--- a/IPython/html/templates/notebook.html
+++ b/IPython/html/templates/notebook.html
@@ -24,7 +24,8 @@ window.mathjax_url = "{{mathjax_url}}";
 data-project={{project}}
 data-base-project-url={{base_project_url}}
 data-base-kernel-url={{base_kernel_url}}
-data-notebook-id={{notebook_id}}
+data-notebook-name={{notebook_name}}
+data-notebook-path={{notebook_path}}
 class="notebook_app"
 
 {% endblock %}
@@ -85,11 +86,11 @@ class="notebook_app"
             <ul class="dropdown-menu">
                 <li id="cut_cell"><a href="#">Cut Cell</a></li>
                 <li id="copy_cell"><a href="#">Copy Cell</a></li>
-                <li id="paste_cell_above" class="disabled"><a href="#">Paste Cell Above</a></li>
-                <li id="paste_cell_below" class="disabled"><a href="#">Paste Cell Below</a></li>
-                <li id="paste_cell_replace" class="disabled"><a href="#">Paste Cell &amp; Replace</a></li>
+                <li id="paste_cell_above" class="ui-state-disabled"><a href="#">Paste Cell Above</a></li>
+                <li id="paste_cell_below" class="ui-state-disabled"><a href="#">Paste Cell Below</a></li>
+                <li id="paste_cell_replace" class="ui-state-disabled"><a href="#">Paste Cell &amp; Replace</a></li>
                 <li id="delete_cell"><a href="#">Delete Cell</a></li>
-                <li id="undelete_cell" class="disabled"><a href="#">Undo Delete Cell</a></li>
+                <li id="undelete_cell" class="ui-state-disabled"><a href="#">Undo Delete Cell</a></li>
                 <li class="divider"></li>
                 <li id="split_cell"><a href="#">Split Cell</a></li>
                 <li id="merge_cell_above"><a href="#">Merge Cell Above</a></li>
@@ -240,6 +241,7 @@ class="notebook_app"
 <script src="{{ static_url("notebook/js/completer.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{ static_url("notebook/js/textcell.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{ static_url("services/kernels/js/kernel.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("services/sessions/js/session.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{ static_url("notebook/js/savewidget.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{ static_url("notebook/js/quickhelp.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{ static_url("notebook/js/pager.js") }}" type="text/javascript" charset="utf-8"></script>
diff --git a/IPython/html/templates/tree.html b/IPython/html/templates/tree.html
index 27b75e8..a794933 100644
--- a/IPython/html/templates/tree.html
+++ b/IPython/html/templates/tree.html
@@ -12,6 +12,8 @@
 
 data-project={{project}}
 data-base-project-url={{base_project_url}}
+data-notebook-path={{notebook_path}}
+data-notebook-name={{notebook_name}}
 data-base-kernel-url={{base_kernel_url}}
 
 {% endblock %}