Skip to content
This repository has been archived by the owner on Nov 11, 2017. It is now read-only.

Commit

Permalink
renamed other events to opportunities. sorting designers/developers a…
Browse files Browse the repository at this point in the history
…lphabetically
  • Loading branch information
Dan Croak committed Feb 3, 2011
1 parent 30774a2 commit 46f13b3
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 17 deletions.
4 changes: 4 additions & 0 deletions app/controllers/opportunities_controller.rb
@@ -0,0 +1,4 @@
class OpportunitiesController < MobileController
def index
end
end
4 changes: 0 additions & 4 deletions app/controllers/other_events_controller.rb

This file was deleted.

4 changes: 2 additions & 2 deletions app/models/registration.rb
Expand Up @@ -12,11 +12,11 @@ def school_name
end

def self.developers
where(:role => "Developer").order("created_at desc")
where(:role => "Developer").order("name asc")
end

def self.designers
where(:role => "Designer").order("created_at desc")
where(:role => "Designer").order("name asc")
end

def self.stats
Expand Down
@@ -1,6 +1,6 @@
<div data-role="page" id="offers">
<div data-role="page" id="opportunities">
<div data-role="header">
<h1>Other Events</h1>
<h1>Opportunities</h1>
</div>

<ul data-role="listview">
Expand All @@ -12,6 +12,6 @@
<li><a href="http://www.momoboston.com/about-2/mobile-learn-a-day-of-mobile-development-and-design/">Mobile Camp</a></li>
<li><a href="http://www.nech2011.com/">North-East College Hackathon</a></li>
<li><a href="http://workshops.thoughtbot.com/">Ruby on Rails Workshops</a></li>
<li><a href="http://www.hcp.com/summer/">Summer@Highland</a></li>
<li><a href="http://www.hcp.com/summer/">Summer at Highland Capital</a></li>
</ul>
</div>
8 changes: 4 additions & 4 deletions app/views/registrations/new.mobile.erb
Expand Up @@ -4,10 +4,10 @@
</div>

<ul data-role="listview">
<li><%= link_to "Talks", talks_path %></li>
<li><%= link_to "Students", "#students" %></li>
<li><%= link_to "Startups", startups_path %></li>
<li><%= link_to "Other Events", other_events_path %></li>
<li><%= link_to "Talks", talks_path %></li>
<li><%= link_to "Students", "#students" %></li>
<li><%= link_to "Startups", startups_path %></li>
<li><%= link_to "Opportunities", opportunities_path %></li>
</ul>
</div>

Expand Down
2 changes: 1 addition & 1 deletion config/routes.rb
Expand Up @@ -6,7 +6,7 @@
resources :designers, :only => [:index]
resources :developers, :only => [:index]
resources :startups, :only => [:index, :show]
resources :other_events, :only => [:index]
resources :opportunities, :only => [:index]
resources :schools, :only => [:index]

match 'pages/what' => 'talks#index'
Expand Down
@@ -1,13 +1,13 @@
Feature: Mobile user views other events
Feature: Mobile user views opportunities

In order to learn about other things of interest to me
As a student at the event
I want to view other events for me

@akephalos @mobile
Scenario: Student views offers on mobile phone
Scenario: Student views opportunities on mobile phone
When I go to the home page
And I follow "Other Events"
And I follow "Opportunities"
Then I should see "Boston Javascript Group"
And I should see "Boston Ruby Group"
And I should see "Code for America"
Expand All @@ -16,3 +16,4 @@ Feature: Mobile user views other events
And I should see "Mobile Camp"
And I should see "North-East College Hackathon"
And I should see "Ruby on Rails Workshops"
And I should see "Summer at Highland Capital"

0 comments on commit 46f13b3

Please sign in to comment.