Skip to content

Commit

Permalink
fixed typos
Browse files Browse the repository at this point in the history
  • Loading branch information
astraelly committed Apr 2, 2012
2 parents 26992fb + a863dbc commit 10e96db
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 8 deletions.
File renamed without changes.
File renamed without changes.
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,4 @@
class HallController < ApplicationController class HallsController < ApplicationController
def index def index
end end


Expand Down
2 changes: 0 additions & 2 deletions app/helpers/hall_helper.rb

This file was deleted.

2 changes: 2 additions & 0 deletions app/helpers/halls_helper.rb
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,2 @@
module HallsHelper
end
3 changes: 3 additions & 0 deletions app/views/halls/_jqmobile_scripts.html.haml
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,3 @@
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0.1/jquery.mobile-1.0.1.min.css" />
<script src="http://code.jquery.com/jquery-1.6.4.min.js"></script>
<script src="http://code.jquery.com/mobile/1.0.1/jquery.mobile-1.0.1.min.js"></script>
1 change: 1 addition & 0 deletions app/views/halls/index.html.haml
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1 @@
=render :partial => "jqmobile_scripts"
3 changes: 2 additions & 1 deletion app/views/halls/show.html.haml
Original file line number Original file line Diff line number Diff line change
@@ -1,2 +1,3 @@
%head= @script @script
=render :partial => "jqmobile_scripts"


3 changes: 2 additions & 1 deletion config/routes.rb
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,6 @@
EnegeryManagement::Application.routes.draw do EnegeryManagement::Application.routes.draw do
resources :hall, :only => [:index, :show]
resources :halls, :only => [:index, :show]


# The priority is based upon order of creation: # The priority is based upon order of creation:
# first created -> highest priority. # first created -> highest priority.
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper' require 'spec_helper'


describe HallController do describe HallsController do
before :each do before :each do
@hall = Factory(:hall, { :name => 'Test Hall', :key => '12345678' }) @hall = Factory(:hall, { :name => 'Test Hall', :key => '12345678' })
@feature = Factory(:green_feature, { :name => 'Fluorescence', :content => 'This hall has fluorescent light bulbs' }) @feature = Factory(:green_feature, { :name => 'Fluorescence', :content => 'This hall has fluorescent light bulbs' })
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
# Specs in this file have access to a helper object that includes # Specs in this file have access to a helper object that includes
# the HallHelper. For example: # the HallHelper. For example:
# #
# describe HallHelper do # describe HallsHelper do
# describe "string concat" do # describe "string concat" do
# it "concats two strings with spaces" do # it "concats two strings with spaces" do
# helper.concat_strings("this","that").should == "this that" # helper.concat_strings("this","that").should == "this that"
# end # end
# end # end
# end # end
describe HallHelper do describe HallsHelper do
pending "add some examples to (or delete) #{__FILE__}" pending "add some examples to (or delete) #{__FILE__}"
end end

0 comments on commit 10e96db

Please sign in to comment.