diff --git a/assets/images/rgsoc.jpg b/assets/images/rgsoc.jpg new file mode 100644 index 00000000..fe383a95 Binary files /dev/null and b/assets/images/rgsoc.jpg differ diff --git a/assets/scripts/app/app.coffee b/assets/scripts/app/app.coffee index 998b0b2c..36dcd0c1 100644 --- a/assets/scripts/app/app.coffee +++ b/assets/scripts/app/app.coffee @@ -8,7 +8,6 @@ unless window.TravisApplication @store = Travis.Store.create( adapter: Travis.RestAdapter.create() ) - @store.loadMany(Travis.Sponsor, Travis.SPONSORS) @slider = new Travis.Slider() @pusher = new Travis.Pusher(Travis.config.pusher_key) if Travis.config.pusher_key diff --git a/assets/scripts/app/controllers/sidebar.coffee b/assets/scripts/app/controllers/sidebar.coffee index 6be0bca5..c1a37f2f 100644 --- a/assets/scripts/app/controllers/sidebar.coffee +++ b/assets/scripts/app/controllers/sidebar.coffee @@ -6,7 +6,6 @@ Travis.reopen init: -> @_super.apply this, arguments @tickables = [] - Travis.Ticker.create(target: this, interval: Travis.INTERVALS.sponsors) tick: -> tickable.tick() for tickable in @tickables @@ -44,51 +43,3 @@ Travis.reopen $.values(groups) ).property('length') - - SponsorsController: Em.ArrayController.extend - page: 0 - - arrangedContent: (-> - @get('shuffled').slice(@start(), @end()) - ).property('shuffled.length', 'page') - - shuffled: (-> - if content = @get('content') then $.shuffle(content) else [] - ).property('content.length') - - tick: -> - @set('page', if @isLast() then 0 else @get('page') + 1) - - pages: (-> - length = @get('content.length') - if length then parseInt(length / @get('perPage') + 1) else 1 - ).property('length') - - isLast: -> - @get('page') == @get('pages') - 1 - - start: -> - @get('page') * @get('perPage') - - end: -> - @start() + @get('perPage') - -Travis.DecksController = Travis.SponsorsController.extend - needs: ['sidebar'] - perPage: 1 - - init: -> - @_super.apply this, arguments - - @get('controllers.sidebar').tickables.push(this) - @set 'content', Travis.Sponsor.decks() - -Travis.LinksController = Travis.SponsorsController.extend - needs: ['sidebar'] - perPage: 6 - - init: -> - @_super.apply this, arguments - - @get('controllers.sidebar').tickables.push(this) - @set 'content', Travis.Sponsor.links() diff --git a/assets/scripts/app/models.coffee b/assets/scripts/app/models.coffee index 8eab6753..0b9b4c74 100644 --- a/assets/scripts/app/models.coffee +++ b/assets/scripts/app/models.coffee @@ -9,7 +9,6 @@ require 'models/hook' require 'models/job' require 'models/log' require 'models/repo' -require 'models/sponsor' require 'models/user' require 'models/worker' diff --git a/assets/scripts/app/models/sponsor.coffee b/assets/scripts/app/models/sponsor.coffee deleted file mode 100644 index 201173fb..00000000 --- a/assets/scripts/app/models/sponsor.coffee +++ /dev/null @@ -1,31 +0,0 @@ -require 'travis/model' - -@Travis.Sponsor = Travis.Model.extend - type: DS.attr('string') - url: DS.attr('string') - link: DS.attr('string') - _image: DS.attr('string') - - image: (-> - "/images/sponsors/#{@get('_image')}" - ).property('_image') - -Travis.Sponsor.reopenClass - decks: -> - @platinum().concat @gold() - - platinum: -> - platinum = @byType('platinum').toArray() - [sponsor] for sponsor in platinum - - gold: -> - gold = @byType('gold').toArray() - gold.splice(0, 2) while gold.length > 0 - - links: -> - @byType('silver') - - byType: -> - types = Array.prototype.slice.apply(arguments) - Travis.Sponsor.filter (sponsor) -> types.indexOf(sponsor.get('type')) != -1 - diff --git a/assets/scripts/app/store/rest_adapter.coffee b/assets/scripts/app/store/rest_adapter.coffee index b240e3d4..af3f092f 100644 --- a/assets/scripts/app/store/rest_adapter.coffee +++ b/assets/scripts/app/store/rest_adapter.coffee @@ -144,7 +144,3 @@ Travis.RestAdapter.map 'Travis.Job', { Travis.RestAdapter.map 'Travis.User', { _name: { key: 'name' } } - -Travis.RestAdapter.map 'Travis.Sponsor', { - _image: { key: 'image' } -} diff --git a/assets/scripts/app/templates/layouts/sidebar.hbs b/assets/scripts/app/templates/layouts/sidebar.hbs index 19df6128..f4a99114 100644 --- a/assets/scripts/app/templates/layouts/sidebar.hbs +++ b/assets/scripts/app/templates/layouts/sidebar.hbs @@ -2,7 +2,11 @@
  -{{view view.DecksView}} - -{{view view.LinksView}} - +

Support Rails Girls SoC

+ diff --git a/assets/scripts/app/templates/sponsors/decks.hbs b/assets/scripts/app/templates/sponsors/decks.hbs deleted file mode 100644 index 22eeb210..00000000 --- a/assets/scripts/app/templates/sponsors/decks.hbs +++ /dev/null @@ -1,19 +0,0 @@ -

{{t layouts.application.sponsors}}

- - - -

- - {{{t layouts.application.sponsors_link}}} - -

diff --git a/assets/scripts/app/templates/sponsors/links.hbs b/assets/scripts/app/templates/sponsors/links.hbs deleted file mode 100644 index b8bd6470..00000000 --- a/assets/scripts/app/templates/sponsors/links.hbs +++ /dev/null @@ -1,18 +0,0 @@ -
-

{{t layouts.application.sponsors}}

- - - -

- - {{{t layouts.application.sponsors_link}}} - -

-
- diff --git a/assets/scripts/app/views/sidebar.coffee b/assets/scripts/app/views/sidebar.coffee index 277cd3e5..5fe8bc26 100644 --- a/assets/scripts/app/views/sidebar.coffee +++ b/assets/scripts/app/views/sidebar.coffee @@ -25,18 +25,6 @@ 'active' if @get('activeTab') == 'jobs' ).property('activeTab') - DecksView: Em.View.extend - templateName: "sponsors/decks" - init: -> - @_super.apply this, arguments - @set 'controller', @get('controller').container.lookup('controller:decks') - - LinksView: Em.View.extend - templateName: "sponsors/links" - init: -> - @_super.apply this, arguments - @set 'controller', @get('controller').container.lookup('controller:links') - QueuesView: Em.View.extend templateName: 'queues/list' init: -> diff --git a/assets/scripts/data/sponsors.coffee b/assets/scripts/data/sponsors.coffee deleted file mode 100644 index 1d6daa59..00000000 --- a/assets/scripts/data/sponsors.coffee +++ /dev/null @@ -1,48 +0,0 @@ -@Travis.SPONSORS = [ - { id: '1', type: 'platinum', url: "http://www.wooga.com", image: "wooga-205x130.png" } - { id: '2', type: 'platinum', url: "http://bendyworks.com", image: "bendyworks-205x130.png" } - { id: '3', type: 'platinum', url: "http://cloudcontrol.com", image: "cloudcontrol-205x130.png" } - { id: '4', type: 'platinum', url: "http://xing.de", image: "xing-205x130.png" } - - { id: '5', type: 'gold', url: "http://heroku.com", image: "heroku-205x60.png" } - { id: '6', type: 'gold', url: "http://soundcloud.com", image: "soundcloud-205x60.png" } - { id: '7', type: 'gold', url: "http://nedap.com", image: "nedap-205x60.png" } - { id: '8', type: 'gold', url: "http://mongohq.com", image: "mongohq-205x60.png" } - { id: '9', type: 'gold', url: "http://zweitag.de", image: "zweitag-205x60.png" } - { id: '10', type: 'gold', url: "http://kanbanery.com", image: "kanbanery-205x60.png" } - { id: '11', type: 'gold', url: "http://ticketevolution.com", image: "ticketevolution-205x60.jpg" } - { id: '12', type: 'gold', url: "http://plan.io/travis", image: "planio-205x60.png" } - - { id: '13', type: 'silver', link: "Cobot: The one tool to run your coworking space" } - { id: '14', type: 'silver', link: "JumpstartLab: We build developers" } - { id: '15', type: 'silver', link: "Evil Martians: Agile Ruby on Rails development" } - { id: '16', type: 'silver', link: "Zendesk: Love your helpdesk" } - { id: '17', type: 'silver', link: "Stripe: Payments for developers" } - { id: '18', type: 'silver', link: "Basho: We make Riak!" } - { id: '19', type: 'silver', link: "Relevance: We deliver software solutions" } - { id: '20', type: 'silver', link: "Mindmatters: Software für Menschen" } - { id: '21', type: 'silver', link: "Amen: The best and worst of everything" } - { id: '22', type: 'silver', link: "Site5: Premium Web Hosting Solutions" } - { id: '23', type: 'silver', link: "Crowd Interactive: Leading Rails consultancy in Mexico" } - { id: '24', type: 'silver', link: "Atomic Object: Work with really smart people" } - { id: '25', type: 'silver', link: "Codeminer: smart services for your startup" } - { id: '26', type: 'silver', link: "Cloudant: grow into your data layer, not out of it" } - { id: '27', type: 'silver', link: "Gidsy: Explore, organize & book unique things to do!" } - { id: '28', type: 'silver', link: "5apps: Package & deploy HTML5 apps automatically" } - { id: '29', type: 'silver', link: "Meltmedia: We are Interactive Superheroes" } - { id: '30', type: 'silver', link: "Fingertips offers design and development services" } - { id: '31', type: 'silver', link: "Engine Yard: Build epic apps, let us handle the rest" } - { id: '32', type: 'silver', link: "Malwarebytes: Defeat Malware once and for all." } - { id: '33', type: 'silver', link: "Readmill: The best reading app on the iPad." } - { id: '34', type: 'silver', link: "Medidata: clinical tech improving quality of life" } - { id: '35', type: 'silver', link: "ESM: Japan's best agile Ruby/Rails consultancy" } - { id: '36', type: 'silver', link: "Twitter: instantly connects people everywhere" } - { id: '37', type: 'silver', link: "AGiLE ANiMAL: we <3 Travis CI." } - { id: '38', type: 'silver', link: "Tupalo: Discover, review & share local businesses." } - { id: '39', type: 'silver', link: "Pivotal Labs"} - { id: '40', type: 'silver', link: "Fiksu"} - { id: '41', type: 'silver', link: "Sauce Labs"} - { id: '42', type: 'silver', link: "Mogotest: Never be embarrassed by a visually broken site again."} - { id: '43', type: 'silver', link: "BusyConf: Conferences and Events Made Easy"} -] - diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee index 93e487ae..d79b382c 100644 --- a/assets/scripts/travis.coffee +++ b/assets/scripts/travis.coffee @@ -52,7 +52,7 @@ $.extend Travis, { name: 'mac_osx', display: 'Mac and OSX' } ] - INTERVALS: { sponsors: -1, times: -1, updateTimes: 1000 } + INTERVALS: { times: -1, updateTimes: 1000 } storage: (-> storage = null @@ -94,7 +94,6 @@ require 'templates' require 'views' require 'config/locales' -require 'data/sponsors' require 'travis/instrumentation' diff --git a/public/images/rgsoc.jpg b/public/images/rgsoc.jpg new file mode 100644 index 00000000..fe383a95 Binary files /dev/null and b/public/images/rgsoc.jpg differ