spree 0.7.1 → 0.8.0

data/app/views/checkout/new.html.erb

@@ -1,6 +0,0 @@
-<div id="checkout">
-  <h1><%= t("checkout")%></h1>
-  <% form_for(:checkout_presenter, :url => "/orders/#{@order.number}/complete", :html => { :method => :put, :id => 'checkout_form'}) do |f| %>
-    <%= render :partial => 'form', :locals => {:f => f} %>
-  <% end %>
-</div>

data/app/views/shared/_address.html.erb

@@ -1,35 +0,0 @@
-<%
-# HACK - in_place_editor field works only with instance variables and not local variables  
-# See http://dev.rubyonrails.org/ticket/3094 for details
-
-@address = address 
-%>
-
-<table cellpadding="0" cellspacing="0">
-  <tr>
-    <td><%="#{address.firstname} #{address.lastname}" %></td>
-  </tr>
-  <tr>
-    <td>
-       <%= address.address1 %>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <%= address.address2 %>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <%= "#{address.city}, #{address.state_name || address.state.abbr} #{address.zipcode}" %>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <%= address.country.name %>       
-    </td>
-  </tr>
-  <tr>
-    <td><%= address.phone %></td>
-  </tr>
-</table>

data/app/views/shared/_form_address.html.erb

@@ -1,46 +0,0 @@
-<table>
-  <tr>
-    <td width="150"><%= t("first_name") %></td>
-    <td><%= f.text_field :address_firstname %></td>
-  </tr>
-  <tr>
-    <td><%= t("last_name") %></td>
-    <td><%= f.text_field :address_lastname %></td>
-  </tr>
-  <tr>
-    <td><%= t("street_address") %></td>
-    <td><%= f.text_field :address_address1 %></td>
-  </tr>
-  <tr>
-    <td><%= t("street_address_2") %></td>
-    <td><%= f.text_field :address_address2 %></td>
-  </tr>
-  <tr>
-    <td><%= t("city") %></td>
-    <td><%= f.text_field :address_city %></td>
-  </tr>
-  <tr id="address_states_row">
-		<%= render :partial => "shared/states", :locals => {:presenter_type => presenter_type} %>
-  </tr>
-  <tr>
-    <td><%= t("zip") %></td>
-    <td><%= f.text_field :address_zipcode %></td>
-  </tr>
-  <tr>
-    <td><%= t("country") %></td>
-    <td>
-			<%= f.collection_select :address_country_id, @countries, :id, :name, {}, {:style => 'width:150px;'} %>
-			<%= observe_field "#{presenter_type}_presenter_address_country_id", 
-			  :url => {:action => :country_changed },
-	    	:update => 'address_states_row',
-	  		:on => "changed",
-		 		:with => "#{presenter_type}_presenter[address_country_id]",
-				:loading => "$('address_states_row').childElements()[1].update('Loading...');"
-			%>       
-    </td>
-  </tr>
-  <tr>
-    <td><%= t("phone") %></td>
-    <td><%= f.text_field :address_phone %></td>
-  </tr>
-</table>

data/app/views/shared/_states.html.erb

@@ -1,14 +0,0 @@
-<td><%= t("state") %></td>
-<td>
-	<% if @states.length == 0 %>
-			<%= text_field("#{presenter_type}_presenter", :address_state_name, :autocomplete => 'off') %>
-	<% else %>
-		<%= collection_select("#{presenter_type}_presenter", 
-		                      :address_state_id, 
-		                      @states, 
-		                      :id, 
-		                      :name, 
-		                      {:include_blank => true}, 
-		                      {:style=> 'width:150px;'}) %>
-	<% end %>
-</td>

data/app/views/users/index.html.erb

@@ -1,21 +0,0 @@
-<h1><%= t("listing_users") %></h1>
-
-<table class="admin-report">
-  <thead>
-    <th><%= t("user") %></th>
-    <th><%= t("action") %></th>
-  </thead>
-  <tbody>
-    <%- @users.each do |user|%>
-    <tr>
-      <td width="350px"><%=link_to user.email, object_url(user) %></td>
-      <td>
-	<%=link_to t('edit'), edit_object_url(user) %> |
-	<%=link_to t('destroy'), object_url(user), :confirm => t('are_you_sure_you_want_to_delete_this_record'), :method => :delete %></td>
-    </tr>
-    <% end %>
-  </tbody>
-</table>
-<br/>
-
-<%= link_to t('new_user'), new_object_url %>

data/lib/authenticated_system.rb

