Extension docs: Include sidenav in 404 pages

chrome/common/extensions/docs/server2/template_data_source.py

Index: chrome/common/extensions/docs/server2/template_data_source.py
===================================================================
--- chrome/common/extensions/docs/server2/template_data_source.py	(revision 202781)
+++ chrome/common/extensions/docs/server2/template_data_source.py	(working copy)
@@ -51,7 +51,7 @@
                  ref_resolver_factory,
                  public_template_path,
                  private_template_path,
-                 static_path):
+                 base_path):
       self._branch_info = _MakeChannelDict(channel_name)
       self._api_data_source_factory = api_data_source_factory
       self._api_list_data_source_factory = api_list_data_source_factory
@@ -63,7 +63,7 @@
       self._ref_resolver = ref_resolver_factory.Create()
       self._public_template_path = public_template_path
       self._private_template_path = private_template_path
-      self._static_resources = static_path
+      self._static_resources = '%s/static' % base_path
 
     def _CreateTemplate(self, template_name, text):
       return Handlebar(self._ref_resolver.ResolveAllLinks(text))
@@ -77,7 +77,7 @@
           self._api_list_data_source_factory.Create(),
           self._intro_data_source_factory.Create(),
           self._samples_data_source_factory.Create(request),
-          self._sidenav_data_source_factory.Create(path),
+          self._sidenav_data_source_factory.Create(),
           self._cache,
           self._public_template_path,
           self._private_template_path,
@@ -110,6 +110,7 @@
     the partial templates needed from |self._cache|. Partials are retrieved
     from the TemplateDataSource with the |get| method.
     """
+    self._sidenav_data_source.SetPath(template_name)

[not at google - send to devlin, 2013/05/29 17:59:09]

I don't understand. the name of the template being renderered is not the same as
the path, it just happens to be in most circumstances.

Your comment about the page not existing is key, though. I commented in the
sidenav data source there. I think the relative-pathness was a red herring and
they should have always been absolute paths - I am really sorry for not catching
that. SidenavDataSource will still need to add the channel name though, and
warns if there's a relative path (and converts it into an absolute path -
redirect logic should fix it, when I submit that patch).

     template = self.GetTemplate(self._public_template_path, template_name)
     if not template:
       return None