From 75f3f63bf5b4b19365e6e5cbc832b69098191310 2013-05-15 20:01:29
From: Brian E. Granger <ellisonbg@gmail.com>
Date: 2013-05-15 20:01:29
Subject: [PATCH] Renaming templates to match other names.

---

diff --git a/IPython/frontend/html/notebook/notebooks/handlers.py b/IPython/frontend/html/notebook/notebooks/handlers.py
index 4f8d360..9e931b4 100644
--- a/IPython/frontend/html/notebook/notebooks/handlers.py
+++ b/IPython/frontend/html/notebook/notebooks/handlers.py
@@ -43,7 +43,7 @@ class NamedNotebookHandler(IPythonHandler):
         nbm = self.notebook_manager
         if not nbm.notebook_exists(notebook_id):
             raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)       
-        self.write(self.render_template('notebook.html',
+        self.write(self.render_template('notebooks.html',
             project=self.project,
             notebook_id=notebook_id,
             kill_kernel=False,
diff --git a/IPython/frontend/html/notebook/templates/page.html b/IPython/frontend/html/notebook/templates/base.html
similarity index 100%
rename from IPython/frontend/html/notebook/templates/page.html
rename to IPython/frontend/html/notebook/templates/base.html
diff --git a/IPython/frontend/html/notebook/templates/login.html b/IPython/frontend/html/notebook/templates/login.html
index 3722140..c5afd27 100644
--- a/IPython/frontend/html/notebook/templates/login.html
+++ b/IPython/frontend/html/notebook/templates/login.html
@@ -1,4 +1,4 @@
-{% extends "page.html" %}
+{% extends "base.html" %}
 
 {% block stylesheet %}
 
diff --git a/IPython/frontend/html/notebook/templates/logout.html b/IPython/frontend/html/notebook/templates/logout.html
index e18730e..3a4920d 100644
--- a/IPython/frontend/html/notebook/templates/logout.html
+++ b/IPython/frontend/html/notebook/templates/logout.html
@@ -1,4 +1,4 @@
-{% extends "page.html" %}
+{% extends "base.html" %}
 
 {% block stylesheet %}
 
diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebooks.html
similarity index 99%
rename from IPython/frontend/html/notebook/templates/notebook.html
rename to IPython/frontend/html/notebook/templates/notebooks.html
index 5f96268..897074d 100644
--- a/IPython/frontend/html/notebook/templates/notebook.html
+++ b/IPython/frontend/html/notebook/templates/notebooks.html
@@ -1,4 +1,4 @@
-{% extends "page.html" %}
+{% extends "base.html" %}
 
 {% block stylesheet %}
 
diff --git a/IPython/frontend/html/notebook/templates/projectdashboard.html b/IPython/frontend/html/notebook/templates/tree.html
similarity index 98%
rename from IPython/frontend/html/notebook/templates/projectdashboard.html
rename to IPython/frontend/html/notebook/templates/tree.html
index 3332a54..1e80416 100644
--- a/IPython/frontend/html/notebook/templates/projectdashboard.html
+++ b/IPython/frontend/html/notebook/templates/tree.html
@@ -1,4 +1,4 @@
-{% extends "page.html" %}
+{% extends "base.html" %}
 
 {% block title %}IPython Dashboard{% endblock %}
 
diff --git a/IPython/frontend/html/notebook/tree/handlers.py b/IPython/frontend/html/notebook/tree/handlers.py
index a7b43e6..26e471e 100644
--- a/IPython/frontend/html/notebook/tree/handlers.py
+++ b/IPython/frontend/html/notebook/tree/handlers.py
@@ -27,7 +27,7 @@ class ProjectDashboardHandler(IPythonHandler):
 
     @authenticate_unless_readonly
     def get(self):
-        self.write(self.render_template('projectdashboard.html',
+        self.write(self.render_template('tree.html',
             project=self.project,
             project_component=self.project.split('/'),
         ))