@@ -1,124 +0,0 @@
-module AuthenticatedSystem
-  protected
-    # Returns true or false if the user is logged in.
-    # Preloads @current_user with the user model if they're logged in.
-    def logged_in?
-      current_user != :false
-    end
-
-    # Accesses the current user from the session.  Set it to :false if login fails
-    # so that future calls do not hit the database.
-    def current_user
-      @current_user ||= (login_from_session || login_from_basic_auth || login_from_cookie || :false)
-    end
-
-    # Store the given user id in the session.
-    def current_user=(new_user)
-      session[:user_id] = (new_user.nil? || new_user.is_a?(Symbol)) ? nil : new_user.id
-      @current_user = new_user || :false
-    end
-
-    # Check if the user is authorized
-    #
-    # Override this method in your controllers if you want to restrict access
-    # to only a few actions or if you want to check if the user
-    # has the correct rights.
-    #
-    # Example:
-    #
-    #  # only allow nonbobs
-    #  def authorized?
-    #    current_user.login != "bob"
-    #  end
-    def authorized?
-      logged_in?
-    end
-
-    # Filter method to enforce a login requirement.
-    #
-    # To require logins for all actions, use this in your controllers:
-    #
-    #   before_filter :login_required
-    #
-    # To require logins for specific actions, use this in your controllers:
-    #
-    #   before_filter :login_required, :only => [ :edit, :update ]
-    #
-    # To skip this in a subclassed controller:
-    #
-    #   skip_before_filter :login_required
-    #
-    def login_required
-      return if authorized? 
-      redirect_to login_path
-    end
-
-    # Redirect as appropriate when an access request fails.
-    #
-    # The default action is to redirect to the login screen.
-    #
-    # Override this method in your controllers if you want to have special
-    # behavior in case the user is not authorized
-    # to access the requested action.  For example, a popup window might
-    # simply close itself.
-    def access_denied
-      respond_to do |format|
-        format.html do    
-          if logged_in?
-            flash[:error] = t("authorization_failure")
-            redirect_to '/account/authorization_failure'
-            next
-          else
-            store_location
-            redirect_to login_path   
-            next
-          end
-        end
-        format.xml do
-          request_http_basic_authentication 'Web Password'
-        end
-      end
-    end
-
-    # Store the URI of the current request in the session.
-    #
-    # We can return to this location by calling #redirect_back_or_default.
-    def store_location
-      session[:return_to] = request.request_uri
-    end
-
-    # Redirect to the URI stored by the most recent store_location call or
-    # to the passed default.
-    def redirect_back_or_default(default)
-      redirect_to(session[:return_to] || default)
-      session[:return_to] = nil
-    end
-
-    # Inclusion hook to make #current_user and #logged_in?
-    # available as ActionView helper methods.
-    def self.included(base)
-      base.send :helper_method, :current_user, :logged_in?
-    end
-
-    # Called from #current_user.  First attempt to login by the user id stored in the session.
-    def login_from_session
-      self.current_user = User.find(session[:user_id]) if session[:user_id]
-    end
-
-    # Called from #current_user.  Now, attempt to login by basic authentication information.
-    def login_from_basic_auth
-      authenticate_with_http_basic do |email, password|
-        self.current_user = User.authenticate(email, password)
-      end
-    end
-
-    # Called from #current_user.  Finaly, attempt to login by an expiring token in the cookie.
-    def login_from_cookie
-      user = cookies[:auth_token] && User.find_by_remember_token(cookies[:auth_token])
-      if user && user.remember_token?
-        user.remember_me
-        cookies[:auth_token] = { :value => user.remember_token, :expires => user.remember_token_expires_at }
-        self.current_user = user
-      end
-    end
-end

data/lib/authenticated_test_helper.rb

@@ -1,10 +0,0 @@
-module AuthenticatedTestHelper
-  # Sets the current user in the session from the user fixtures.
-  def login_as(user)
-    @request.session[:user_id] = user ? users(user).id : nil
-  end
-
-  def authorize_as(user)
-    @request.env["HTTP_AUTHORIZATION"] = user ? ActionController::HttpAuthentication::Basic.encode_credentials(users(user).email, 'test') : nil
-  end
-end

data/public/stylesheets/checkout.css

