diff --git a/assets/scripts/app/controllers/builds.coffee b/assets/scripts/app/controllers/builds.coffee index 8bfb61da..76234a22 100644 --- a/assets/scripts/app/controllers/builds.coffee +++ b/assets/scripts/app/controllers/builds.coffee @@ -7,6 +7,7 @@ Travis.BuildsController = Em.ArrayController.extend repoBinding: 'controllers.repo.repo' tabBinding: 'controllers.repo.tab' isLoadedBinding: 'content.isLoaded' + isLoadingBinding: 'content.isLoading' showMore: -> id = @get('repo.id') diff --git a/assets/scripts/app/models/log.coffee b/assets/scripts/app/models/log.coffee index a0110d5b..5671199d 100644 --- a/assets/scripts/app/models/log.coffee +++ b/assets/scripts/app/models/log.coffee @@ -15,6 +15,7 @@ require 'travis/chunk_buffer' fetch: -> console.log 'log model: fetching log' if Log.DEBUG + @setParts() handlers = json: (json) => @loadParts(json['log']['parts']) text: (text) => @loadText(text) diff --git a/assets/scripts/app/templates/builds/list.hbs b/assets/scripts/app/templates/builds/list.hbs index 317594aa..41e7a038 100644 --- a/assets/scripts/app/templates/builds/list.hbs +++ b/assets/scripts/app/templates/builds/list.hbs @@ -45,7 +45,7 @@ {{#if view.isPullRequestsList}} - #{{commit.pullRequestNumber}} + #{{pullRequestNumber}} {{/if}} @@ -62,6 +62,9 @@ {{#if displayShowMoreButton}}

{{view view.ShowMoreButton}} + {{#if isLoading}} + + {{/if}}

{{/if}} {{else}} diff --git a/assets/scripts/app/templates/status_images.hbs b/assets/scripts/app/templates/status_images.hbs index 9630319e..f5dc5c0a 100644 --- a/assets/scripts/app/templates/status_images.hbs +++ b/assets/scripts/app/templates/status_images.hbs @@ -27,3 +27,7 @@

+

+ + +

diff --git a/assets/scripts/app/views/build.coffee b/assets/scripts/app/views/build.coffee index 9b2ed95d..f0a79958 100644 --- a/assets/scripts/app/views/build.coffee +++ b/assets/scripts/app/views/build.coffee @@ -11,7 +11,7 @@ Travis.reopen tagName: 'button' classNameBindings: ['isLoading'] attributeBindings: ['disabled'] - isLoadingBinding: 'controller.builds.isLoading' + isLoadingBinding: 'controller.isLoading' template: Em.Handlebars.compile('{{view.label}}') disabledBinding: 'isLoading' diff --git a/assets/scripts/app/views/status_images.coffee b/assets/scripts/app/views/status_images.coffee index 12184148..935df8d2 100644 --- a/assets/scripts/app/views/status_images.coffee +++ b/assets/scripts/app/views/status_images.coffee @@ -51,3 +51,7 @@ Travis.StatusImagesView = Em.View.extend asciidocStatusImage: (-> "image:#{@get('statusImageUrl')}[\"Build Status\", link=\"#{@get('urlRepo')}\"]" ).property('statusImageUrl') + + rstStatusImage: (-> + ".. image:: #{@get('statusImageUrl')} :target: #{@get('urlRepo')}" + ).property('statusImageUrl') diff --git a/assets/styles/app/popup.sass b/assets/styles/app/popup.sass index 5dda2148..119c63c2 100644 --- a/assets/styles/app/popup.sass +++ b/assets/styles/app/popup.sass @@ -44,7 +44,7 @@ #status-images display: none width: 600px - height: 230px + height: 250px margin: -95px 0 0 -300px p diff --git a/config.ru b/config.ru index f3272ca3..b9a55f43 100644 --- a/config.ru +++ b/config.ru @@ -9,7 +9,7 @@ class RedirectSubdomain < Struct.new(:app, :from) def call(env) request = Rack::Request.new(env) if request.host == from - [301, { 'Location' => "https://travis-ci.org/#{request.fullpath}", 'Content-Type' => 'text/html' }, []] + [301, { 'Location' => "https://travis-ci.org#{request.fullpath}", 'Content-Type' => 'text/html' }, []] else app.call(env) end