spree_backend 2.0.13 → 2.1.0

data/app/views/spree/admin/stock_movements/_form.html.erb

@@ -1,14 +1,13 @@
 <div data-hook="admin_stock_movements_form_fields" class="row">
-  <div class="alpha twelve columns">
+  <div class="alpha four columns">
     <%= f.field_container :quantity do %>
       <%= f.label :quantity, Spree.t(:quantity) %>
-      <%= f.text_field :quantity %>
+      <%= f.text_field :quantity, :class => 'fullwidth' %>
     <% end %>
     <%= f.field_container :stock_item_id do %>
       <%= f.label :stock_item_id, Spree.t(:stock_item_id) %>
-      <%= f.text_field 'stock_item_id', :class => 'fullwidth' %>
+      <%= collection_select 'stock_movement', 'stock_item_id', stock_location.stock_items, :id, :variant_name,
+        { selected: @stock_movement.stock_item_id }, class: 'select2 fullwidth' %>
     <% end %>
   </div>
 </div>
-
-<%= render :partial => "spree/admin/variants/autocomplete", :formats => :js %>

data/app/views/spree/admin/stock_movements/index.html.erb

@@ -30,9 +30,7 @@
   <tbody>
     <% @stock_movements.each do |stock_movement|%>
       <tr id="<%= spree_dom_id stock_movement %>" data-hook="admin_stock_movements_index_rows" class="<%= cycle('odd', 'even')%>">
-        <td class="align-center">
-          <%= display_variant(stock_movement) %>
-        </td>
+        <td class="align-center"><%= stock_movement.stock_item.variant_name %></td>
         <td class="align-center"><%= stock_movement.quantity %></td>
         <td class="align-center"><%= pretty_originator(stock_movement) %></td>
       </tr>
@@ -42,7 +40,7 @@
 <% else %>
   <div class="alpha twelve columns no-objects-found">
     <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/stock_movement')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_stock_location_stock_movement_path(@stock_location) %>!
+    <%= link_to Spree.t(:add_one), spree.new_admin_stock_movement_path %>!
   </div>
 <% end %>
 

data/app/views/spree/admin/stock_transfers/show.html.erb

@@ -1,7 +1,7 @@
 <%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:stock_transfer) %>
+  <%= Spree.t('stock_transfer') %> (<%= @stock_transfer.number %>)
 <% end %>
 
 <% content_for :page_actions do %>

data/app/views/spree/admin/taxons/edit.html.erb

@@ -10,7 +10,7 @@
   </li>
 <% end %>
 
-<%# Because otherwise the form would attempt to use to_param of @taxon %>
+<% # Because otherwise the form would attempt to use to_param of @taxon %>
 <% form_url = admin_taxonomy_taxon_path(@taxonomy.id, @taxon.id) %>
 <%= form_for [:admin, @taxonomy, @taxon], :method => :put, :url => form_url, :html => { :multipart => true } do |f| %>
   <%= render 'form', :f => f %>

data/app/views/spree/admin/variants/_autocomplete.js.erb

@@ -12,14 +12,59 @@
 
       <h6 class="variant-name">{{variant.name}}</h6>
 