@@ -1,25 +0,0 @@
-div#checkout p { clear: both; margin-bottom: 15px; }
-  div#checkout p label { float: left; width: 150px; position: relative; top: 5px; }
-    div#checkout p span.req { color: red; margin-left: 2px; position: relative; top: -3px; }                
-    div#methods p label { float:none; width: 150px; position: relative; top: 5px; }
-  div#checkout p label#use_billing { top: 0px; }
-  div#checkout p input, div#checkout p select { margin-left: 150px; width: 200px; margin: 0px; }
-  div#checkout p label.error { color: red; clear: both; margin: 0px 0px 5px 150px; top: 0px; font-size: 11px; }
-
-div#checkout div { clear: both; }
-div#shipping div.inner, div#creditcard div.inner, div#shipping_method div.inner, div#confirm_order div.inner { display: none; }
-  div#checkout h2 { height: 22px; background-color: #CCF; border: 1px solid black; padding: 5px; font-size: 18px; margin: 5px 0px; }
-  div.checkout_disabled h2 { color: #AFAFAF; }
-
-div#checkout div#creditcard p select { width: 75px; }
-div#checkout p input#validate_billing,
-div#checkout p input#validate_shipping,
-div#checkout p input#select_shipping_method,
-div#checkout p input#confirm_payment,
-div#checkout div#confirm_order div.inner input { cursor: pointer; width: 100px; }
-
-div#checkout div#bdisplay, div#checkout div#sdisplay { float: left; width: 300px; clear: right; }
-div.clear { clear: both; }
-
-div#errorExplanation h2 { height: 22px; background-color: #FF0000; border: none; padding: 5px; font-size: 18px; margin: 5px 0px; }
-form#checkout_form div.fieldWithErrors { clear: none; }

data/public/stylesheets/fullscreen.css

@@ -1,63 +0,0 @@
-@import 'spree.css';
-
-#fullscreen {
-  float: none;
-  margin: 0 auto;
-  text-align: center;  
-}
-
-#fullscreen #main {
-  width: 330px;
-  float: none;
-  margin: 0 auto !important;
-  text-align: left;
-  padding: 0;
-}
-
-#header {
-  background: #000;
-  text-align: center;
-  height: 100px;
-}
-
-#header h1 {
-  margin: 0 auto;
-width: 268px; /*  width: 150px;*/
-}
-
-#flash-errors {
-  background: #a22;
-  color: #fff;
-}
-
-/*
- *=FORMS
- */
-
-
-
-/*
- *=ACCOUNT/LOGIN
- */
- 
-#body-account {
-  color: #333;
-}
-
-#body-account .btns {
-  background: transparent;
-  text-align: right;
-  border: none;
-}
-
-/*
- *=MISC BOXES
- */
-
-.little-box {
-  width: 320px;
-  margin: 50px 0 0 0;
-  text-shadow: 2px 2px #fff;
-  background: #f7f7f7;
-  border: 5px solid #fff;
-}

data/public/stylesheets/orders/_controller.css

@@ -1,82 +0,0 @@
-#notice  {
-	border: 1px solid black;
-	padding: .5em;
-	margin-bottom: 2em;
-	background-color: #F0F0F0;
-}
-
-#error  {
-	border: 1px solid black;
-	padding: .5em;
-	margin-bottom: 2em;
-	background-color: #EFB3CC;
-}
-
-#shopping_cart ul,
-#shopping_cart li {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-#cart_notice {
-  border: 2px solid #58A986;
-  background: #B2FFD3;
-  padding: 3px;
-}
-
-/* ================ begin: cart-summary ================  */
-
-.cart-summary {
-  border-collapse:  collapse;
-  border: solid 1px;
-  margin-top: 10px;
-  margin-bottom: 10px;
-  font-size: 12px;
-}
-
-.cart-summary th {
-  font-weight: bold;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 8px;
-  padding-right: 8px;
-  border-bottom: 1px solid
-}
-
-.cart-summary td {
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 8px;
-  padding-right: 8px;
-}
-
-.cart-summary a {
-  text-decoration: underline;
-}
-/* ================ end: cart-summary ================  */
-
-/* ================ begin: subtotal ================  */
-#subtotal {
-  float:right;
-  text-align:right;
-  width:250px;
-  padding:5px 15px 15px 0pt;
-}
-
-#subtotal h3 {
-  font-size:16px;
-  font-weight:bold;
-}
-
-#subtotal-row {
-  border-top: solid 1px;
-  margin-top: 10px;
-}
-/* ================ end: subtotal ================  */
-
-.date-range {
-  width: 100px;
-}
-
-

data/public/stylesheets/prototypes/_controller.css

@@ -1,9 +0,0 @@
-#properties li{
-	list-style: none;
-	float: left;
-	width: 120px; 
-	height: 4em;
-	margin-right: 5px;
-	font-size: .9em;
-	line-height: 1.2em;
-}