Permalink
Browse files

Fixed up formatting.

  • Loading branch information...
1 parent 5911607 commit 13cee4f7910b6ba7ec8a6236d6b8f75f6f8983e9 Finbarr Taylor committed Oct 12, 2012
View
8 Gemfile
@@ -3,12 +3,12 @@ source 'https://rubygems.org'
gem 'rails', '3.2.8'
group :development do
- gem 'sqlite3'
+ gem 'sqlite3'
end
group :production do
- gem 'thin'
- gem 'pg'
+ gem 'thin'
+ gem 'pg'
end
# Gems used only for assets and not required
@@ -27,4 +27,4 @@ gem 'jquery-rails'
gem 'amazon_flex_pay'
# Configuration File
-gem 'rails_config'
+gem 'rails_config'
View
6 app/assets/javascripts/preorder.js.coffee
@@ -20,9 +20,3 @@ Selfstarter =
$ ->
Selfstarter.init()
$("#email").focus()
-
-
-
-
-
-
View
13 app/assets/stylesheets/homepage/call_to_action.css.scss
@@ -1,4 +1,4 @@
-#reserve_container
+#reserve_container
{
float: left;
padding-top: 20px;
@@ -8,13 +8,13 @@
box-shadow: 0 -1px 0 #cbcbcb; /* drop shadow */
margin-top: 30px;
text-align: center;
- p
+ p
{
color: #8b8a8a;
font-size: 18px;
line-height: 1.4;
}
- #ship_date
+ #ship_date
{
color: #4c4c4c;
font-size: 22px;
@@ -24,7 +24,7 @@
margin: 0 auto;
width: 300px;
}
- #price
+ #price
{
color: #4c4c4c;
font-size: 22px;
@@ -35,7 +35,7 @@
width: 300px;
}
}
-.reserve
+.reserve
{
margin: 0 auto;
margin-top: 20px;
@@ -45,12 +45,11 @@
font-size: 32px;
}
-#middle_reserve
+#middle_reserve
{
padding: 60px;
h2
{
margin-bottom: 26px;
}
}
-
View
8 app/assets/stylesheets/homepage/press.css.scss
@@ -4,7 +4,7 @@
-moz-box-shadow: 0px 1px 3px 0px #acacac;
-webkit-box-shadow: 0px 1px 3px 0px #acacac;
box-shadow: 0px 1px 3px 0px #acacac;
- li
+ li
{
float: left;
margin: 0 16px;
@@ -39,9 +39,3 @@
width: 81px;
}
}
-
-
-
-
-
-
View
114 app/assets/stylesheets/homepage/stats.css.scss
@@ -1,47 +1,47 @@
-#backing
+#backing
{
float: left;
width: 383px;
margin: 20px 0 0 40px;
- #backers
- {
- border-left: none;
- padding-left: 0;
- ul
- {
- float: left;
- }
- }
- #days {
- border-right: none;
- padding-right: 0;
- }
- ul {
- text-align: center;
- }
- .stats
- {
- margin: 0 auto;
- color: #3f3f3f;
- font-size: 24px;
- display: block;
- display: inline-block;
- font-family: $primary_font, $secondary_font, $tertiary_font;
- border-right: 1px solid #cbcbcb;
- padding-right: 26px;
- padding-left: 26px;
- text-align: left;
- span
- {
- color: #868686;
- font-size: 18px;
- margin-top: 5px;
- display: block;
- font-family: $primary_font, $secondary_font, $tertiary_font;
- }
- }
+ #backers
+ {
+ border-left: none;
+ padding-left: 0;
+ ul
+ {
+ float: left;
+ }
+ }
+ #days {
+ border-right: none;
+ padding-right: 0;
+ }
+ ul {
+ text-align: center;
+ }
+ .stats
+ {
+ margin: 0 auto;
+ color: #3f3f3f;
+ font-size: 24px;
+ display: block;
+ display: inline-block;
+ font-family: $primary_font, $secondary_font, $tertiary_font;
+ border-right: 1px solid #cbcbcb;
+ padding-right: 26px;
+ padding-left: 26px;
+ text-align: left;
+ span
+ {
+ color: #868686;
+ font-size: 18px;
+ margin-top: 5px;
+ display: block;
+ font-family: $primary_font, $secondary_font, $tertiary_font;
+ }
+ }
}
-#progress_bg
+#progress_bg
{
margin-top: 20px;
float: left;
@@ -54,7 +54,7 @@
border-radius: 30px;
width: 383px;
background: #dbdbdb;
- #progress
+ #progress
{
height: 40px;
-moz-box-shadow: 0 1px 1px rgba(0,0,0,.59); /* drop shadow */
@@ -74,23 +74,23 @@
display: inline-block;
}
#progress_text
- {
- margin: 0 auto;
- width: 100%;
- font-size: 14pt;
- display: inline-block;
- color: white;
- text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.37);
- text-align: center;
- position: relative;
- top: -35px;
- }
+ {
+ margin: 0 auto;
+ width: 100%;
+ font-size: 14pt;
+ display: inline-block;
+ color: white;
+ text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.37);
+ text-align: center;
+ position: relative;
+ top: -35px;
+ }
}
.small
{
- height: 20px !important;
- #progress
- {
- height: 20px !important;
- }
-}
+ height: 20px !important;
+ #progress
+ {
+ height: 20px !important;
+ }
+}
View
35 app/controllers/preorder_controller.rb
@@ -2,41 +2,38 @@ class PreorderController < ApplicationController
skip_before_filter :verify_authenticity_token, :only => :ipn
def index
-
end
def checkout
-
end
def prefill
- @user = User.find_or_create_by_email!(params[:email])
- @order = Order.prefill!(:name => Settings.product_name, :price => Settings.price, :user_id => @user.id)
+ @user = User.find_or_create_by_email!(params[:email])
+ @order = Order.prefill!(:name => Settings.product_name, :price => Settings.price, :user_id => @user.id)
- # This is where all the magic happens. We create a multi-use token with Amazon, letting us charge the user's Amazon account
- # Then, if they confirm the payment, Amazon POSTs us their shipping details and phone number
- # From there, we save it, and voila, we got ourselves a preorder!
+ # This is where all the magic happens. We create a multi-use token with Amazon, letting us charge the user's Amazon account
+ # Then, if they confirm the payment, Amazon POSTs us their shipping details and phone number
+ # From there, we save it, and voila, we got ourselves a preorder!
@pipeline = AmazonFlexPay.multi_use_pipeline(@order.uuid, :transaction_amount => Settings.price, :global_amount_limit => Settings.charge_limit, :collect_shipping_address => "True", :payment_reason => Settings.payment_description)
- redirect_to @pipeline.url("#{request.scheme}://#{request.host}/preorder/postfill")
+ redirect_to @pipeline.url("#{request.scheme}://#{request.host}/preorder/postfill")
end
def postfill
- unless params[:callerReference].blank?
- @order = Order.postfill!(params)
- end
- # "A" means the user cancelled the preorder before clicking "Confirm" on Amazon Payments.
- if params['status'] != 'A' && @order.present?
- redirect_to :action => :share, :uuid => @order.uuid
- else
- redirect_to root_url
- end
+ unless params[:callerReference].blank?
+ @order = Order.postfill!(params)
+ end
+ # "A" means the user cancelled the preorder before clicking "Confirm" on Amazon Payments.
+ if params['status'] != 'A' && @order.present?
+ redirect_to :action => :share, :uuid => @order.uuid
+ else
+ redirect_to root_url
+ end
end
def share
- @order = Order.find_by_uuid(params[:uuid])
+ @order = Order.find_by_uuid(params[:uuid])
end
def ipn
end
-
end
View
28 app/helpers/preorder_helper.rb
@@ -1,17 +1,17 @@
module PreorderHelper
- def like_button(width = 70, show_faces = false)
- raw "<div class=\"fb-like\" data-send=\"false\" data-width=\"#{width}\" data-layout=\"box_count\" data-show-faces=\"true\"></div>"
- end
- def pin_it_button
- image_url = URI.encode("#{request.scheme}://#{request.host}#{image_path(Settings.product_image_url)}")
- raw "<a href='http://pinterest.com/pin/create/button/?url=#{encoded_root_url}&media=#{image_url}' class='pin-it-button' count-layout='vertical'><img border='0' src='//assets.pinterest.com/images/PinExt.png' title='Pin It' /></a>"
- end
- def tweet_button
- tweet_text = "I'm #{Settings.primary_stat_verb} number #{number_with_delimiter @order.number, :delimiter => ","} #{Settings.tweet_text}!"
- raw "<a href='https://twitter.com/share?url=/' id='tweet_button' class='twitter-share-button twitter-button' data-url=#{request.scheme}//#{request.host}' data-via='#{Settings.product_name}' data-lang='en' data-count='vertical' data-text=\"#{tweet_text}\">Tweet</a>"
- end
+ def like_button(width = 70, show_faces = false)
+ raw "<div class=\"fb-like\" data-send=\"false\" data-width=\"#{width}\" data-layout=\"box_count\" data-show-faces=\"true\"></div>"
+ end
+ def pin_it_button
+ image_url = URI.encode("#{request.scheme}://#{request.host}#{image_path(Settings.product_image_url)}")
+ raw "<a href='http://pinterest.com/pin/create/button/?url=#{encoded_root_url}&media=#{image_url}' class='pin-it-button' count-layout='vertical'><img border='0' src='//assets.pinterest.com/images/PinExt.png' title='Pin It' /></a>"
+ end
+ def tweet_button
+ tweet_text = "I'm #{Settings.primary_stat_verb} number #{number_with_delimiter @order.number, :delimiter => ","} #{Settings.tweet_text}!"
+ raw "<a href='https://twitter.com/share?url=/' id='tweet_button' class='twitter-share-button twitter-button' data-url=#{request.scheme}//#{request.host}' data-via='#{Settings.product_name}' data-lang='en' data-count='vertical' data-text=\"#{tweet_text}\">Tweet</a>"
+ end
- def encoded_root_url
- raw URI.encode "#{request.scheme}://#{request.host}/preorder"
- end
+ def encoded_root_url
+ raw URI.encode "#{request.scheme}://#{request.host}/preorder"
+ end
end
View
49 app/models/order.rb
@@ -2,51 +2,50 @@ class Order < ActiveRecord::Base
attr_accessible :address_one, :address_two, :city, :country, :number, :state, :status, :token, :transaction_id, :zip, :shipping, :tracking_number, :name, :price, :phone, :expiration
attr_readonly :uuid
before_validation :generate_uuid!, :on => :create
- belongs_to :user
+ belongs_to :user
self.primary_key = 'uuid'
-
# This is where we create our Caller Reference for Amazon Payments, and prefill some other information.
def self.prefill!(options = {})
- @order = Order.new
- @order.name = options[:name]
- @order.user_id = options[:user_id]
- @order.price = options[:price]
- @order.number = Order.next_order_number || 1
- @order.save!
+ @order = Order.new
+ @order.name = options[:name]
+ @order.user_id = options[:user_id]
+ @order.price = options[:price]
+ @order.number = Order.next_order_number || 1
+ @order.save!
- return @order
+ @order
end
# After authenticating with Amazon, we get the rest of the details
def self.postfill!(options = {})
- @order = Order.find_by_uuid!(options[:callerReference])
- @order.token = options[:tokenID]
- if !@order.token.blank?
- @order.address_one = options[:addressLine1]
- @order.address_two = options[:addressLine2]
- @order.city = options[:city]
- @order.state = options[:state]
+ @order = Order.find_by_uuid!(options[:callerReference])
+ @order.token = options[:tokenID]
+ if @order.token.present?
+ @order.address_one = options[:addressLine1]
+ @order.address_two = options[:addressLine2]
+ @order.city = options[:city]
+ @order.state = options[:state]
@order.status = options[:status]
- @order.zip = options[:zip]
- @order.phone = options[:phoneNumber]
- @order.country = options[:country]
+ @order.zip = options[:zip]
+ @order.phone = options[:phoneNumber]
+ @order.country = options[:country]
@order.expiration = Date.parse(options[:expiry])
- @order.save!
+ @order.save!
- @order
- end
+ @order
+ end
end
def self.next_order_number
- Order.order("number DESC").limit(1).first.number.to_i + 1 if Order.count > 0
+ Order.order("number DESC").limit(1).first.number.to_i + 1 if Order.count > 0
end
def generate_uuid!
- self.uuid = SecureRandom.hex(16)
+ self.uuid = SecureRandom.hex(16)
end
- # Implement these three methods to
+ # Implement these three methods to
def self.goal
Settings.project_goal
end
View
42 app/views/layouts/_footer.html.erb
@@ -1,22 +1,22 @@
<div class="footer">
- <div class="wrapper clearfix">
- <ul>
- <li>
- <a href="#" %>/faq">Help & FAQs</a>
- </li>
- <li>
- <a href="#">Press & Media</a>
- </li>
- <li>
- <a href="http://blog.lockitron.com/">Blog</a>
- </li>
- <li>
- <a href="#">Privacy Policy</a>
- </li>
- <li>
- <a href="/account/login">Login</a>
- </li>
- </ul>
- <p>© 2009-2012 Apigy Inc. All rights reserved. Patents pending.</p>
- </div>
- </div>
+ <div class="wrapper clearfix">
+ <ul>
+ <li>
+ <a href="#" %>/faq">Help & FAQs</a>
+ </li>
+ <li>
+ <a href="#">Press & Media</a>
+ </li>
+ <li>
+ <a href="http://blog.lockitron.com/">Blog</a>
+ </li>
+ <li>
+ <a href="#">Privacy Policy</a>
+ </li>
+ <li>
+ <a href="/account/login">Login</a>
+ </li>
+ </ul>
+ <p>© 2009-2012 Apigy Inc. All rights reserved. Patents pending.</p>
+ </div>
+</div>
View
22 app/views/layouts/application.html.erb
@@ -1,14 +1,14 @@
<!DOCTYPE html>
<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-<title><%= Settings.product_name %></title>
- <%= stylesheet_link_tag "application" %>
- <%= javascript_include_tag "application" %>
-</head>
-<body>
- <%= render 'header' %>
- <%= yield %>
- <%= render 'footer' %>
-</body>
+ <head>
+ <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+ <title><%= Settings.product_name %></title>
+ <%= stylesheet_link_tag "application" %>
+ <%= javascript_include_tag "application" %>
+ </head>
+ <body>
+ <%= render 'header' %>
+ <%= yield %>
+ <%= render 'footer' %>
+ </body>
</html>
View
4 app/views/preorder/_footer.html.erb
@@ -1,6 +1,6 @@
<div class="footer">
<div class="wrapper clearfix">
- <%= render 'copyright' %>
+ <%= render 'copyright' %>
</div>
</div>
-<%= render 'google_analytics' %>
+<%= render 'google_analytics' %>
View
4 app/views/preorder/_google_analytics.html.erb
@@ -1,5 +1,4 @@
<script type="text/javascript">
-
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '<%= Settings.google_id %>']);
_gaq.push(['_trackPageview']);
@@ -9,5 +8,4 @@
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
-
-</script>
+</script>
View
6 app/views/preorder/checkout.html.erb
@@ -5,8 +5,8 @@
<p>
Let your backers know how their payment information will be handled.
<br />
- <br />
- Enter your email address below.
+ <br />
+ Enter your email address below.
</p>
<%= form_tag "/preorder/prefill", :id => "checkout" do %>
<%= email_field_tag "email", nil, :placeholder => "hello@lockitron.com", :required => "required", :id => "email" %>
@@ -17,4 +17,4 @@
</div>
<%= render 'preorder/checkout/sidebar' %>
</div>
-</div>
+</div>
View
136 app/views/preorder/homepage/_faqs.html.erb
@@ -1,71 +1,69 @@
<div class="gray_background" id="faqs">
- <div class="wrapper clearfix">
- <h4>Frequently Asked Questions</h4>
- <ul>
- <li class=''>
- <details class=''>
- <summary class=''>How do I setup Amazon Payments?</summary>
- <p>You'll need to <a href="https://payments.amazon.com/sdui/sdui/accountstatus">create an Amazon Seller Central account</a>. Afterwards, get your access key and secret key from the "Integration" tab on your AWS account. <a href="https://payments.amazon.com/sdui/sdui/helpTab/Checkout-by-Amazon/Advanced-Integration-Help/Using-Your-Access-Key">Click here for more info</a>.
- <br />
- <br />
- Once you have your access key and secret key, head over to <code>config/settings.yml</code>. Change <code>amazon_access_key</code> and <code>amazon_secret_key</code> appropriately.</p>
- </details>
- </li>
- <li>
- <details class=''>
- <summary>Can I use another payments provider?</summary>
- <p>Of course. We haven't built in support for other providers, but we recommend that you take a look at <a href="https://stripe.com">Stripe</a> or <a href="https://wepay.com">WePay</a>.</p>
- </details>
- </li>
- <li>
- <details class=''>
- <summary>How do I edit the FAQ?</summary>
- <p>The faq is a partial located in <code>app/views/preorder/homepage/_faq.html.erb</code> The <code>summary</code> tag is the title, the <code>p</code> is the body. Make sure to add an <code>li</code> tag for each FAQ entry.</p>
- </details>
- </li>
- <li>
- <details class=''>
- <summary>How do I change around the images, product name, etc?</summary>
- <p>The best way is in <code>config/settings.yml</code>. It has variables for several different parts, the YouTube video, the product name, the call to action button ("Fork Now"), and several more.
- </p>
- </details>
- </li>
- </ul>
- <ul class='col2'>
- <li>
- <details class=''>
- <summary>How do I change the CSS?</summary>
- <p>Head over to <code>app/assets/stylesheets/variables.css.scss</code>. It makes it easy to change around the elements used throughout the HTML.
- <br />
- <br />
- Alternatively, you can dive right into the CSS, have a look at <code>app/assets/stylesheets/main.css.scss</code>.</p>
- </details>
- </li>
- <li class=''>
- <details class=''>
- <summary>Why did you release this?</summary>
- <p>Hardware startups are less welcome on Kickstarter than they were 6 months ago. We needed to roll our own kickstarter, so we did. Other hardware startups probably will too, so we made it easier for them by open sourcing our way of doing it.</p>
- </details>
- </li>
- <li class=''>
- <details class=''>
- <summary class=''>What software stack does this use?</summary>
- <p>It's a Ruby on Rails app that makes heavy use of SCSS, Kickstarter's wonderful <code>amazon_flex_pay</code> gem, and a hint of CoffeeScript.</p>
- </details>
- </li>
- <li class=''>
- <details class=''>
- <summary class=''>How do I deploy it?</summary>
- <p>We recommend using Heroku. We include a Procfile for you, so all you need to do is:
- <p>
- <p>Install the <a href="https://toolbelt.heroku.com/">Heroku Toolbelt</a></p>
- <p>Run <code>heroku create</code> in Selfstarter's folder</code></p>
- <p>Run <code>git push heroku master</code> in Selfstarter's folder</p>
- </p>
- </p>
- </details>
- </li>
- </ul>
- </div>
+ <div class="wrapper clearfix">
+ <h4>Frequently Asked Questions</h4>
+ <ul>
+ <li class=''>
+ <details class=''>
+ <summary class=''>How do I setup Amazon Payments?</summary>
+ <p>You'll need to <a href="https://payments.amazon.com/sdui/sdui/accountstatus">create an Amazon Seller Central account</a>. Afterwards, get your access key and secret key from the "Integration" tab on your AWS account. <a href="https://payments.amazon.com/sdui/sdui/helpTab/Checkout-by-Amazon/Advanced-Integration-Help/Using-Your-Access-Key">Click here for more info</a>.
+ <br />
+ <br />
+ Once you have your access key and secret key, head over to <code>config/settings.yml</code>. Change <code>amazon_access_key</code> and <code>amazon_secret_key</code> appropriately.</p>
+ </details>
+ </li>
+ <li>
+ <details class=''>
+ <summary>Can I use another payments provider?</summary>
+ <p>Of course. We haven't built in support for other providers, but we recommend that you take a look at <a href="https://stripe.com">Stripe</a> or <a href="https://wepay.com">WePay</a>.</p>
+ </details>
+ </li>
+ <li>
+ <details class=''>
+ <summary>How do I edit the FAQ?</summary>
+ <p>The faq is a partial located in <code>app/views/preorder/homepage/_faq.html.erb</code> The <code>summary</code> tag is the title, the <code>p</code> is the body. Make sure to add an <code>li</code> tag for each FAQ entry.</p>
+ </details>
+ </li>
+ <li>
+ <details class=''>
+ <summary>How do I change around the images, product name, etc?</summary>
+ <p>The best way is in <code>config/settings.yml</code>. It has variables for several different parts, the YouTube video, the product name, the call to action button ("Fork Now"), and several more.
+ </p>
+ </details>
+ </li>
+ </ul>
+ <ul class='col2'>
+ <li>
+ <details class=''>
+ <summary>How do I change the CSS?</summary>
+ <p>Head over to <code>app/assets/stylesheets/variables.css.scss</code>. It makes it easy to change around the elements used throughout the HTML.
+ <br />
+ <br />
+ Alternatively, you can dive right into the CSS, have a look at <code>app/assets/stylesheets/main.css.scss</code>.</p>
+ </details>
+ </li>
+ <li class=''>
+ <details class=''>
+ <summary>Why did you release this?</summary>
+ <p>Hardware startups are less welcome on Kickstarter than they were 6 months ago. We needed to roll our own kickstarter, so we did. Other hardware startups probably will too, so we made it easier for them by open sourcing our way of doing it.</p>
+ </details>
+ </li>
+ <li class=''>
+ <details class=''>
+ <summary class=''>What software stack does this use?</summary>
+ <p>It's a Ruby on Rails app that makes heavy use of SCSS, Kickstarter's wonderful <code>amazon_flex_pay</code> gem, and a hint of CoffeeScript.</p>
+ </details>
+ </li>
+ <li class=''>
+ <details class=''>
+ <summary class=''>How do I deploy it?</summary>
+ <p>We recommend using Heroku. We include a Procfile for you, so all you need to do is:
+ <p>
+ <p>Install the <a href="https://toolbelt.heroku.com/">Heroku Toolbelt</a></p>
+ <p>Run <code>heroku create</code> in Selfstarter's folder</code></p>
+ <p>Run <code>git push heroku master</code> in Selfstarter's folder</p>
+ </p>
+ </details>
+ </li>
+ </ul>
+ </div>
</div>
-
View
2 app/views/preorder/homepage/_key_points.html.erb
@@ -48,4 +48,4 @@
<p>
</div>
</div>
-</div>
+</div>
View
2 app/views/preorder/homepage/_middle_reserve.html.erb
@@ -3,4 +3,4 @@
<h2><%= Settings.ships %></h2>
<a href="/preorder/checkout" class="blue_button reserve"><%= Settings.middle_reserve_text %></a>
</div>
-</div>
+</div>
View
2 app/views/preorder/homepage/_other_points.html.erb
@@ -17,4 +17,4 @@
<p>Curabitur ac mi elit, nec tempor odio. Nam sollicitudin, sapien sit amet elementum pretium, turpis mi fermentum nisl, ac vehicula purus lacus non velit.</p>
</li>
</ul>
-</div>
+</div>
View
14 app/views/preorder/homepage/_press.html.erb
@@ -1,8 +1,8 @@
<div id='logos'>
- <ul class="wrapper clearfix">
- <li id="awesomeblog"><a href=""></a></li>
- <li id="coolpaper"><a href=""></a></li>
- <li id="nicemag"><a href=""></a></li>
- <li id="readcrunch"><a href=""></a></li>
- </ul>
-</div>
+ <ul class="wrapper clearfix">
+ <li id="awesomeblog"><a href=""></a></li>
+ <li id="coolpaper"><a href=""></a></li>
+ <li id="nicemag"><a href=""></a></li>
+ <li id="readcrunch"><a href=""></a></li>
+ </ul>
+</div>
View
29 app/views/preorder/share.html.erb
@@ -4,23 +4,22 @@
Hooray! You've just reserved a <%= Settings.product_name %>!
</h2>
<p>Congratulations, you're <%= Settings.primary_stat_verb %> number <span id="backer_number"><%= number_with_delimiter @order.number, :delimiter => "," %></span>, in supporting <%= Settings.product_name %>. Share the great news!</p>
- <br />
- <br />
+ <br />
+ <br />
<div id="share" class="clearfix">
- <div id='pin_button_container'>
- <%= pin_it_button %>
- </div>
- <div id='tweet_button_container'>
- <%= tweet_button %>
- </div>
- <div id='facebook_button_container'>
- <%= like_button(450, true) %>
- </div>
- </div>
- <div id="order_id">Reservation ID: <%= @order.uuid %>. You can bookmark or print this page for your records.</div>
+ <div id='pin_button_container'>
+ <%= pin_it_button %>
+ </div>
+ <div id='tweet_button_container'>
+ <%= tweet_button %>
+ </div>
+ <div id='facebook_button_container'>
+ <%= like_button(450, true) %>
+ </div>
+ </div>
+ <div id="order_id">Reservation ID: <%= @order.uuid %>. You can bookmark or print this page for your records.</div>
</div>
-
</div>
<%= render 'preorder/share/twitter_js' %>
-<%= render 'preorder/share/facebook_js' %>
+<%= render 'preorder/share/facebook_js' %>
View
16 config/routes.rb
@@ -1,11 +1,9 @@
Selfstarter::Application.routes.draw do
- root :to => "preorder#index"
-
- match '/preorder' => 'preorder#index'
- get "preorder/checkout"
- match '/preorder/share/:uuid' => 'preorder#share', :via => :get
- match '/preorder/ipn' => 'preorder#ipn', :via => :post
- match '/preorder/prefill' => 'preorder#prefill'
- match '/preorder/postfill' => 'preorder#postfill'
-
+ root :to => 'preorder#index'
+ match '/preorder' => 'preorder#index'
+ get 'preorder/checkout'
+ match '/preorder/share/:uuid' => 'preorder#share', :via => :get
+ match '/preorder/ipn' => 'preorder#ipn', :via => :post
+ match '/preorder/prefill' => 'preorder#prefill'
+ match '/preorder/postfill' => 'preorder#postfill'
end
View
1 test/functional/preorder_controller_test.rb
@@ -15,5 +15,4 @@ class PreorderControllerTest < ActionController::TestCase
get :get_excited
assert_response :success
end
-
end

0 comments on commit 13cee4f

Please sign in to comment.