Remove Deface

caffeinatedlabs · Mar 11, 2013 · e27e22b · e27e22b
1 parent 402c654
commit e27e22b
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 179 deletions.
diff --git a/auth/app/overrides/auth_admin_login_navigation_bar.rb b/auth/app/overrides/auth_admin_login_navigation_bar.rb
diff --git a/auth/app/overrides/auth_shared_login_bar.rb b/auth/app/overrides/auth_shared_login_bar.rb
diff --git a/core/app/views/admin/shared/_tabs.html.erb b/core/app/views/admin/shared/_tabs.html.erb
@@ -4,3 +4,4 @@
 <%= tab :reports %>
 <%= tab :configurations, :general_settings, :mail_methods, :tax_categories, :zones, :states, :payment_methods, :inventory_settings, :taxonomies, :shipping_methods, :trackers, :label => 'configuration' %>
 <%= tab :users %>
+<%= tab(:promotions) %>
diff --git a/core/app/views/checkout/_payment.html.erb b/core/app/views/checkout/_payment.html.erb
@@ -20,7 +20,15 @@
       <% end %>
     </ul>
     <br style="clear:both;" />
-    <div data-hook="coupon_code_field" data-hook></div>
+    <div data-hook="coupon_code_field" data-hook>
+      <% if Promotion.count > 0 %>
+      <p>
+        <%= form.label :coupon_code %><br />
+        <%= form.text_field :coupon_code %>
+      </p>
+      <% end %>
+
+    </div>
   </div>
 </fieldset>
 

diff --git a/core/app/views/layouts/admin.html.erb b/core/app/views/layouts/admin.html.erb
@@ -12,7 +12,17 @@
 
   <div id="header" data-hook>
 
-    <div data-hook="admin_login_navigation_bar"></div>
+    <div>
+    <% if current_user %>
+      <ul id="login-nav">
+        <li><%= t(:logged_in_as) %>: <%= current_user.email %></li>
+        <li><%= link_to t(:account), edit_user_path(current_user) %></li>
+        <li><%= link_to t(:logout), destroy_user_session_path %></li>
+        <li><%= link_to t(:store), products_path %></li>
+      </ul>
+    <% end %>
+    </div>
+
 
     <%= link_to image_tag(Spree::Config[:admin_interface_logo], :id => 'logo'), admin_path %>
     <h1><%= link_to t(:administration), admin_path %></h1>

diff --git a/core/lib/generators/spree/site/site_generator.rb b/core/lib/generators/spree/site/site_generator.rb
@@ -71,10 +71,6 @@ def configure_application
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
 
-      #loads application's deface view overrides
-      Dir.glob(File.join(File.dirname(__FILE__), "../app/overrides/*.rb")) do |c|
-        Rails.application.config.cache_classes ? require(c) : load(c)
-      end
     end
       APP
 

diff --git a/core/lib/spree_core.rb b/core/lib/spree_core.rb
@@ -46,7 +46,6 @@
 require 'spree_core/delegate_belongs_to'
 ActiveRecord::Base.send :include, DelegateBelongsTo
 
-require 'spree_core/theme_support'
 require 'spree_core/enumerable_constants'
 
 require 'spree_core/spree_custom_responder'

diff --git a/core/lib/spree_core/theme_support.rb b/core/lib/spree_core/theme_support.rb
diff --git a/core/lib/spree_core/theme_support/hook_listener.rb b/core/lib/spree_core/theme_support/hook_listener.rb
diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec
@@ -33,6 +33,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'activemerchant', '= 1.17.0'
   s.add_dependency 'rails', '>= 3.2.0'
   s.add_dependency 'kaminari', '>= 0.12.4'
-  s.add_dependency 'deface', '>= 0.7.0'
   s.add_dependency "bartt-ssl_requirement", "~> 1.4.2"
 end
diff --git a/promo/app/overrides/promo_admin_tabs.rb b/promo/app/overrides/promo_admin_tabs.rb
diff --git a/promo/app/overrides/promo_coupon_code_field.rb b/promo/app/overrides/promo_coupon_code_field.rb
diff --git a/promo/app/overrides/promo_product_properties.rb b/promo/app/overrides/promo_product_properties.rb