Extension docs: Include sidenav in 404 pages

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

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import os
 
 from branch_utility import BranchUtility
 import compiled_file_system as compiled_fs
 from docs_server_utils import FormatKey
@@ skipping 33 matching lines @@
                  channel_name,
                  api_data_source_factory,
                  api_list_data_source_factory,
                  intro_data_source_factory,
                  samples_data_source_factory,
                  sidenav_data_source_factory,
                  compiled_fs_factory,
                  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
       self._intro_data_source_factory = intro_data_source_factory
       self._samples_data_source_factory = samples_data_source_factory
       self._sidenav_data_source_factory = sidenav_data_source_factory
       self._cache = compiled_fs_factory.Create(self._CreateTemplate,
                                                TemplateDataSource)
       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))
 
     def Create(self, request, path):
       """Returns a new TemplateDataSource bound to |request|.
       """
       return TemplateDataSource(
           self._branch_info,
           self._api_data_source_factory.Create(request),
           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,
           self._static_resources)
 
   def __init__(self,
                branch_info,
                api_data_source,
                api_list_data_source,
                intro_data_source,
@@ skipping 12 matching lines @@
     self._cache = cache
     self._public_template_path = public_template_path
     self._private_template_path = private_template_path
     self._static_resources = static_resources
 
   def Render(self, template_name):
     """This method will render a template named |template_name|, fetching all
     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
       # TODO error handling
     render_data = template.render({
       'api_list': self._api_list_data_source,
       'apis': self._api_data_source,
       'branchInfo': self._branch_info,
       'intros': self._intro_data_source,
       'sidenavs': self._sidenav_data_source,
@@ skipping 21 matching lines @@
 
   def get(self, key):
     return self.GetTemplate(self._private_template_path, key)
 
   def GetTemplate(self, base_path, template_name):
     try:
       return self._cache.GetFromFile(
           '/'.join((base_path, FormatKey(template_name))))
     except FileNotFoundError as e:
       return None