diff --git a/app/app.coffee b/app/app.coffee index 40da63a3..8aa55baa 100644 --- a/app/app.coffee +++ b/app/app.coffee @@ -58,13 +58,18 @@ App = Ember.Application.extend(Ember.Evented, @on 'user:synced', (user) -> Travis.onUserUpdate(user) + @on 'user:signed_out', () -> + if config.userlike + Travis.removeUserlike() + currentDate: -> new Date() onUserUpdate: (user) -> if config.pro @identifyCustomer(user) - @setupCharm(user) + if config.userlike + @setupUserlike(user) @subscribePusher(user) @@ -80,14 +85,26 @@ App = Ember.Application.extend(Ember.Evented, Travis.pusher.subscribeAll(channels) - setupCharm: (user) -> - $.extend window.__CHARM, - customer: user.login, - customer_id: user.id, - email: user.email + setupUserlike: (user) -> - displayCharm: -> - __CHARM.show() + btn = document.getElementById('userlikeCustomTab') + btn.classList.add("logged-in") + + userlikeData = window.userlikeData = {} + userlikeData.user = {} + + userlikeData.user.name= user.login; + userlikeData.user.email = user.email; + + unless document.getElementById('userlike-script') + s = document.createElement('script') + s.id = 'userlike-script' + s.src = '//userlike-cdn-widgets.s3-eu-west-1.amazonaws.com/0327dbb23382ccbbb91b445b76e8a91d4b37d90ef9f2faf84e11177847ff7bb9.js' + document.body.appendChild(s) + + removeUserlike: () -> + btn = document.getElementById('userlikeCustomTab') + btn.classList.remove("logged-in") identifyCustomer: (user) -> if _cio && _cio.identify diff --git a/app/index.html b/app/index.html index c6a62dfc..969f7c65 100644 --- a/app/index.html +++ b/app/index.html @@ -23,5 +23,7 @@ {{content-for 'body-footer'}} + + Do you have a question? diff --git a/app/initializers/charm.coffee b/app/initializers/charm.coffee deleted file mode 100644 index 68088671..00000000 --- a/app/initializers/charm.coffee +++ /dev/null @@ -1,17 +0,0 @@ -`import config from 'travis/config/environment'` - -initialize = (container, app) -> - if config.charmKey - window.__CHARM = - key: config.charmKey - url: window.location.protocol + "//charmscout.herokuapp.com/feedback" - - window.bootstrapCharm() - # $('head').append $('') - -Initializer = - name: 'charm' - initialize: initialize - -`export {initialize}` -`export default Initializer` diff --git a/app/styles/app.scss b/app/styles/app.scss index d8fe91d5..705d8bf2 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -8,10 +8,11 @@ @import "app/ansi"; @import "app/auth"; -@import "app/charm"; -// @import "app/forms"; -// @import "app/github"; +@import "app/forms"; +@import "app/github"; + @import "app/main/annotations"; +@import "app/userlike"; @import "app/main/list"; @import "app/main/log"; diff --git a/app/styles/app/charm.sass b/app/styles/app/charm.sass deleted file mode 100644 index 1dae943d..00000000 --- a/app/styles/app/charm.sass +++ /dev/null @@ -1,104 +0,0 @@ - -.feedback-button - display: none - -.pro - .feedback-button - display: inline-block - -.feedback-button - display: inline-block - position: fixed - right: 4% - left: auto - bottom: 0 - margin: 0 - padding: .5em 1em .5em - border-radius: 4px - // transform: rotate(90deg) translateY(-140%) - transform: translateY(20%) - will-change: transform - transition: transform ease 200ms - background: $white - font-size: 13px - color: #a2afb3 - text-transform: uppercase - box-shadow: 0px 0px 3px 1px rgba(0,0,0,0.15) - z-index: 89 - &.hidden - display: none - -.feedback-button:hover - // transform: rotate(90deg) translateY(-130%) - transform: translateY(5%) - -.feedback-popup - position: fixed - top: 50% - left: 50% - width: 30em - transform: translate(-50%, -50%) - padding: 1em 1.3em - background-color: #ffffff - border-radius: 5px - z-index: 85 - box-shadow: 0px 0px 3px 1px rgba(0,0,0,0.15) - h1 - margin: 0 0 .4em - padding-left: .4em - color: #347389 - font-size: 22px - textarea - box-sizing: border-box - display: block - width: 100% - height: 10em - margin-bottom: .8em - padding: .5em .6em - resize: vertical - background-color: #f4f3eb - font-size: 16px - color: #7d7e80 - border: none - font-family: $font-family-sans-serif - .submit - margin-right: 1em - padding: .3em .7em - background-color: #37a766 - color: $white - font-size: 16px - border: none - border-radius: 4px - font-family: $font-family-sans-serif - cursor: pointer - p - padding-left: 0.7em - margin: 0.3em 0 0 - a - color: #7d7e80 - font-size: 16px - text-decoration: none - a:hover - text-decoration: underline - - .closed & - display: none - -.feedback-overlay - display: block - position: fixed - top: 0 - right: 0 - bottom: 0 - left: 0 - width: 100% - height: 100% - background-color: rgba(#D5D5CE, 0.7) - z-index: 84 - .closed & - display: none - - -#CHARM_FORM_TARGET - display: none - diff --git a/app/styles/app/userlike.sass b/app/styles/app/userlike.sass new file mode 100644 index 00000000..e1f809bf --- /dev/null +++ b/app/styles/app/userlike.sass @@ -0,0 +1,24 @@ + +.feedback-button + display: none + position: fixed + right: 1% + left: auto + bottom: 0 + margin: 0 + padding: .5em 1em 1em 1em + border-radius: 4px + border: solid 1px #399399 + transform: translateY(20%) + will-change: transform + transition: transform ease 200ms + background: $white + font-size: 16px + color: #399399 + z-index: 89 + +.feedback-button:hover + transform: translateY(5%) + +.logged-in.feedback-button + display: inline-block diff --git a/app/templates/account.hbs b/app/templates/account.hbs index e77c6caf..3b56f897 100644 --- a/app/templates/account.hbs +++ b/app/templates/account.hbs @@ -4,16 +4,16 @@ {{#if config.billingEndpoint}}
{{#if view.subscribed}} - + Subscription active! {{else}} {{#if view.education}} - + Educational account! {{else}} - + Sign up this account! {{/if}} @@ -93,9 +93,9 @@
diff --git a/app/templates/components/caches-item.hbs b/app/templates/components/caches-item.hbs index cdcfeb3e..eb77701f 100644 --- a/app/templates/components/caches-item.hbs +++ b/app/templates/components/caches-item.hbs @@ -1,5 +1,5 @@

- + {{cache.branch}}

@@ -8,7 +8,7 @@

{{mb cache.size}}MB

- + Delete

diff --git a/app/templates/components/code-climate-popup.hbs b/app/templates/components/code-climate-popup.hbs index 2daf1003..2638f4bd 100644 --- a/app/templates/components/code-climate-popup.hbs +++ b/app/templates/components/code-climate-popup.hbs @@ -7,7 +7,7 @@

Integrating Code Climate's test coverage reporting with your test suite on Travis CI allows to track changes in coverage over time. If you haven't tried it out already, sign + href={{config.codeClimateUrl}} target="_blank">sign up today to improve your code's quality. New customers get 20% off for the first three months!

diff --git a/app/templates/components/hooks-list-item.hbs b/app/templates/components/hooks-list-item.hbs index dbf0bb1c..cc6eb0d6 100644 --- a/app/templates/components/hooks-list-item.hbs +++ b/app/templates/components/hooks-list-item.hbs @@ -6,7 +6,7 @@ {{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}{{/link-to}} {{/if}} - + {{hook.slug}} {{hook.description}} @@ -16,7 +16,7 @@ An error happened when we tried to alter settings on GitHub. {{#if githubOrgsOauthAccessSettingsUrl}} It may be caused by API restrictions, please - review and add your authorized Orgs. diff --git a/app/templates/components/jobs-item.hbs b/app/templates/components/jobs-item.hbs index 14d98e6e..093678bd 100644 --- a/app/templates/components/jobs-item.hbs +++ b/app/templates/components/jobs-item.hbs @@ -1,6 +1,6 @@ {{#link-to "job" repo job}}
- +

@@ -8,8 +8,8 @@ {{job.number}}

-

- +

+

{{#if languages}} diff --git a/app/templates/components/owner-repo-tile.hbs b/app/templates/components/owner-repo-tile.hbs index cad544c6..83719f0f 100644 --- a/app/templates/components/owner-repo-tile.hbs +++ b/app/templates/components/owner-repo-tile.hbs @@ -2,7 +2,7 @@
{{/if}}
- +

{{#link-to "repo" ownerName repoName }}{{repoName}}{{/link-to}}

@@ -18,10 +18,10 @@

- + {{repo.default_branch.name}}

- {{format-sha repo.default_branch.last_build.commit.sha}}

+ {{format-sha repo.default_branch.last_build.commit.sha}}

diff --git a/app/templates/components/travis-status.hbs b/app/templates/components/travis-status.hbs index a599939b..427d041e 100644 --- a/app/templates/components/travis-status.hbs +++ b/app/templates/components/travis-status.hbs @@ -1,7 +1,7 @@ {{#if statusPageStatusUrl}}

Travis CI Status

diff --git a/app/templates/dashboard/repositories.hbs b/app/templates/dashboard/repositories.hbs index 0fb099ea..c5ad82c8 100644 --- a/app/templates/dashboard/repositories.hbs +++ b/app/templates/dashboard/repositories.hbs @@ -19,12 +19,12 @@
{{#each repo in filteredRepositories}} -
+
{{#if repo.private }}
{{/if}}
- +
diff --git a/app/templates/env-vars.hbs b/app/templates/env-vars.hbs index 152ebe68..b4b585cb 100644 --- a/app/templates/env-vars.hbs +++ b/app/templates/env-vars.hbs @@ -8,11 +8,11 @@ {{partial 'env_vars/form'}} {{else}} Edit - + Delete {{name}} - {{value}} + {{value}} {{/if}} {{/unless}} diff --git a/app/templates/env-vars/_form.hbs b/app/templates/env-vars/_form.hbs index b63210a3..f7f25979 100644 --- a/app/templates/env-vars/_form.hbs +++ b/app/templates/env-vars/_form.hbs @@ -20,7 +20,7 @@
- + or Cancel
diff --git a/app/templates/footer.hbs b/app/templates/footer.hbs index 1d68f837..a20bf15f 100644 --- a/app/templates/footer.hbs +++ b/app/templates/footer.hbs @@ -20,9 +20,6 @@
  • Documentation
  • Blog
  • Email
    • - {{#if config.pro}} -
  • Live Chat
    • - {{/if}}
  • Twitter
    • diff --git a/app/templates/home.hbs b/app/templates/home.hbs index e0f91286..002770c2 100644 --- a/app/templates/home.hbs +++ b/app/templates/home.hbs @@ -53,9 +53,9 @@
      {{#each repo in repos}} -
    • +
    • - +

      {{repo.owner}}

      diff --git a/app/templates/job.hbs b/app/templates/job.hbs index d1c83dea..b6238897 100644 --- a/app/templates/job.hbs +++ b/app/templates/job.hbs @@ -1,14 +1,14 @@ {{#if job.isLoaded}} -
      +
      - - + +

      - {{job.commit.branch}} + {{job.commit.branch}} {{format-message job.commit.subject repoBinding=job.repo}}

      @@ -16,11 +16,11 @@
      {{#if job.commit.authorName}} - {{job.commit.authorName}} authored{{#if job.commit.authorIsCommitter}} and committed{{/if}} + {{job.commit.authorName}} authored{{#if job.commit.authorIsCommitter}} and committed{{/if}} {{/if}} {{#unless job.commit.authorIsCommitter}} {{#if job.commit.committerName}} - {{job.commit.committerName}} committed + {{job.commit.committerName}} committed {{/if}} {{/unless}}
      @@ -35,14 +35,14 @@ {{/link-to}}
    • - Commit {{format-sha job.commit.sha}} + Commit {{format-sha job.commit.sha}}
    • {{#if job.build.pullRequest}} -
      #{{job.build.pullRequestNumber}}: {{job.build.pullRequestTitle}}
      +
      #{{job.build.pullRequestNumber}}: {{job.build.pullRequestTitle}}
      {{else}} {{#if job.build.commit.compareUrl}} -
      Compare {{short-compare-shas job.build.commit.compareUrl}}
      +
      Compare {{short-compare-shas job.build.commit.compareUrl}}
      {{/if}} {{/if}}
      • diff --git a/app/templates/jobs.hbs b/app/templates/jobs.hbs index 32cd45db..02045a7b 100644 --- a/app/templates/jobs.hbs +++ b/app/templates/jobs.hbs @@ -1,5 +1,5 @@ {{#if view.jobs.length}} -
      +
      {{#if view.required}}

      Build Jobs

      @@ -14,12 +14,12 @@ {{#each job in view.jobs}} {{#view 'jobs-item' context=job}} -
      +
      {{#if job.config}} {{#link-to "job" job.repo job}}
      - +

      @@ -31,8 +31,8 @@ {{/if}}

      -

      - +

      + {{!-- {{config.os}} --}}

      @@ -47,7 +47,7 @@ no language set

      {{/if}} - +
      {{#if config.env}}

      @@ -61,14 +61,14 @@

      {{/if}} -

      +

      {{format-duration duration}}

      - {{!--

      + {{!--

      {{format-time finishedAt}}

      --}} diff --git a/app/templates/jobs/pre.hbs b/app/templates/jobs/pre.hbs index ccab24bc..eaccc851 100644 --- a/app/templates/jobs/pre.hbs +++ b/app/templates/jobs/pre.hbs @@ -18,12 +18,12 @@ {{/if}} -
      +
      {{#if view.canRemoveLog}} Remove Log {{/if}} - Download Log + Download Log
      {{#if view.showTailing}} @@ -44,13 +44,12 @@ {{#if view.showToTop}} Top {{/if}} - - {{#if view.limited}} -

      - This log is too long to be displayed. Please reduce the verbosity of your - build or download the raw log. -

      - {{/if}}
      + {{#if view.limited}} +

      + This log is too long to be displayed. Please reduce the verbosity of your + build or download the raw log. +

      + {{/if}}
      diff --git a/app/templates/layouts/home.hbs b/app/templates/layouts/home.hbs index cb1e693f..10517cdc 100644 --- a/app/templates/layouts/home.hbs +++ b/app/templates/layouts/home.hbs @@ -1,4 +1,4 @@ -
      +
      {{render "top"}} @@ -12,11 +12,11 @@
      -
    -
    --}}
    -
    \ No newline at end of file +
    diff --git a/app/templates/profile/accounts.hbs b/app/templates/profile/accounts.hbs index 28e09f9e..3d465e92 100644 --- a/app/templates/profile/accounts.hbs +++ b/app/templates/profile/accounts.hbs @@ -2,7 +2,7 @@
    - +
    {{#link-to 'profile'}} @@ -19,7 +19,7 @@ {{#link-to "account" view.account class="name"}}
    - +

    {{view.name}}

    @@ -34,7 +34,7 @@ {{#if config.githubOrgsOauthAccessSettingsUrl}}

    Is an organization missing?
    - Review and add your authorized organizations.

    + Review and add your authorized organizations.

    {{/if}} diff --git a/app/templates/profile/tabs.hbs b/app/templates/profile/tabs.hbs index 38c2a174..f7e232be 100644 --- a/app/templates/profile/tabs.hbs +++ b/app/templates/profile/tabs.hbs @@ -1,11 +1,11 @@
      -
    • +
    • {{#link-to "account" account}}Repositories{{/link-to}}
      • {{#if view.displayUser}} -
    • +
    • {{#link-to "accounts.info"}}Profile{{/link-to}}
      @@ -14,7 +14,7 @@ {{#if config.billingEndpoint}}
    • - Billing + Billing
      • {{/if}} diff --git a/app/templates/profile/tabs/user.hbs b/app/templates/profile/tabs/user.hbs index 8579dff7..b10cf139 100644 --- a/app/templates/profile/tabs/user.hbs +++ b/app/templates/profile/tabs/user.hbs @@ -1,4 +1,4 @@ -{{!-- +{{!--
      @@ -6,7 +6,7 @@ GitHub
      - {{user.login}} + {{user.login}}
      @@ -26,4 +26,4 @@
      - --}} \ No newline at end of file + --}} diff --git a/app/templates/queue.hbs b/app/templates/queue.hbs index ea147397..a2d70ec2 100644 --- a/app/templates/queue.hbs +++ b/app/templates/queue.hbs @@ -1,9 +1,9 @@ {{#if isLoaded}} {{#if length}} {{#each job in controller}} -
      +
      {{#if job.repo.slug}} - + {{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}} {{/if}} diff --git a/app/templates/repo.hbs b/app/templates/repo.hbs index baa24ed0..59131043 100644 --- a/app/templates/repo.hbs +++ b/app/templates/repo.hbs @@ -1,17 +1,17 @@ -
      +
      {{#if view.isEmpty}} {{view 'repos-empty'}} {{else}} {{#if repo.isLoaded}} -
      +

      {{#link-to "repo" repo}}{{repo.slug}}{{/link-to}}

      - + - +

      {{description}}

      diff --git a/app/templates/repos.hbs b/app/templates/repos.hbs index f69e9684..7bf3f1d4 100644 --- a/app/templates/repos.hbs +++ b/app/templates/repos.hbs @@ -22,10 +22,10 @@ {{#collection 'repos-list' content=this}} {{#with view.repo as repo}} -
      +

      {{#if repo.slug}} - + {{#link-to "repo" repo class="slug"}}{{repo.slug}}{{/link-to}} {{/if}}

      @@ -44,7 +44,7 @@

      Duration: - + {{format-duration repo.lastBuildDuration}}

      @@ -52,7 +52,7 @@

      Finished: - + {{format-time repo.lastBuildFinishedAt}}

      diff --git a/app/templates/repos/list/tabs.hbs b/app/templates/repos/list/tabs.hbs index 7faf4ba2..fc8723a8 100644 --- a/app/templates/repos/list/tabs.hbs +++ b/app/templates/repos/list/tabs.hbs @@ -1,16 +1,16 @@
        -
      • +
      • My Repositories
        • {{#if config.pro}} -
      • +
      • Running ({{startedJobsCount}}/{{allJobsCount}})
        • {{/if}} -
      • +
      • {{#link-to "profile" trackEvent="add-repository-from-list" title="Add New Repository"}} {{/link-to}} diff --git a/app/templates/repos/show/tabs.hbs b/app/templates/repos/show/tabs.hbs index d771665a..e6cae01c 100644 --- a/app/templates/repos/show/tabs.hbs +++ b/app/templates/repos/show/tabs.hbs @@ -1,34 +1,34 @@
          -
        • +
        • {{#if repo.slug}} {{#link-to "repo" repo current-when="repo.index"}} Current {{/link-to}} {{/if}}
          • -
        • +
        • {{#if repo.slug}} {{#link-to "branches" repo}} Branches {{/link-to}} {{/if}}
          • -
        • +
        • {{#if repo.slug}} {{#link-to "builds" repo}} Build History {{/link-to}} {{/if}}
          • -
        • +
        • {{#if repo.slug}} {{#link-to "pullRequests" repo}} Pull Requests {{/link-to}} {{/if}}
          • -
        • +
        • {{#if build.id}} {{#if repo.slug}} {{#link-to "build" repo build}} @@ -37,7 +37,7 @@ {{/if}} {{/if}}
          • -
        • +
        • {{#if job.id}} {{#if repo.slug}} {{#link-to "job" repo job}} @@ -46,14 +46,14 @@ {{/if}} {{/if}}
          • -
        • +
        • {{#if repo.slug}} {{#link-to "settings" repo}} Settings {{/link-to}} {{/if}}
          • -
        • +
        • {{#if repo.slug}} {{#link-to "requests" repo}} Requests @@ -61,7 +61,7 @@ {{/if}}
          • {{#if config.caches_enabled}} -
        • +
        • {{#if repo.slug}} {{#link-to "caches" repo}} Caches @@ -70,7 +70,7 @@
          • {{/if}} -
        • +
        • {{#if request.id}} {{#if repo.slug}} {{#link-to "request" repo request}} diff --git a/app/templates/request.hbs b/app/templates/request.hbs index 0f556e01..71c922c6 100644 --- a/app/templates/request.hbs +++ b/app/templates/request.hbs @@ -1,10 +1,10 @@ -
          +

          {{status}}{{#unless isAccepted}}: {{message}}{{/unless}}

          {{#if isPullRequest}} This request is based on the - #{{pullRequestNumber}} + #{{pullRequestNumber}} pull request. {{else}} This request is based on a commit {{format-commit commit}} by {{commit.authorName}} diff --git a/app/templates/requests.hbs b/app/templates/requests.hbs index 14a0bce2..603b2220 100644 --- a/app/templates/requests.hbs +++ b/app/templates/requests.hbs @@ -1,7 +1,7 @@ {{#if config.pro}}

          Travis Lint for clean .yml files - lint.travis-ci.org/{{repo.slug}} + lint.travis-ci.org/{{repo.slug}}

          {{/if}} diff --git a/app/templates/running-jobs.hbs b/app/templates/running-jobs.hbs index f4bf43f7..a04e187b 100644 --- a/app/templates/running-jobs.hbs +++ b/app/templates/running-jobs.hbs @@ -1,9 +1,9 @@ {{#if isLoaded}} {{#if controller.length}} {{#each job in controller}} -
          +
          {{#if job.repo.slug}} - + {{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}} {{/if}} @@ -17,7 +17,7 @@

          Duration: - + {{format-duration job.duration}}

          diff --git a/app/templates/settings/index.hbs b/app/templates/settings/index.hbs index eb576cb7..f373c693 100644 --- a/app/templates/settings/index.hbs +++ b/app/templates/settings/index.hbs @@ -15,7 +15,7 @@

          -

          +

          {{input value=settings.maximum_number_of_builds size="4" pattern='/^[0-9]+$/'}}

          - + Delete
          diff --git a/app/templates/top.hbs b/app/templates/top.hbs index fc6a6a93..2e7716b2 100644 --- a/app/templates/top.hbs +++ b/app/templates/top.hbs @@ -4,53 +4,52 @@
          -