spree_backend 2.0.4 → 2.0.5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +188,7 @@ files:
 - app/assets/stylesheets/admin/plugins/_powertip.scss
 - app/assets/stylesheets/admin/plugins/_select2.scss
 - app/assets/stylesheets/admin/plugins/_token-input.scss
+- app/assets/stylesheets/admin/sections/_alerts.scss
 - app/assets/stylesheets/admin/sections/_bulk_transfer.scss
 - app/assets/stylesheets/admin/sections/_edit_checkouts.scss
 - app/assets/stylesheets/admin/sections/_image_settings.scss
@@ -253,6 +254,7 @@ files:
 - app/helpers/spree/admin/orders_helper.rb
 - app/helpers/spree/admin/payments_helper.rb
 - app/helpers/spree/admin/products_helper.rb
+- app/helpers/spree/admin/stock_locations_helper.rb
 - app/helpers/spree/admin/stock_movements_helper.rb
 - app/helpers/spree/admin/tables_helper.rb
 - app/helpers/spree/admin/taxons_helper.rb
@@ -440,10 +442,9 @@ files:
 - app/views/spree/admin/variants/index.html.erb
 - app/views/spree/admin/variants/new.html.erb
 - app/views/spree/admin/variants/new.js.erb
-- app/views/spree/admin/zones/_country_member.html.erb
+- app/views/spree/admin/zones/_country_members.html.erb
 - app/views/spree/admin/zones/_form.html.erb
-- app/views/spree/admin/zones/_member_type.html.erb
-- app/views/spree/admin/zones/_state_member.html.erb
+- app/views/spree/admin/zones/_state_members.html.erb
 - app/views/spree/admin/zones/edit.html.erb
 - app/views/spree/admin/zones/index.html.erb
 - app/views/spree/admin/zones/new.html.erb
@@ -479,7 +480,6 @@ files:
 - vendor/assets/javascripts/jquery.alerts/jquery.alerts.js
 - vendor/assets/javascripts/jquery.cookie.js
 - vendor/assets/javascripts/jquery.delayedobserver.js
-- vendor/assets/javascripts/jquery.horizontalNav.js
 - vendor/assets/javascripts/jquery.jstree/jquery.jstree.js
 - vendor/assets/javascripts/jquery.jstree/themes/apple/bg.jpg
 - vendor/assets/javascripts/jquery.jstree/themes/apple/d.png
@@ -517,7 +517,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 2.0.0
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.

data/app/views/spree/admin/zones/_country_member.html.erb

