Skip to content

Commit

Permalink
Implement new base theme.
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexey Topolyanskiy authored and BDQ committed Jan 24, 2012
1 parent b974892 commit 4614bdd
Show file tree
Hide file tree
Showing 58 changed files with 1,645 additions and 496 deletions.
2 changes: 1 addition & 1 deletion auth/app/overrides/auth_shared_login_bar.rb
@@ -1,6 +1,6 @@
Deface::Override.new(:virtual_path => "spree/shared/_nav_bar",
:name => "auth_shared_login_bar",
:insert_after => "li#search-bar",
:insert_before => "li#search-bar",
:partial => "spree/shared/login_bar",
:disabled => false)

6 changes: 3 additions & 3 deletions auth/app/views/spree/checkout/registration.html.erb
@@ -1,13 +1,13 @@
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
<h2><%= t(:registration) %></h2>
<div id="registration">
<div id="account">
<div id="account" class="columns alpha eight">
<%= render :file => 'spree/user_sessions/new' %>
</div>
<% if Spree::Config[:allow_guest_checkout] %>
<div id="guest_checkout">
<div id="guest_checkout" class="columns omega eight">
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
<h2><%= t(:guest_user_account) %></h2>
<h6><%= t(:guest_user_account) %></h6>
<%= form_for @order, :url => spree.update_checkout_registration_path, :method => :put, :html => { :id => 'checkout_form_registration' } do |f| %>
<p>
<%= f.label :email, t(:email) %><br />
Expand Down
2 changes: 1 addition & 1 deletion auth/app/views/spree/shared/_login_bar.html.erb
Expand Up @@ -2,5 +2,5 @@
<li><%= link_to t(:my_account), spree.account_path %></li>
<li><%= link_to t(:logout), spree.destroy_user_session_path %></li>
<% else %>
<li><%= link_to t(:login), spree.login_path %></li>
<li id="link-to-login"><%= link_to t(:login), spree.login_path %></li>
<% end %>
24 changes: 13 additions & 11 deletions auth/app/views/spree/user_passwords/new.html.erb
@@ -1,13 +1,15 @@
<h2><%= t(:forgot_password) %></h2>
<div id="forgot-password">
<h6><%= t(:forgot_password) %></h6>

<p><%= t(:instructions_to_reset_password) %></p>
<p><%= t(:instructions_to_reset_password) %></p>

<%= form_for Spree::User.new, :as => :user, :url => spree.user_password_path do |f| %>
<p>
<%= f.label :email, t(:email) %><br />
<%= f.email_field :email %>
</p>
<p>
<%= f.submit t(:reset_password), :class => 'button primary' %>
</p>
<% end %>
<%= form_for Spree::User.new, :as => :user, :url => spree.user_password_path do |f| %>
<p>
<%= f.label :email, t(:email) %><br />
<%= f.email_field :email %>
</p>
<p>
<%= f.submit t(:reset_password), :class => 'button primary' %>
</p>
<% end %>
</div>
2 changes: 1 addition & 1 deletion auth/app/views/spree/user_registrations/new.html.erb
Expand Up @@ -3,7 +3,7 @@
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>

<div id="new-customer">
<h2><%= t(:new_customer) %></h2>
<h6><%= t(:new_customer) %></h6>

<div data-hook="signup">

Expand Down
2 changes: 1 addition & 1 deletion auth/app/views/spree/user_sessions/new.html.erb
Expand Up @@ -4,7 +4,7 @@
<% @body_id = 'login' %>
<div id="existing-customer">
<h2><%= t(:login_as_existing) %></h2>
<h6><%= t(:login_as_existing) %></h6>
<div data-hook="login">
<%= render :partial => 'spree/shared/login' %>
<%= t(:or) %> <%= link_to t(:create_a_new_account), spree.signup_path %> | <%= link_to t(:forgot_password), spree.new_user_password_path %>
Expand Down
9 changes: 4 additions & 5 deletions auth/app/views/spree/users/show.html.erb
@@ -1,18 +1,17 @@
<h1><%= accurate_title %></h1>
<h3><%= accurate_title %></h3>

<div data-hook="account_summary">
<dl id="user-info">
<dt><%= t(:email) %></dt>
<dd><%= @user.email %></dd>
<dd><%= @user.email %> (<%= link_to t(:edit), spree.edit_account_path %>)</dd>
</dl>
<p><%= link_to t(:edit), spree.edit_account_path %></p>
</div>

<div data-hook="account_my_orders">

<h2><%= t(:my_orders) %></h2>
<h3><%= t(:my_orders) %></h3>
<% if @orders.present? %>
<table class="order-summary" style="width:545px;">
<table class="order-summary">
<thead>
<tr>
<th><%= t(:order_number) %></th>
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/app/assets/images/creditcards/icons/visa.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/app/assets/images/store/cart.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

3 comments on commit 4614bdd

@runlevel5
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I 鉂わ笍 it

It seems to me the new credit card icons are not yet used in the theme. I would love to see them replace the ugly creditcard.gif at the payment checkout step.

At completed checkout screen, the Order Summary is not populated.

@oleksify
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I will check this out tomorrow. And of course will replace old credit icons with new one.

@runlevel5
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One more thing, would be great if you could style up the CCV page

Please sign in to comment.