+      <ul class='variant-data'>
+        <li class='variant-sku'><strong><%= Spree.t(:sku) %>:</strong> {{variant.sku}}</li>
+      </ul>
+
       {{#if variant.option_values}}
-        {{#each variant.option_values}}
-          <strong>{{this.option_type_presentation}}:</strong> {{this.presentation}}<br>
-        {{/each}}
+        <ul class='variant-options'>
+          {{#each variant.option_values}}
+            <li><strong>{{this.option_type.presentation}}:</strong> {{this.presentation}}</li>
+          {{/each}}
+        </ul>
       {{/if}}
-      
-      <strong><%= Spree.t(:sku) %>:</strong> {{variant.sku}}
 
     </div>
   </div>
-</script>
+</script>
+
+<script type='text/template' id='variant_autocomplete_stock_template'>
+  <fieldset>
+    <legend align="center"><%= Spree.t(:select_stock) %></legend>
+      <table class="stock-levels" data-hook="stock-levels">
+        <colgroup>
+          <col style="width: 30%;" />
+          <col style="width: 40%;" />
+          <col style="width: 20%;" />
+          <col style="width: 10%;" />
+        </colgroup>
+        <thead>
+          <th><%= Spree.t(:location) %></th>
+          <th><%= Spree.t(:count_on_hand) %></th>
+          <th><%= Spree.t(:quantity) %></th>
+          <th class="actions"></th>
+        </thead>
+        <tbody>
+          {{#each variant.stock_items}}
+            <tr>
+              <td>{{this.stock_location_name}}</td>
+              {{#if this.available}}
+                <td>
+                  {{this.count_on_hand}}
+                  {{#if this.backorderable}} (<%= Spree.t(:backorders_allowed) %>) {{/if}}
+                </td>
+                <td>
+                  <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
+                </td>
+                <td class="actions">
+                  <button class="add_variant no-text icon-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add"></button>
+                </td>
+              {{else}}
+                <td><%= Spree.t(:out_of_stock) %></td>
+                <td>0</td>
+              {{/if}}
+            </tr>
+          {{/each}}
+        </tbody>
+  </fieldset>
+</script>

data/app/views/spree/layouts/admin.html.erb

@@ -1,9 +1,9 @@
 <!doctype html>
-<!--[if lt IE 7 ]> <html class="ie ie6" lang="en"> <![endif]-->
-<!--[if IE 7 ]>    <html class="ie ie7" lang="en"> <![endif]-->
-<!--[if IE 8 ]>    <html class="ie ie8" lang="en"> <![endif]-->
-<!--[if IE 9 ]>    <html class="ie ie9" lang="en"> <![endif]-->
-<!--[if gt IE 9]><!--><html lang="en"><!--<![endif]-->
+<!--[if lt IE 7 ]> <html class="ie ie6" lang="<%= I18n.locale %>"> <![endif]-->
+<!--[if IE 7 ]>    <html class="ie ie7" lang="<%= I18n.locale %>"> <![endif]-->
+<!--[if IE 8 ]>    <html class="ie ie8" lang="<%= I18n.locale %>"> <![endif]-->
+<!--[if IE 9 ]>    <html class="ie ie9" lang="<%= I18n.locale %>"> <![endif]-->
+<!--[if gt IE 9]><!--><html lang="<%= I18n.locale %>"><!--<![endif]-->
   <head data-hook="admin_inside_head">
     <%= render :partial => 'spree/admin/shared/head' %>
   </head>
@@ -30,91 +30,21 @@
 
       <%= render :partial => 'spree/admin/shared/alert', :collection => session[:alerts] %>
 
-      <header id="header" data-hook>
-
-        <div class="container">
-          <figure data-hook="logo-wrapper" class="columns five">
-            <%= link_to image_tag(Spree::Config[:admin_interface_logo], :id => 'logo'), spree.admin_path %>
-          </figure>
-
-          <nav data-hook="admin_login_navigation_bar" class="columns eleven"></nav>
-        </div>
-
-      </header>
-
-      <nav id="admin-menu" data-hook>
-        <div class="container">
-          <div class="sixteen columns main-menu-wrapper">
-            <ul data-hook="admin_tabs" class="fullwidth-menu">
-              <%= render :partial => 'spree/admin/shared/tabs' %>
-            </ul>
-          </div>
-        </div>
-      </nav>
-
-      <% if content_for?(:sub_menu) %>
-        <nav id="sub-menu" data-hook>
-          <div class="container">
-
-              <div class="sixteen columns">
-                <%= yield :sub_menu %>
-              </div>
-
-          </div>
-        </nav>
-      <% end %>
-
-      <% if content_for?(:page_title) || content_for?(:page_actions) %>
-        <div id="content-header" data-hook>
-          <div class="container">
-
-              <div class="sixteen columns">
-                <div class="block-table">
-                  <% if content_for?(:page_title) %>
-                    <div class="table-cell">
-                      <h1 class="page-title <%= yield :page_title_classes %>"><%= yield :page_title %></h1>
-                    </div>
-                  <% end %>
-                  <% if content_for?(:page_actions) %>
-                    <div class="page-actions table-cell toolbar" data-hook="toolbar">
-                      <ul class="inline-menu">
-                        <%= yield :page_actions %>
-                      </ul>
-                    </div>
-                  <% end %>
-                </div>
-              </div>
-
-          </div>
-        </div>
-      <% end %>
+      <%= render :partial => 'spree/admin/shared/header' %>
+      <%= render :partial => 'spree/admin/shared/menu' %>
+      <%= render :partial => 'spree/admin/shared/sub_menu' %>
+      <%= render :partial => 'spree/admin/shared/content_header' %>
 
       <div class="container">
         <div class="row">
           <div class="<%= 'with-sidebar ' if content_for?(:sidebar) %>" id="content" data-hook>
-            <% if content_for?(:table_filter) %>
-              <div id="table-filter" data-hook class="<%= if content_for?(:sidebar) then 'twelve' else 'sixteen' end %> columns">
-                <fieldset>
-                  <legend align="center"><%= yield :table_filter_title %></legend>
-                  <%= yield :table_filter %>
-                </fieldset>
-              </div>
-            <% end %>
+            <%= render :partial => 'spree/admin/shared/table_filter' %>
 
             <div class="<%= if content_for?(:sidebar) then 'twelve' else 'sixteen' end %> columns">
               <%= yield %>
             </div>
 
-            <% if content_for?(:sidebar) %>
-              <aside id="sidebar" data-hook class="four columns">
-
-                <% if content_for?(:sidebar_title) %>
-                  <h5 class="sidebar-title"><span><%= yield :sidebar_title %></span></h5>
-                <% end %>
-
-                <%= yield :sidebar %>
-              </aside>
-            <% end %>
+            <%= render :partial => 'spree/admin/shared/sidebar' %>
           </div>
         </div>
       </div>

data/config/routes.rb

@@ -1,5 +1,5 @@
 Spree::Core::Engine.routes.draw do
-  root :to => 'home#index'
+  get '/admin', :to => 'admin/orders#index', :as => :admin
 
   namespace :admin do
     get '/search/users', :to => "search#users", :as => :search_users
@@ -42,7 +42,6 @@ Spree::Core::Engine.routes.draw do
           post :update_positions
         end
       end
-      resources :variants_including_master, :only => [:update]
     end
 
     get '/variants/search', :to => "variants#search", :as => :search_variants
@@ -144,6 +143,7 @@ Spree::Core::Engine.routes.draw do
       end
     end
 
+    resources :stock_movements
     resources :stock_items, :only => [:create, :update, :destroy]
     resources :tax_rates
     resource  :tax_settings
@@ -154,6 +154,4 @@ Spree::Core::Engine.routes.draw do
       post :testmail, :on => :collection
     end
   end
-
-  match '/admin', :to => 'admin/orders#index', :as => :admin
 end

data/lib/spree/backend/engine.rb

@@ -33,7 +33,6 @@ module Spree
           jqPlot/excanvas.min.js
           admin/images/new.js
           jquery.jstree/themes/apple/*
-          fontawesome-webfont*
         ]
       end
 

data/vendor/assets/javascripts/css_browser_selector_dev.js

@@ -1,156 +1,129 @@
 /*
-CSS Browser Selector 0.6.1
+CSS Browser Selector 0.6.2
 Originally written by Rafael Lima (http://rafael.adm.br)
 http://rafael.adm.br/css_browser_selector
 License: http://creativecommons.org/licenses/by/2.5/
 
 Co-maintained by:
 https://github.com/verbatim/css_browser_selector
-
 */
 
-showLog=true;
-function log(m) {if ( window.console && showLog ) {console.log(m); }  }
-
-function css_browser_selector(u)
-	{
-	var	uaInfo = {},
-		screens = [320, 480, 640, 768, 1024, 1152, 1280, 1440, 1680, 1920, 2560],
-		allScreens = screens.length,
-		ua=u.toLowerCase(),
-		is=function(t) { return RegExp(t,"i").test(ua);  },
-		version = function(p,n) 
-			{ 
-			n=n.replace(".","_"); var i = n.indexOf('_'),  ver=""; 
-			while (i>0) {ver += " "+ p+n.substring(0,i);i = n.indexOf('_', i+1);} 
-			ver += " "+p+n; return ver; 
-			},
-		g='gecko',
-		w='webkit',
-		c='chrome',
-		f='firefox',
-		s='safari',
-		o='opera',
-		m='mobile',
-		a='android',
-		bb='blackberry',
-		lang='lang_',
-		dv='device_',
-		html=document.documentElement,
-		b=	[
-		
-			// browser
-			(!(/opera|webtv/i.test(ua))&&/msie\s(\d+)/.test(ua))?('ie ie'+(/trident\/4\.0/.test(ua) ? '8' : RegExp.$1))
-			:is('firefox/')?g+ " " + f+(/firefox\/((\d+)(\.(\d+))(\.\d+)*)/.test(ua)?' '+f+RegExp.$2 + ' '+f+RegExp.$2+"_"+RegExp.$4:'')	
-			:is('gecko/')?g
-			:is('opera')?o+(/version\/((\d+)(\.(\d+))(\.\d+)*)/.test(ua)?' '+o+RegExp.$2 + ' '+o+RegExp.$2+"_"+RegExp.$4 : (/opera(\s|\/)(\d+)\.(\d+)/.test(ua)?' '+o+RegExp.$2+" "+o+RegExp.$2+"_"+RegExp.$3:''))
-			:is('konqueror')?'konqueror'
-	
-			:is('blackberry') ? 
-				( bb + 
-					( /Version\/(\d+)(\.(\d+)+)/i.test(ua)
-						? " " + bb+ RegExp.$1 + " "+bb+ RegExp.$1+RegExp.$2.replace('.','_')
-						: (/Blackberry ?(([0-9]+)([a-z]?))[\/|;]/gi.test(ua) 
-							? ' ' +bb+RegExp.$2 + (RegExp.$3?' ' +bb+RegExp.$2+RegExp.$3:'')
-							: '')
-					)
-				) // blackberry
-	
-			:is('android') ? 
-				(  a +
-					( /Version\/(\d+)(\.(\d+))+/i.test(ua)
-						? " " + a+ RegExp.$1 + " "+a+ RegExp.$1+RegExp.$2.replace('.','_')
-						: '')
-					+ (/Android (.+); (.+) Build/i.test(ua)
-						? ' '+dv+( (RegExp.$2).replace(/ /g,"_") ).replace(/-/g,"_")
-						:''	)
-				) //android
-	
-			:is('chrome')?w+   ' '+c+(/chrome\/((\d+)(\.(\d+))(\.\d+)*)/.test(ua)?' '+c+RegExp.$2 +((RegExp.$4>0) ? ' '+c+RegExp.$2+"_"+RegExp.$4:''):'')	
-			
-			:is('iron')?w+' iron'
-			
-			:is('applewebkit/') ? 
-				( w+ ' '+ s + 
-					( /version\/((\d+)(\.(\d+))(\.\d+)*)/.test(ua)
-						?  ' '+ s +RegExp.$2 + " "+s+ RegExp.$2+RegExp.$3.replace('.','_')
-						:  ( / Safari\/(\d+)/i.test(ua) 
-							? 
-							( (RegExp.$1=="419" || RegExp.$1=="417" || RegExp.$1=="416" || RegExp.$1=="412" ) ? ' '+ s + '2_0' 
-								: RegExp.$1=="312" ? ' '+ s + '1_3'
-								: RegExp.$1=="125" ? ' '+ s + '1_2'
-								: RegExp.$1=="85" ? ' '+ s + '1_0'
-								: '' )
-							:'')
-						)
-				) //applewebkit	
-		
-			:is('mozilla/')?g
-			:''
-			
-			// mobile
-			,is("android|mobi|mobile|j2me|iphone|ipod|ipad|blackberry|playbook|kindle|silk")?m:''
-			
-			// os/platform
-			,is('j2me')?'j2me'
-			:is('ipad|ipod|iphone')?  
-				( 
-					(
-						/CPU( iPhone)? OS (\d+[_|\.]\d+([_|\.]\d+)*)/i.test(ua)  ?
-						'ios' + version('ios',RegExp.$2) : ''
-					) + ' ' + ( /(ip(ad|od|hone))/gi.test(ua) ?	RegExp.$1 : "" )
-				) //'iphone'
-			//:is('ipod')?'ipod'
-			//:is('ipad')?'ipad'
-			:is('playbook')?'playbook'
-			:is('kindle|silk')?'kindle'
-			:is('playbook')?'playbook'
-			:is('mac')?'mac'+ (/mac os x ((\d+)[.|_](\d+))/.test(ua) ?    ( ' mac' + (RegExp.$2)  +  ' mac' + (RegExp.$1).replace('.',"_")  )     : '' )
-			:is('win')?'win'+
-					(is('windows nt 6.2')?' win8'
-					:is('windows nt 6.1')?' win7'
-					:is('windows nt 6.0')?' vista'
-					:is('windows nt 5.2') || is('windows nt 5.1') ? ' win_xp' 
-					:is('windows nt 5.0')?' win_2k'
-					:is('windows nt 4.0') || is('WinNT4.0') ?' win_nt'
-					: ''
-					) 
-			:is('freebsd')?'freebsd'
-			:(is('x11|linux'))?'linux'
-			:''
-			
-			// user agent language
-			,(/[; |\[](([a-z]{2})(\-[a-z]{2})?)[)|;|\]]/i.test(ua))?(lang+RegExp.$2).replace("-","_")+(RegExp.$3!=''?(' '+lang+RegExp.$1).replace("-","_"):''):''
-		
-			// beta: test if running iPad app
-			,( is('ipad|iphone|ipod') && !is('safari') )  ?  'ipad_app'  : ''
-		
-		
-		]; // b
-
-    function screenSize() 
-    	{
-		var w = window.outerWidth || html.clientWidth;
-		var h = window.outerHeight || html.clientHeight;
-		uaInfo.orientation = ((w<h) ? "portrait" : "landscape");
+/*jshint laxcomma:true*/
+
+function css_browser_selector(u) {
+    'use strict';
+
+    var uaInfo = {},
+    screens = [320, 480, 640, 768, 1024, 1152, 1280, 1440, 1680, 1920, 2560],
+        allScreens = screens.length,
+        ua = u.toLowerCase(),
+        is = function (t) {
+            return new RegExp(t, "i").test(ua);
+        },
+        version = function (p, n) {
+            n = n.replace(".", "_");
+            var i = n.indexOf('_'),
+                ver = "";
+            while (i > 0) {
+                ver += " " + p + n.substring(0, i);
+                i = n.indexOf('_', i + 1);
+            }
+            ver += " " + p + n;
+            return ver;
+        },
+        g = 'gecko',
+        w = 'webkit',
+        c = 'chrome',
+        f = 'firefox',
+        s = 'safari',
+        o = 'opera',
+        m = 'mobile',
+        a = 'android',
+        bb = 'blackberry',
+        lang = 'lang_',
+        dv = 'device_',
+        html = document.documentElement,
+        b = [
+
+        (!(/opera|webtv/i.test(ua)) && /msie\s(\d+)/.test(ua)) ? ('ie ie' + (/trident\/4\.0/.test(ua) ? '8' : RegExp.$1)) : is('firefox/') ? g + " " + f + (/firefox\/((\d+)(\.(\d+))(\.\d+)*)/.test(ua) ? ' ' + f + RegExp.$2 + ' ' + f + RegExp.$2 + "_" + RegExp.$4 : '') : is('gecko/') ? g : is('opera') ? o + (/version\/((\d+)(\.(\d+))(\.\d+)*)/.test(ua) ? ' ' + o + RegExp.$2 + ' ' + o + RegExp.$2 + "_" + RegExp.$4 : (/opera(\s|\/)(\d+)\.(\d+)/.test(ua) ? ' ' + o + RegExp.$2 + " " + o + RegExp.$2 + "_" + RegExp.$3 : '')) : is('konqueror') ? 'konqueror'
+
+        : is('blackberry') ? (bb + (/Version\/(\d+)(\.(\d+)+)/i.test(ua) ? " " + bb + RegExp.$1 + " " + bb + RegExp.$1 + RegExp.$2.replace('.', '_') : (/Blackberry ?(([0-9]+)([a-z]?))[\/|;]/gi.test(ua) ? ' ' + bb + RegExp.$2 + (RegExp.$3 ? ' ' + bb + RegExp.$2 + RegExp.$3 : '') : '')))
+        : is('android') ? (a + (/Version\/(\d+)(\.(\d+))+/i.test(ua) ? " " + a + RegExp.$1 + " " + a + RegExp.$1 + RegExp.$2.replace('.', '_') : '') + (/Android (.+); (.+) Build/i.test(ua) ? ' ' + dv + ((RegExp.$2).replace(/ /g, "_")).replace(/-/g, "_") : ''))
+        : is('chrome') ? w + ' ' + c + (/chrome\/((\d+)(\.(\d+))(\.\d+)*)/.test(ua) ? ' ' + c + RegExp.$2 + ((RegExp.$4 > 0) ? ' ' + c + RegExp.$2 + "_" + RegExp.$4 : '') : '')
+        : is('iron') ? w + ' iron'
+        : is('applewebkit/') ? (w + ' ' + s + (/version\/((\d+)(\.(\d+))(\.\d+)*)/.test(ua) ? ' ' + s + RegExp.$2 + " " + s + RegExp.$2 + RegExp.$3.replace('.', '_') : (/ Safari\/(\d+)/i.test(ua) ? ((RegExp.$1 === "419" || RegExp.$1 === "417" || RegExp.$1 === "416" || RegExp.$1 === "412") ? ' ' + s + '2_0' : RegExp.$1 === "312" ? ' ' + s + '1_3' : RegExp.$1 === "125" ? ' ' + s + '1_2' : RegExp.$1 === "85" ? ' ' + s + '1_0' : '') : '')))
+        : is('mozilla/') ? g : ''
+
+        ,
+        is("android|mobi|mobile|j2me|iphone|ipod|ipad|blackberry|playbook|kindle|silk") ? m : ''
+
+        ,
+        is('j2me') ? 'j2me' : is('ipad|ipod|iphone') ? (
+        (
+            /CPU( iPhone)? OS (\d+[_|\.]\d+([_|\.]\d+)*)/i.test(ua) ?
+            'ios' + version('ios', RegExp.$2) : '') + ' ' + (/(ip(ad|od|hone))/gi.test(ua) ? RegExp.$1 : "")
+        )
+
+        : is('playbook') ? 'playbook'
+        : is('kindle|silk') ? 'kindle'
+        : is('playbook') ? 'playbook'
+        : is('mac') ? 'mac' + (/mac os x ((\d+)[.|_](\d+))/.test(ua) ? (' mac' + (RegExp.$2) + ' mac' + (RegExp.$1).replace('.', "_")) : '')
+        : is('win') ? 'win' + (is('windows nt 6.2') ? ' win8'
+        : is('windows nt 6.1') ? ' win7'
+        : is('windows nt 6.0') ? ' vista'
+        : is('windows nt 5.2') || is('windows nt 5.1') ? ' win_xp'
+        : is('windows nt 5.0') ? ' win_2k'
+        : is('windows nt 4.0') || is('WinNT4.0') ? ' win_nt' : '')
+        : is('freebsd') ? 'freebsd'
+        : (is('x11|linux')) ? 'linux' : ''
+
+        ,
+        (/[; |\[](([a-z]{2})(\-[a-z]{2})?)[)|;|\]]/i.test(ua)) ? (lang + RegExp.$2).replace("-", "_") + (RegExp.$3 !== '' ? (' ' + lang + RegExp.$1).replace("-", "_") : '') : ''
+
+        ,
+        (is('ipad|iphone|ipod') && !is('safari')) ? 'ipad_app' : ''
+
+    ]; // b
+
+    function screenSize() {
+        var w = window.outerWidth || html.clientWidth;
+        var h = window.outerHeight || html.clientHeight;
+        uaInfo.orientation = ((w < h) ? "portrait" : "landscape");
         // remove previous min-width, max-width, client-width, client-height, and orientation
-        html.className = html.className.replace(/ ?orientation_\w+/g, "").replace(/ [min|max|cl]+[w|h]_\d+/g, "")
-        for (var i=(allScreens-1);i>=0;i--) { if (w >= screens[i] ) { uaInfo.maxw = screens[i]; break; }}
-		widthClasses="";
-        for (var info in uaInfo) { widthClasses+=" "+info+"_"+ uaInfo[info]  };
-		html.className =  ( html.className +widthClasses  );
-		return widthClasses;
-    	} // screenSize
-	
+        html.className = html.className.replace(/ ?orientation_\w+/g, "").replace(/ [min|max|cl]+[w|h]_\d+/g, "");
+        for (var i = (allScreens - 1); i >= 0; i--) {
+            if (w >= screens[i]) {
+                uaInfo.maxw = screens[i];
+                break;
+            }
+        }
+        var widthClasses = "";
+        for (var info in uaInfo) {
+          if (uaInfo.hasOwnProperty(info)) {
+            widthClasses += " " + info + "_" + uaInfo[info];
+          }
+        }
+        html.className = (html.className + widthClasses);
+        return widthClasses;
+    } // screenSize
+
     window.onresize = screenSize;
-	screenSize();	
+    screenSize();
 
-	var cssbs = (b.join(' ')) + " js ";
-	html.className =   ( cssbs + html.className.replace(/\b(no[-|_]?)?js\b/g,"")  ).replace(/^ /, "").replace(/ +/g," ");
+    function retina() {
+        var r = window.devicePixelRatio > 1;
+        if (r) {
+            html.className += ' retina';
+        } else {
+            html.className += ' non-retina';
+        }
+    }
+    retina();
 
-	return cssbs;
-	}
-	
-css_browser_selector(navigator.userAgent);
+    var cssbs = (b.join(' ')) + " js ";
+    html.className = (cssbs + html.className.replace(/\b(no[-|_]?)?js\b/g, "")).replace(/^ /, "").replace(/ +/g, " ");
 
+    return cssbs;
+}
 
+css_browser_selector(navigator.userAgent);