@@ -1,5 +0,0 @@
-<li data-hook="country_member">
-  <%= f.hidden_field :zoneable_type, :value => 'Spree::Country' %>
-  <%= f.collection_select(:zoneable_id, @countries, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth'}) %>
-  <%= remove_nested f %>
-</li>

data/app/views/spree/admin/zones/_member_type.html.erb

@@ -1,19 +0,0 @@
-<%= javascript_tag "var #{type}_member='#{generate_template(zone_form, :zone_members, {:partial => type + "_member"})}';" %>
-
-
-<div id="<%= type %>_members" data-hook="member" class="omega six columns">
-  <fieldset class="no-border-bottom">
-    <legend align="center"><%= Spree.t(type) %></legend>
-
-    <ul id="ul-nested-<%= type.dasherize %>" class="member-list fields">
-      <% members_of_type = zone_form.object.zone_members.select { |member| member.zoneable_type && member.zoneable_type == "Spree::#{type.camelize}" } %>
-      <%= zone_form.fields_for :zone_members, members_of_type do |member_form| %>
-        <%= render :partial => "#{type}_member", :locals => { :f => member_form } %>
-      <% end %>
-    </ul>
-
-    <div data-hook="buttons" class="field align-center">
-      <%= button_link_to Spree.t("add_#{type}"), "##{type}_member", { :icon => 'icon-plus', :id => "nested-#{type.dasherize}" } %>
-    </div>
-  </fieldset>
-</div>

data/app/views/spree/admin/zones/_state_member.html.erb

@@ -1,5 +0,0 @@
-<li data-hook="state_member" class="field">
-  <%= f.hidden_field :zoneable_type, :value => 'Spree::State' %>
-  <%= f.collection_select(:zoneable_id, @states, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth'}) %>
-  <%= remove_nested f %>
-</li>

data/vendor/assets/javascripts/jquery.horizontalNav.js

@@ -1,141 +0,0 @@
-/**
- * jQuery Horizontal Navigation 1.0
- * https://github.com/sebnitu/horizontalNav
- *
- * By Sebastian Nitu - Copyright 2012 - All rights reserved
- * Author URL: http://sebnitu.com
- */
-(function($) {
-    
-    $.fn.horizontalNav = function(options) {
-                
-        // Extend our default options with those provided.
-        var opts = $.extend({}, $.fn.horizontalNav.defaults, options);
-        
-        return this.each(function () {
-        
-            // Save our object
-            var $this = $(this);
-            
-            // Build element specific options
-            // This lets me access options with this syntax: o.optionName
-            var o = $.meta ? $.extend({}, opts, $this.data()) : opts;
-            
-            // Save the wrapper. The wrapper is the element that
-            // we figure out what the full width should be
-            if ($this.is('ul')) {
-                var ul_wrap = $this.parent();
-            } else {
-                var ul_wrap = $this;
-            }
-            
-            // let's append a clearfixing element to the ul wrapper
-            ul_wrap.css({ 'zoom' : '1' }).append('<div class="clearHorizontalNav">');
-            $('.clearHorizontalNav').css({
-                'display' : 'block',
-                'overflow' : 'hidden',
-                'visibility' : 'hidden',
-                'width' : 0,
-                'height' : 0,
-                'clear' : 'both'
-            });
-            
-            // Grab elements we'll need and add some default styles
-            var ul = $this.is('ul') ? $this : ul_wrap.find('> ul'), // The unordered list element
-                li = ul.find('> li'), // All list items
-                li_last = li.last(), // Last list item
-                li_count = li.size(), // The number of navigation elements
-                li_a = li.find('> a'); // Remove padding from the links
-            
-            // If set to responsive, re-construct after every browser resize
-            if ( o.responsive === true ) {
-                // Only need to do this for IE7 and below
-                // or if we set tableDisplay to false
-                if ( (o.tableDisplay != true) || ($.browser.msie && parseInt($.browser.version, 10) <= 7) ) {
-                    resizeTrigger( _construct, o.responsiveDelay );
-                }
-            }
-            
-            // Initiate the plugin
-            _construct();
-            
-            // Returns the true inner width of an element
-            // Essentially it's the inner width without padding.
-            function trueInnerWidth(element) {
-                return element.innerWidth() - ( 
-                    parseInt(element.css('padding-left')) + parseInt(element.css('padding-right')) 
-                );
-            }
-            
-            // Call funcion on browser resize
-            function resizeTrigger(callback, delay) {
-                // Delay before function is called
-                delay = delay || 100;   
-                // Call function on resize
-                var resizeTimer;
-                $(window).resize(function() {
-                    clearTimeout(resizeTimer);
-                    resizeTimer = setTimeout(function() {
-                        callback();
-                    }, delay);
-                });
-            }
-            
-            // The heavy lifting of this plugin. This is where we
-            // find and set the appropriate widths for list items
-            function _construct() {
-            
-                if ( (o.tableDisplay != true) || ($.browser.msie && parseInt($.browser.version, 10) <= 7) ) {
-                    
-                    // IE7 doesn't support the "display: table" method
-                    // so we need to do it the hard way.
-                    
-                    // Add some styles
-                    ul.css({ 'float' : 'left' });
-                    li.css({ 'float' : 'left', 'width' : 'auto' });
-                    li_a.css({ 'padding-left' : 0, 'padding-right' : 0 });
-                    
-                    // Grabbing widths and doing some math
-                    var ul_width = trueInnerWidth(ul),
-                        ul_width_outer = ul.outerWidth(true),
-                        ul_width_extra = ul_width_outer - ul_width,
-                        
-                        full_width = trueInnerWidth(ul_wrap),
-                        extra_width = (full_width - ul_width_extra) - ul_width,
-                        li_padding = Math.floor( extra_width / li_count );
-                    
-                    // Cycle through the list items and give them widths
-                    li.each(function(index) {
-                        var li_width = trueInnerWidth( $(this) );
-                        $(this).css({ 'width' : (li_width + li_padding) + 'px' });
-                    });
-                    
-                    // Get the leftover pixels after we set every itms width
-                    var li_last_width = trueInnerWidth(li_last) + ( (full_width - ul_width_extra) - trueInnerWidth(ul) );
-                    // I hate to do this but for some reason Firefox (v13.0) and IE are always
-                    // one pixel off when rendering. So this is a quick fix for that.
-                    if ($.browser.mozilla || $.browser.msie) {
-                        li_last_width = li_last_width - 1;
-                    }
-                    // Add the leftovers to the last navigation item
-                    li_last.css({ 'width' : li_last_width + 'px' });
-                
-                } else {
-                    // Every modern browser supports the "display: table" method
-                    // so this is the best way to do it for them.
-                    ul.css({ 'display' : 'table', 'float' : 'none', 'width' : '100%' });
-                    li.css({ 'display' : 'table-cell', 'float' : 'none' });
-                }
-            }
-        
-        }); // @end of return this.each()
-
-    };
-    
-    $.fn.horizontalNav.defaults = {
-        responsive : true,
-        responsiveDelay : 100,
-        tableDisplay : true
-    };
-    
-})(jQuery);