From 7959442a99c9cf6177150cbb092bbbb4baaccd84 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 8 Jan 2015 17:11:48 +0100 Subject: [PATCH 1/8] Disable remove log button for now --- assets/scripts/app/views/repo/show.coffee | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee index d1779239..51a8a45d 100644 --- a/assets/scripts/app/views/repo/show.coffee +++ b/assets/scripts/app/views/repo/show.coffee @@ -283,8 +283,9 @@ Travis.reopen ).property('displayRemoveLog', 'hasPermission') displayRemoveLog: (-> - (@get('isJobTab') || (@get('isBuildTab') && @get('build.jobs.length') == 1)) && - @get('build.jobs').objectAt(0).get?('canRemoveLog') + #(@get('isJobTab') || (@get('isBuildTab') && @get('build.jobs.length') == 1)) && + # @get('build.jobs').objectAt(0).get?('canRemoveLog') + false ).property('isJobTab', 'isBuildTab', 'build.jobs.length', 'job.canRemoveLog') canCancelBuild: (-> From 2d468190e0857c889ba090ceedd5d4a636e36199 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 8 Jan 2015 17:14:38 +0100 Subject: [PATCH 2/8] Fix the message about public/private repos on account page --- assets/scripts/app/templates/account.hbs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/assets/scripts/app/templates/account.hbs b/assets/scripts/app/templates/account.hbs index 675191a8..05e13dd4 100644 --- a/assets/scripts/app/templates/account.hbs +++ b/assets/scripts/app/templates/account.hbs @@ -1,11 +1,10 @@

- {{#if showPrivateReposHint}} - We're only showing your public repositories below. - You can find your private projects on travis-ci.com. - {{/if}} - {{#if showPublicReposHint}} + {{#if config.pro}} We're only showing your private repositories below. You can find your public projects on travis-ci.org. + {{else}} + We're only showing your public repositories below. + You can find your private projects on travis-ci.com. {{/if}}

From ee2db5d891e866885d4f98bc05512bc50d450eb0 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 9 Jan 2015 10:17:16 +0100 Subject: [PATCH 3/8] Allow to set different title for different instances of the app --- lib/travis/web/app.rb | 7 +++++++ public/index.html | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/travis/web/app.rb b/lib/travis/web/app.rb index f440670f..39b5317a 100644 --- a/lib/travis/web/app.rb +++ b/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(]*>) do %() diff --git a/public/index.html b/public/index.html index 6316c6f7..673b0ae0 100644 --- a/public/index.html +++ b/public/index.html @@ -17,7 +17,7 @@ - Travis CI - Free Hosted Continuous Integration Platform for the Open Source Community + {{title}} From 2a64382563b063389e7ec69a2db4f0927d6624e6 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 9 Jan 2015 11:18:02 +0100 Subject: [PATCH 4/8] Use Urls.githubCommit for githubify --- assets/scripts/app/helpers/helpers.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/scripts/app/helpers/helpers.coffee b/assets/scripts/app/helpers/helpers.coffee index 8f24bbd1..34db8467 100644 --- a/assets/scripts/app/helpers/helpers.coffee +++ b/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 - "#{reference}" + url = "#{Travis.Urls.githubCommit("#{owner}/#{repo}", matched.sha)}" + "#{reference}" _normalizeDateString: (string) -> if window.JHW From 3582969e900368a7f3948d9568e2998cd0eec487 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Thu, 8 Jan 2015 15:38:46 +0100 Subject: [PATCH 5/8] add popup stub --- assets/scripts/app/templates/remove_log.hbs | 8 ++++++++ assets/styles/app/popup.sass | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 assets/scripts/app/templates/remove_log.hbs diff --git a/assets/scripts/app/templates/remove_log.hbs b/assets/scripts/app/templates/remove_log.hbs new file mode 100644 index 00000000..ad8e2fa7 --- /dev/null +++ b/assets/scripts/app/templates/remove_log.hbs @@ -0,0 +1,8 @@ + +

This action will remove the log permanently!

+

Do you want to continue?

+

+ Yes, please! + or + Cancel +

diff --git a/assets/styles/app/popup.sass b/assets/styles/app/popup.sass index 26934957..fcd6dcad 100644 --- a/assets/styles/app/popup.sass +++ b/assets/styles/app/popup.sass @@ -72,7 +72,8 @@ p:last-child margin-top: 10px -#regenerate-key +#regenerate-key, +#remove-log .cancel text-decoration: underline p @@ -108,3 +109,4 @@ padding-left: 15px img#code-climate-logo margin-right: 50px + From 3bf326a94214df4c70aa3c8a5552c3baa506e1a9 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Thu, 8 Jan 2015 16:28:37 +0100 Subject: [PATCH 6/8] Add actions for remove log --- .../app/templates/repos/show/actions.hbs | 13 ++++++- assets/scripts/app/views/repo/show.coffee | 38 +++++++++++-------- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs index 5f1232fd..28c0006d 100644 --- a/assets/scripts/app/templates/repos/show/actions.hbs +++ b/assets/scripts/app/templates/repos/show/actions.hbs @@ -39,7 +39,7 @@ {{/if}} {{#if view.displayRemoveLog}}
  • -
    • {{/if}} @@ -53,3 +53,14 @@ + + diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee index 51a8a45d..c74f92f5 100644 --- a/assets/scripts/app/views/repo/show.coffee +++ b/assets/scripts/app/views/repo/show.coffee @@ -181,7 +181,7 @@ Travis.reopen requeueJob: -> if @get('canRequeueJob') - @requeue @get('job') + @requeue @get('_job') cancelBuild: -> if @get('canCancelBuild') @@ -198,8 +198,9 @@ Travis.reopen removeLog: -> + @popupCloseAll() if @get('canRemoveLog') - job = @get('job') || @get('build.jobs.firstObject') + job = @get('_job') || @get('build.jobs.firstObject') job.removeLog().then -> Travis.flash(success: 'Log has been successfully removed.') , (xhr) -> @@ -213,7 +214,7 @@ Travis.reopen cancelJob: -> if @get('canCancelJob') Travis.flash(notice: 'Job cancellation has been scheduled.') - @get('job').cancel().then -> + @get('_job').cancel().then -> Travis.flash(success: 'Job has been successfully canceled.') , (xhr) -> if xhr.status == 422 @@ -228,6 +229,12 @@ Travis.reopen @popup('code-climate') event.stopPropagation() if event? + removeLogPopup: -> + if @get('canRemoveLog') + @set('active', true) + @popup(event) + event.stopPropagation() + hasPermission: (-> if permissions = @get('currentUser.permissions') permissions.contains parseInt(@get('repo.id')) @@ -255,19 +262,21 @@ Travis.reopen ).property('displayRequeueJob', 'hasPermission') showDownloadLog: (-> - @get('jobIdForLog') - ).property('jobIdForLog') + @get('_job') + ).property('_job') - jobIdForLog: (-> - @get('job.id') || - (@get('build.jobs.length') == 1 && @get('build.jobs').objectAt(0).get?('id')) - ).property('job.id', 'build.jobs.firstObject.id', 'build.jobs.length') - - job: (-> + _job: (-> if id = @get('jobIdForLog') Travis.Job.find(id) ).property('jobIdForLog') + jobIdForLog: (-> + job = @get('job.id') + unless job + if @get('build.jobs.length') == 1 + job = @get('build.jobs').objectAt?(0).get?('id') + job + ).property('job.id', 'build.jobs.firstObject.id', 'build.jobs.length') plainTextLogUrl: (-> if id = @get('jobIdForLog') @@ -283,10 +292,9 @@ Travis.reopen ).property('displayRemoveLog', 'hasPermission') displayRemoveLog: (-> - #(@get('isJobTab') || (@get('isBuildTab') && @get('build.jobs.length') == 1)) && - # @get('build.jobs').objectAt(0).get?('canRemoveLog') - false - ).property('isJobTab', 'isBuildTab', 'build.jobs.length', 'job.canRemoveLog') + if job = Travis.Job.find(@get('jobIdForLog')) + (@get('isJobTab') || (@get('isBuildTab') && @get('build.jobs.length') == 1)) && job.get('canRemoveLog') + ).property('isJobTab', 'isBuildTab', 'build.jobs.length', 'job.canRemoveLog', 'jobIdForLog') canCancelBuild: (-> @get('displayCancelBuild') && @get('hasPermission') From 4d9d0f10d9b14da379c5d1346b2cb4a587927452 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 8 Jan 2015 17:03:34 +0100 Subject: [PATCH 7/8] Bring back hack for download log button --- assets/scripts/app/templates/repos/show/actions.hbs | 10 ++++++---- assets/scripts/app/views/repo/show.coffee | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs index 28c0006d..d8c62e7f 100644 --- a/assets/scripts/app/templates/repos/show/actions.hbs +++ b/assets/scripts/app/templates/repos/show/actions.hbs @@ -32,10 +32,12 @@ {{/if}} {{/if}} - {{#if view.showDownloadLog}} -
  • - -
    • + {{#if view.jobIdForLog}} + {{#if view.showDownloadLog}} +
  • + +
    • + {{/if}} {{/if}} {{#if view.displayRemoveLog}}
  • diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee index c74f92f5..65995374 100644 --- a/assets/scripts/app/views/repo/show.coffee +++ b/assets/scripts/app/views/repo/show.coffee @@ -262,8 +262,8 @@ Travis.reopen ).property('displayRequeueJob', 'hasPermission') showDownloadLog: (-> - @get('_job') - ).property('_job') + @get('jobIdForLog') + ).property('jobIdForLog') _job: (-> if id = @get('jobIdForLog') @@ -294,7 +294,7 @@ Travis.reopen displayRemoveLog: (-> if job = Travis.Job.find(@get('jobIdForLog')) (@get('isJobTab') || (@get('isBuildTab') && @get('build.jobs.length') == 1)) && job.get('canRemoveLog') - ).property('isJobTab', 'isBuildTab', 'build.jobs.length', 'job.canRemoveLog', 'jobIdForLog') + ).property('isJobTab', 'isBuildTab', 'build.jobs.length', '_job.canRemoveLog', 'jobIdForLog') canCancelBuild: (-> @get('displayCancelBuild') && @get('hasPermission') From eb78d62adb22acf472ebb238188044b4dc31e574 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 9 Jan 2015 10:55:13 +0100 Subject: [PATCH 8/8] Change popup functions to not use events --- assets/scripts/app/views/repo/show.coffee | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee index 65995374..07dc6359 100644 --- a/assets/scripts/app/views/repo/show.coffee +++ b/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) - event.stopPropagation() + @popup('regenerate-key-popup') + return false regenerateKey: -> @popupCloseAll() @@ -227,13 +227,13 @@ Travis.reopen codeClimatePopup: -> @popupCloseAll() @popup('code-climate') - event.stopPropagation() if event? + return false removeLogPopup: -> if @get('canRemoveLog') @set('active', true) - @popup(event) - event.stopPropagation() + @popup('remove-log-popup') + return false hasPermission: (-> if permissions = @get('currentUser.permissions')