From a43eb1916c5aa82070e66295b1f2d33d1b4cb0a4 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Fri, 6 Jul 2012 14:39:06 +0200 Subject: [PATCH] add "loading ..." --- .../javascripts/app/templates/builds/show.hbs | 4 +- .../app/templates/repositories/list.hbs | 6 +-- .../app/templates/repositories/show.hbs | 15 ++++--- assets/javascripts/lib/mocks.coffee | 2 +- assets/stylesheets/application.sass | 8 ++++ assets/stylesheets/left/repositories.sass | 12 ++---- public/javascripts/application.js | 2 +- public/stylesheets/application.css | 41 +++++++++++-------- 8 files changed, 51 insertions(+), 39 deletions(-) diff --git a/assets/javascripts/app/templates/builds/show.hbs b/assets/javascripts/app/templates/builds/show.hbs index a2a491e3..d464e27a 100644 --- a/assets/javascripts/app/templates/builds/show.hbs +++ b/assets/javascripts/app/templates/builds/show.hbs @@ -1,6 +1,8 @@ {{#with view}} {{#unless build.isLoaded}} - Loading ... +
+ Loading +
{{else}}
diff --git a/assets/javascripts/app/templates/repositories/list.hbs b/assets/javascripts/app/templates/repositories/list.hbs index 37977aea..ee1b36e8 100644 --- a/assets/javascripts/app/templates/repositories/list.hbs +++ b/assets/javascripts/app/templates/repositories/list.hbs @@ -18,8 +18,8 @@ {{/view}} {{else}} -
  • -

    Loading

    -
    • +
    + Loading +
    {{/each}}
      diff --git a/assets/javascripts/app/templates/repositories/show.hbs b/assets/javascripts/app/templates/repositories/show.hbs index 153e655b..25c9a402 100644 --- a/assets/javascripts/app/templates/repositories/show.hbs +++ b/assets/javascripts/app/templates/repositories/show.hbs @@ -1,7 +1,5 @@ -{{#with view.repository}} - {{#unless isLoaded}} - Loading ... - {{else}} +{{#if view.repository.isLoaded}} + {{#with view.repository}}

      {{slug}} @@ -15,5 +13,10 @@
    • {{stats.forks}}

    - {{/unless}} -{{/with}} + {{/with}} +{{else}} +
    + Loading +
    +{{/if}} + diff --git a/assets/javascripts/lib/mocks.coffee b/assets/javascripts/lib/mocks.coffee index 574ec50f..812fa792 100644 --- a/assets/javascripts/lib/mocks.coffee +++ b/assets/javascripts/lib/mocks.coffee @@ -1,6 +1,6 @@ require 'ext/jquery' -responseTime = 0 +responseTime = 10000 repositories = [ { id: 1, owner: 'travis-ci', name: 'travis-core', slug: 'travis-ci/travis-core', build_ids: [1, 2], last_build_id: 1, last_build_number: 1, last_build_result: 0, last_build_finished_at: '2012-07-02T00:00:00Z', description: 'Description of travis-core' }, diff --git a/assets/stylesheets/application.sass b/assets/stylesheets/application.sass index cc4f2407..2a2bb63f 100644 --- a/assets/stylesheets/application.sass +++ b/assets/stylesheets/application.sass @@ -72,6 +72,14 @@ pre::-webkit-scrollbar-thumb:horizontal .display display: block !important +.loading + padding: 15px 25px 0 0 + span + padding-right: 25px + font-size: 13px + color: #aaa + background: inline-image('spinner.gif') no-repeat right 4px + .emoji vertical-align: middle width: 20px diff --git a/assets/stylesheets/left/repositories.sass b/assets/stylesheets/left/repositories.sass index a76a65c9..43f6e11e 100644 --- a/assets/stylesheets/left/repositories.sass +++ b/assets/stylesheets/left/repositories.sass @@ -45,13 +45,7 @@ height: 100% background: no-repeat center left - &.loading - font-size: 13px - color: #999 +#repositories + .loading + padding: 15px 25px 15px 30px background-color: #fff - - p - display: inline-block - margin: 0 0 0 -10px - padding-right: 25px - background: inline-image('spinner.gif') no-repeat right 6px diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 6c9f99a6..a30df4c0 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1 +1 @@ -minispade.register('templates', "(function() {Ember.TEMPLATES['builds/list']=Ember.Handlebars.compile(\"{{#with view}}\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n\\n \\n {{#each build in builds}}\\n {{#view Travis.Views.BuildsItemView contextBinding=\\\"build\\\"}}\\n \\n \\n \\n \\n \\n \\n \\n {{/view}}\\n {{/each}}\\n \\n
    {{t builds.name}}{{t builds.commit}}{{t builds.message}}{{t builds.duration}}{{t builds.finished_at}}
    {{number}}{{formatCommit commit}}{{{formatMessage commit.message short=\\\"true\\\"}}}{{formatDuration duration}}{{formatTime finished_at}}
    \\n\\n

    \\n \\n

    \\n{{/with}}\\n\");Ember.TEMPLATES['builds/show']=Ember.Handlebars.compile(\"{{#with view}}\\n {{#unless build.isLoaded}}\\n Loading ...\\n {{else}}\\n
    \\n
    \\n
    \\n
    {{t builds.name}}
    \\n
    {{build.number}}
    \\n
    {{t builds.finished_at}}
    \\n
    {{formatTime build.finished_at}}
    \\n
    {{t builds.duration}}
    \\n
    {{formatDuration build.duration}}
    \\n
    \\n\\n
    \\n
    {{t builds.commit}}
    \\n
    {{formatCommit build.commit}}
    \\n {{#if commit.compareUrl}}\\n
    {{t builds.compare}}
    \\n
    {{pathFrom build.commit.compareUrl}}
    \\n {{/if}}\\n {{#if commit.authorName}}\\n
    {{t builds.author}}
    \\n
    {{build.commit.authorName}}
    \\n {{/if}}\\n {{#if commit.committerName}}\\n
    {{t builds.committer}}
    \\n
    {{build.commit.committerName}}
    \\n {{/if}}\\n
    \\n\\n
    {{t builds.message}}
    \\n
    {{{formatMessage build.commit.message}}}
    \\n\\n {{#unless isMatrix}}\\n
    {{t builds.config}}
    \\n
    {{formatConfig build.config}}
    \\n {{/unless}}\\n
    \\n\\n {{#if build.isMatrix}}\\n {{view Travis.Views.JobsView jobsBinding=\\\"requiredJobs\\\" required=\\\"true\\\"}}\\n {{view Travis.Views.JobsView jobsBinding=\\\"allowedFailureJobs\\\"}}\\n {{else}}\\n {{view Travis.Views.LogView contextBinding=\\\"build.jobs.firstObject\\\"}}\\n {{/if}}\\n
    \\n {{/unless}}\\n{{/with}}\\n\");Ember.TEMPLATES['jobs/list']=Ember.Handlebars.compile(\"{{#with view}}\\n {{#if jobs.length}}\\n {{#if required}}\\n \\n \\n {{else}}\\n
    \\n {{t jobs.build_matrix}}\\n
    \\n \\n {{/if}}\\n \\n \\n {{#each build.configKeys}}\\n \\n {{/each}}\\n \\n \\n \\n {{#each job in jobs}}\\n {{#view Travis.Views.JobsItemView contextBinding=\\\"job\\\"}}\\n \\n \\n \\n \\n {{#each configValues}}\\n \\n {{/each}}\\n \\n {{/view}}\\n {{/each}}\\n \\n
    \\n {{t jobs.allowed_failures}}\\n \\n
    {{this}}
    {{number}}{{formatDuration duration}}{{formatTime finished_at}}{{this}}
    \\n\\n {{#unless required}}\\n
    \\n
    {{t \\\"jobs.allowed_failures\\\"}}
    \\n
    \\n

    \\n Allowed Failures are items in your build matrix that are allowed to\\n fail without causing the entire build to be shown as failed. This lets you add\\n in experimental and preparatory builds to test against versions or\\n configurations that you are not ready to officially support.\\n

    \\n

    \\n You can define allowed failures in the build matrix as follows:\\n

    \\n 
     matrix:\\n    allow_failures:\\n      - rvm: ruby-head
    \\n
    \\n
    \\n {{/unless}}\\n {{/if}}\\n{{/with}}\\n\");Ember.TEMPLATES['jobs/log']=Ember.Handlebars.compile(\"
    {{{formatLog log.body}}}
    \\n\\n{{#if sponsor.name}}\\n

    \\n {{t builds.messages.sponsored_by}}\\n {{sponsor.name}}\\n

    \\n{{/if}}\\n\");Ember.TEMPLATES['jobs/show']=Ember.Handlebars.compile(\"{{#with view}}\\n {{#if job.isLoaded}}\\n
    \\n
    \\n
    \\n
    Job
    \\n
    {{job.number}}
    \\n
    {{t jobs.finished_at}}
    \\n
    {{formatTime job.finished_at}}
    \\n
    {{t jobs.duration}}
    \\n
    {{formatDuration job.duration}}
    \\n
    \\n\\n
    \\n
    {{t jobs.commit}}
    \\n
    {{formatCommit commit}}
    \\n {{#if commit.compareUrl}}\\n
    {{t jobs.compare}}
    \\n
    {{pathFrom commit.compareUrl}}
    \\n {{/if}}\\n {{#if commit.authorName}}\\n
    {{t jobs.author}}
    \\n
    {{commit.authorName}}
    \\n {{/if}}\\n {{#if commit.committerName}}\\n
    {{t jobs.committer}}
    \\n
    {{commit.committerName}}
    \\n {{/if}}\\n
    \\n\\n
    {{t jobs.message}}
    \\n
    {{formatMessage commit.message}}
    \\n
    {{t jobs.config}}
    \\n
    {{formatConfig job.config}}
    \\n
    \\n\\n {{view Travis.Views.LogView contextBinding=\\\"job\\\"}}}\\n
    \\n {{/if}}\\n{{/with}}\\n\");Ember.TEMPLATES['layouts/home']=Ember.Handlebars.compile(\"
    \\n {{outlet top}}\\n
    \\n\\n
    \\n
    \\n \\n
    \\n\\n \\n\\n
    \\n {{outlet left}}\\n
    \\n
    \\n\\n
    \\n {{outlet main}}\\n\\n {{outlet tabs}}\\n\\n
    \\n {{outlet tab}}\\n
    \\n\\n
    \\n {{outlet right}}\\n
    \\n
    \\n\\n\");Ember.TEMPLATES['layouts/sidebar']=Ember.Handlebars.compile(\"\\n {{t layouts.application.fork_me}}\\n\\n\\n
    \\n
     \\n
    \\n\\n{{view templateName=\\\"sponsors/decks\\\"}}\\n{{view templateName=\\\"workers/list\\\" id=\\\"workers\\\"}}\\n{{view templateName=\\\"queues/list\\\" id=\\\"queues\\\"}}\\n{{view templateName=\\\"sponsors/links\\\"}}\\n\\n
    \\n

    {{t layouts.about.alpha}}

    \\n

    {{{t layouts.about.messages.alpha}}}

    \\n
    \\n\\n
    \\n

    {{t layouts.about.join}}

    \\n \\n
    \\n\");Ember.TEMPLATES['layouts/simple']=Ember.Handlebars.compile(\"
    \\n {{outlet top}}\\n
    \\n\\n
    \\n {{outlet main}}\\n
    \\n\\n\");Ember.TEMPLATES['layouts/top']=Ember.Handlebars.compile(\"\\n

    Travis

    \\n    \\n\\n\\n\");Ember.TEMPLATES['profile/hooks']=Ember.Handlebars.compile(\"{{#if content.length}}\\n \\n{{else}}\\n

    Please wait while we sync with GitHub

    \\n{{/if}}\\n\\n\");Ember.TEMPLATES['profile/show']=Ember.Handlebars.compile(\"

    {{name}}

    \\n\\n\\n
    \\n
    \\n {{t profiles.show.github}}:\\n
    \\n
    \\n {{login}}\\n
    \\n
    \\n {{t profiles.show.email}}:\\n
    \\n
    \\n {{email}}\\n
    \\n
    \\n {{t profiles.show.token}}:\\n
    \\n
    \\n {{token}}\\n
    \\n
    \\n\\n

    \\n {{{t profiles.show.messages.notice}}}\\n

    \\n\\n

    {{t profiles.show.your_locale}}

    \\n
    \\n \\n \\n
    \\n\\n

    {{t profiles.show.your_repos}}

    \\n

    \\n {{{t profiles.show.message.your_repos}}}\\n \\n {{{t profiles.show.message.config}}}\\n \\n

    \\n\\n{{outlet hooks}}\\n\");Ember.TEMPLATES['queues/list']=Ember.Handlebars.compile(\"{{#each queue in queues}}\\n

    {{t queue}}: {{queue.name}}

    \\n \\n{{/each}}\\n\");Ember.TEMPLATES['repositories/list']=Ember.Handlebars.compile(\"