diff options
7 files changed, 19 insertions, 23 deletions
diff --git a/chrome/common/extensions/docs/server2/branch_utility.py b/chrome/common/extensions/docs/server2/branch_utility.py index 166c1a9..b1470c2 100644 --- a/chrome/common/extensions/docs/server2/branch_utility.py +++ b/chrome/common/extensions/docs/server2/branch_utility.py @@ -15,22 +15,15 @@ class BranchUtility(object): self._memcache = memcache def SplitChannelNameFromPath(self, path): - prefix = '' - if path.startswith('extensions/'): - prefix = 'extensions/' - path = path[len('extensions/'):] - elif path.startswith('apps/'): - prefix = 'apps/' - path = path[len('apps/'):] try: first, second = path.split('/', 1) except ValueError: first = path second = '' if first in ['trunk', 'dev', 'beta', 'stable']: - return (first, prefix + second) + return (first, second) else: - return (self._default_branch, prefix + path) + return (self._default_branch, path) def GetBranchNumberForChannelName(self, channel_name): """Returns an empty string if the branch number cannot be found. diff --git a/chrome/common/extensions/docs/server2/handler.py b/chrome/common/extensions/docs/server2/handler.py index 019d855..4f4f9de 100644 --- a/chrome/common/extensions/docs/server2/handler.py +++ b/chrome/common/extensions/docs/server2/handler.py @@ -128,10 +128,10 @@ class Handler(webapp.RequestHandler): if '_ah/warmup' in path: logging.info('Warmup request.') if DEFAULT_BRANCH != 'local': - self._NavigateToPath('extensions/trunk/samples.html') - self._NavigateToPath('extensions/dev/samples.html') - self._NavigateToPath('extensions/beta/samples.html') - self._NavigateToPath('extensions/stable/samples.html') + self._NavigateToPath('trunk/extensions/samples.html') + self._NavigateToPath('dev/extensions/samples.html') + self._NavigateToPath('beta/extensions/samples.html') + self._NavigateToPath('stable/extensions/samples.html') return # Redirect paths like "directory" to "directory/". This is so relative file diff --git a/chrome/common/extensions/docs/server2/samples_data_source.py b/chrome/common/extensions/docs/server2/samples_data_source.py index db5ee0e..a128194 100644 --- a/chrome/common/extensions/docs/server2/samples_data_source.py +++ b/chrome/common/extensions/docs/server2/samples_data_source.py @@ -95,7 +95,7 @@ class SamplesDataSource(object): if l10n_data['icon'] is None: icon_path = self._static_path + DEFAULT_ICON_PATH else: - icon_path = sample_base_path + '/' + l10n_data['icon'] + icon_path = '/' + sample_base_path + '/' + l10n_data['icon'] l10n_data.update({ 'icon': icon_path, 'path': sample_base_path, diff --git a/chrome/common/extensions/docs/server2/server_instance.py b/chrome/common/extensions/docs/server2/server_instance.py index 53bf38c..2fa2a95 100644 --- a/chrome/common/extensions/docs/server2/server_instance.py +++ b/chrome/common/extensions/docs/server2/server_instance.py @@ -36,11 +36,13 @@ class ServerInstance(object): def Get(self, path, request, response): templates = self._template_data_source_factory.Create(request) - if fnmatch(path, 'examples/*.zip'): - content = self._example_zipper.Create(path[:-len('.zip')]) + if fnmatch(path, 'extensions/examples/*.zip'): + content = self._example_zipper.Create( + path[len('extensions/'):-len('.zip')]) response.headers['content-type'] = mimetypes.types_map['.zip'] - elif path.startswith('examples/'): - content = self._cache.GetFromFile(DOCS_PATH + '/' + path) + elif path.startswith('extensions/examples/'): + content = self._cache.GetFromFile( + DOCS_PATH + '/' + path[len('extensions/'):]) response.headers['content-type'] = 'text/plain' elif path.startswith('static/'): content = self._FetchStaticResource(path, response) diff --git a/chrome/common/extensions/docs/server2/static/js/branch.js b/chrome/common/extensions/docs/server2/static/js/branch.js index 3efea69..f435872 100644 --- a/chrome/common/extensions/docs/server2/static/js/branch.js +++ b/chrome/common/extensions/docs/server2/static/js/branch.js @@ -9,12 +9,14 @@ return; var current_branch = window.bootstrap.branchInfo.current; var path = window.location.pathname.split('/'); + if (path[0] == '') + path = path.slice(1); var index = path.indexOf(current_branch); if (index != -1) path[index] = value; else - path.splice(path.length - 1, 0, value); - window.location = path.join('/'); + path.splice(0, 0, value); + window.location = '/' + path.join('/'); } document.getElementById('branchChooser').addEventListener( diff --git a/chrome/common/extensions/docs/server2/templates/private/footer.html b/chrome/common/extensions/docs/server2/templates/private/footer.html index 546a020..41d31df 100644 --- a/chrome/common/extensions/docs/server2/templates/private/footer.html +++ b/chrome/common/extensions/docs/server2/templates/private/footer.html @@ -14,12 +14,11 @@ {{?is_apps}} api_names: {{*api_list.apps.chrome}}.concat( {{*api_list.apps.experimental}}), - branchInfo: {{*branchInfo}} {{:is_apps}} api_names: {{*api_list.extensions.chrome}}.concat( {{*api_list.extensions.experimental}}), - branchInfo: {{*branchInfo}} {{/is_apps}} + branchInfo: {{*branchInfo}} }; </script> <script src="{{static}}/js/branch.js" type="text/javascript"></script> diff --git a/chrome/common/extensions/docs/server2/templates/public/extensions/samples.html b/chrome/common/extensions/docs/server2/templates/public/extensions/samples.html index 575590c..e02066c 100644 --- a/chrome/common/extensions/docs/server2/templates/public/extensions/samples.html +++ b/chrome/common/extensions/docs/server2/templates/public/extensions/samples.html @@ -20,7 +20,7 @@ <td class="label">Filter by API:</td> <td> <div id="api_filter_items"> - {{#api_list.chrome}} + {{#api_list.extensions.chrome}} <span><a href="javascript:void(0)">{{name}}</a>{{^last}} | {{/}}</span> {{/}} </div> |