Merge branch 'remove-log' of github.com:travis-ci/travis-web into remove-log

assets/scripts/app/helpers/helpers.coffee

@@ -98,7 +98,8 @@ require 'config/emoij'
   _githubCommitReferenceLink: (reference, current, matched) ->
     owner = matched.owner || current.owner
     repo = matched.repo || current.repo
-    "<a href=\"https://github.com/#{owner}/#{repo}/commit/#{matched.sha}\">#{reference}</a>"
+    url = "#{Travis.Urls.githubCommit("#{owner}/#{repo}", matched.sha)}"
+    "<a href=\"#{url}\">#{reference}</a>"
 
   _normalizeDateString: (string) ->
     if window.JHW

assets/scripts/app/templates/account.hbs

@@ -1,11 +1,10 @@
 <p class="tip">
-  {{#if showPrivateReposHint}}
+  {{#if config.pro}}
-  We're only showing <strong>your public repositories</strong> below.
-  You can find your <strong>private projects on <a href="https://travis-ci.com?utm_source=hooks">travis-ci.com</a></strong>.
-  {{/if}}
-  {{#if showPublicReposHint}}
   We're only showing <strong>your private repositories</strong> below.
   You can find your <strong>public projects on <a href="https://travis-ci.org?utm_source=hooks">travis-ci.org</a></strong>.
+  {{else}}
+  We're only showing <strong>your public repositories</strong> below.
+  You can find your <strong>private projects on <a href="https://travis-ci.com?utm_source=hooks">travis-ci.com</a></strong>.
   {{/if}}
 </p>
 

assets/scripts/app/views/repo/show.coffee

@@ -19,12 +19,12 @@ Travis.reopen
     ).property('controller.repo.slug')
 
     actions:
-      statusImages: ->
+      statusImages: () ->
         @popupCloseAll()
         view = Travis.StatusImagesView.create(toolsView: this)
         Travis.View.currentPopupView = view
         view.appendTo($('body'))
-        event.stopPropagation()
+        return false
 
   ReposEmptyView: Travis.View.extend
     template: (->
@@ -116,14 +116,14 @@ Travis.reopen
       menu: ->
         @popupCloseAll()
         $('#tools .menu').toggleClass('display')
-        event.stopPropagation()
+        return false
 
       regenerateKeyPopup: ->
         if @get('canRegenerateKey')
           @set('active', true)
           @closeMenu()
-          @popup(event)
+          @popup('regenerate-key-popup')
-          event.stopPropagation()
+          return false
 
       regenerateKey: ->
         @popupCloseAll()
@@ -227,7 +227,13 @@ Travis.reopen
       codeClimatePopup: ->
         @popupCloseAll()
         @popup('code-climate')
-        event.stopPropagation() if event?
+        return false
+
+      removeLogPopup: ->
+        if @get('canRemoveLog')
+          @set('active', true)
+          @popup('remove-log-popup')
+          return false
 
       removeLogPopup: ->
         if @get('canRemoveLog')

lib/travis/web/app.rb

@@ -83,6 +83,8 @@ class Travis::Web::App
     def response_for(file, options = {})
       content = File.read(file)
       set_config(content, options) if config_needed?(file)
+      set_title(content) if index?(file)
+
       headers = {
         'Content-Length'   => content.bytesize.to_s,
         'Cache-Control'    => cache_control(file),
@@ -134,6 +136,11 @@ class Travis::Web::App
       Rack::Mime.mime_type File.extname(file)
     end
 
+    def set_title(content)
+      default_title = "Travis CI - Free Hosted Continuous Integration Platform for the Open Source Community"
+      content.gsub!(/\{\{title\}\}/, ENV['SITE_TITLE'] || default_title)
+    end
+
     def set_config(string, opts = {})
       string.gsub! %r(<meta (rel|name)="travis\.([^"]*)" (href|value)="([^"]*)"[^>]*>) do
         %(<meta #{$1}="travis.#{$2}" #{$3}="#{options[$2.to_sym] || $4}">)

public/index.html

@@ -17,7 +17,7 @@
     <meta name="travis.charm_key" value="gy5gx7dy6dh86hxzkz1wmtvupwvievu">
     <meta name="travis.pro" value="false">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Travis CI - Free Hosted Continuous Integration Platform for the Open Source Community</title>
+    <title>{{title}}</title>
     <link rel="dns-prefetch" href="//api.travis-ci.org">
     <link rel="dns-prefetch" href="//ws.pusherapp.com">
     <link rel="dns-prefetch" href="//api.github.com">