From dfc22014a82e9a94eedd79bc145ea139ee78f129 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Mon, 16 Feb 2015 14:00:23 +0100 Subject: [PATCH] Set page titles relevant to page is loaded I used ember-cli-document-title addon. --- app/routes/abstract-builds.coffee | 3 +++ app/routes/account.coffee | 3 +++ app/routes/application.coffee | 9 +++++++++ app/routes/build.coffee | 3 +++ app/routes/builds.coffee | 4 +++- app/routes/env-vars.coffee | 2 ++ app/routes/job.coffee | 3 +++ app/routes/profile.coffee | 2 ++ app/routes/repo.coffee | 3 +++ app/routes/settings/index.coffee | 2 ++ app/routes/ssh-key.coffee | 2 ++ config/environment.js | 1 + package.json | 1 + waiter/lib/travis/web/app.rb | 7 ++++++- 14 files changed, 43 insertions(+), 2 deletions(-) diff --git a/app/routes/abstract-builds.coffee b/app/routes/abstract-builds.coffee index 53e5bbd6..1fc355ba 100644 --- a/app/routes/abstract-builds.coffee +++ b/app/routes/abstract-builds.coffee @@ -1,6 +1,9 @@ `import TravisRoute from 'travis/routes/basic'` Route = TravisRoute.extend + titleToken: (model) -> + @get('contentType').replace('_', ' ').capitalize() + renderTemplate: -> @render 'builds' diff --git a/app/routes/account.coffee b/app/routes/account.coffee index 140f219e..884e8509 100644 --- a/app/routes/account.coffee +++ b/app/routes/account.coffee @@ -1,6 +1,9 @@ `import TravisRoute from 'travis/routes/basic'` Route = TravisRoute.extend + titleToken: (model) -> + model.get('name') || model.get('login') + setupController: (controller, account) -> @_super.apply this, arguments diff --git a/app/routes/application.coffee b/app/routes/application.coffee index 0ce223ba..2e17f470 100644 --- a/app/routes/application.coffee +++ b/app/routes/application.coffee @@ -1,4 +1,5 @@ `import TravisRoute from 'travis/routes/basic'` +`import config from 'travis/config/environment'` Route = TravisRoute.extend needsAuth: false @@ -12,6 +13,14 @@ Route = TravisRoute.extend activate: -> @get('stylesheetsManager').disable('dashboard') + title: (titleParts) -> + if titleParts.length + titleParts = titleParts.reverse() + titleParts.push('Travis CI') + titleParts.join(' - ') + else + config.defaultTitle + actions: redirectToGettingStarted: -> # do nothing, we handle it only in index path diff --git a/app/routes/build.coffee b/app/routes/build.coffee index 3c236a80..a1227588 100644 --- a/app/routes/build.coffee +++ b/app/routes/build.coffee @@ -1,6 +1,9 @@ `import TravisRoute from 'travis/routes/basic'` Route = TravisRoute.extend + titleToken: (model) -> + "Build ##{model.get('number')}" + serialize: (model, params) -> id = if model.get then model.get('id') else model diff --git a/app/routes/builds.coffee b/app/routes/builds.coffee index 5bc035eb..1f14a47d 100644 --- a/app/routes/builds.coffee +++ b/app/routes/builds.coffee @@ -1,5 +1,7 @@ `import AbstractBuildsRoute from 'travis/routes/abstract-builds'` -Route = AbstractBuildsRoute.extend(contentType: 'builds') +Route = AbstractBuildsRoute.extend( + contentType: 'builds' +) `export default Route` diff --git a/app/routes/env-vars.coffee b/app/routes/env-vars.coffee index 10d0acc6..c5bf7c62 100644 --- a/app/routes/env-vars.coffee +++ b/app/routes/env-vars.coffee @@ -1,6 +1,8 @@ `import TravisRoute from 'travis/routes/basic'` Route = TravisRoute.extend + titleToken: 'Environment variables' + model: (params) -> repo = @modelFor('repo') repo.get('envVars.promise') diff --git a/app/routes/job.coffee b/app/routes/job.coffee index 2d425772..f5b39c25 100644 --- a/app/routes/job.coffee +++ b/app/routes/job.coffee @@ -1,6 +1,9 @@ `import TravisRoute from 'travis/routes/basic'` Route = TravisRoute.extend + titleToken: (model) -> + "Job ##{model.get('number')}" + serialize: (model, params) -> id = if model.get then model.get('id') else model diff --git a/app/routes/profile.coffee b/app/routes/profile.coffee index 3381f3bb..5fdab2a2 100644 --- a/app/routes/profile.coffee +++ b/app/routes/profile.coffee @@ -1,6 +1,8 @@ `import TravisRoute from 'travis/routes/basic'` Route = TravisRoute.extend + titleToken: 'Profile' + needsAuth: true setupController: (controller, model) -> diff --git a/app/routes/repo.coffee b/app/routes/repo.coffee index 550b5f23..ef9a1b95 100644 --- a/app/routes/repo.coffee +++ b/app/routes/repo.coffee @@ -2,6 +2,9 @@ `import Repo from 'travis/models/repo'` Route = TravisRoute.extend + titleToken: (model) -> + model.get('slug') + renderTemplate: -> @render 'repo', into: 'main' diff --git a/app/routes/settings/index.coffee b/app/routes/settings/index.coffee index 34a8802c..a4bedd1a 100644 --- a/app/routes/settings/index.coffee +++ b/app/routes/settings/index.coffee @@ -1,6 +1,8 @@ `import TravisRoute from 'travis/routes/basic'` Route = TravisRoute.extend + titleToken: 'Settings' + model: -> repo = @modelFor('repo') repo.fetchSettings().then (settings) -> diff --git a/app/routes/ssh-key.coffee b/app/routes/ssh-key.coffee index 8274d512..7ceff470 100644 --- a/app/routes/ssh-key.coffee +++ b/app/routes/ssh-key.coffee @@ -3,6 +3,8 @@ `import TravisRoute from 'travis/routes/basic'` Route = TravisRoute.extend + titleToken: 'Ssh Keys' + model: (params) -> repo = @modelFor('repo') self = this diff --git a/config/environment.js b/config/environment.js index ebfabdc0..631f4345 100644 --- a/config/environment.js +++ b/config/environment.js @@ -6,6 +6,7 @@ module.exports = function(environment) { environment: environment, baseURL: '/', locationType: 'auto', + defaultTitle: 'Travis CI', EmberENV: { FEATURES: { // Here you can enable experimental features on an ember canary build diff --git a/package.json b/package.json index 2c46dc0c..2292372b 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "ember-cli-coffeescript": "0.7.0", "ember-cli-content-security-policy": "0.3.0", "ember-cli-dependency-checker": "0.0.7", + "ember-cli-document-title": "0.0.1", "ember-cli-htmlbars": "^0.6.0", "ember-cli-ic-ajax": "0.1.1", "ember-cli-inject-live-reload": "^1.3.0", diff --git a/waiter/lib/travis/web/app.rb b/waiter/lib/travis/web/app.rb index 51a78baf..e1c52e36 100644 --- a/waiter/lib/travis/web/app.rb +++ b/waiter/lib/travis/web/app.rb @@ -162,8 +162,12 @@ class Travis::Web::App end def set_title(content) + content.gsub!(/\{\{title\}\}/, title) + end + + def title default_title = "Travis CI - Free Hosted Continuous Integration Platform for the Open Source Community" - content.gsub!(/\{\{title\}\}/, ENV['SITE_TITLE'] || default_title) + ENV['SITE_TITLE'] || default_title end def set_assets_host(content) @@ -173,6 +177,7 @@ class Travis::Web::App def set_config(string, opts = {}) # TODO: clean up config = {} + config['defaultTitle'] = title config['apiEndpoint'] = options[:api_endpoint] if options[:api_endpoint] config['pagesEndpoint'] = options[:pages_endpoint] if options[:pages_endpoint] config['billingEndpoint'] = options[:billing_endpoint] if options[:billing_endpoint]