solidus_backend 1.2.3 → 1.3.0.beta1

data/app/assets/stylesheets/spree/backend/shared/_skeleton.scss

@@ -0,0 +1,242 @@
+/*
+* Skeleton V1.2
+* Copyright 2011, Dave Gamache
+* www.getskeleton.com
+* Free to use under the MIT license.
+* http://www.opensource.org/licenses/mit-license.php
+* 6/20/2012
+*/
+
+
+/* Table of Contents
+==================================================
+    #Base 960 Grid
+    #Tablet (Portrait)
+    #Mobile (Portrait)
+    #Mobile (Landscape)
+    #Clearing */
+
+
+
+/* #Base 960 Grid
+================================================== */
+
+    .container                                  { position: relative; width: 960px; margin: 0 auto; padding: 0; }
+    .container .column,
+    .container .columns                         { float: left; display: inline; margin-left: 10px; margin-right: 10px; }
+    .row                                        { margin-bottom: 20px; }
+
+    /* Nested Column Classes */
+    .column.alpha, .columns.alpha               { margin-left: 0; }
+    .column.omega, .columns.omega               { margin-right: 0; }
+
+    /* Base Grid */
+    .container .one.column,
+    .container .one.columns                     { width: 40px;  }
+    .container .two.columns                     { width: 100px; }
+    .container .three.columns                   { width: 160px; }
+    .container .four.columns                    { width: 220px; }
+    .container .five.columns                    { width: 280px; }
+    .container .six.columns                     { width: 340px; }
+    .container .seven.columns                   { width: 400px; }
+    .container .eight.columns                   { width: 460px; }
+    .container .nine.columns                    { width: 520px; }
+    .container .ten.columns                     { width: 580px; }
+    .container .eleven.columns                  { width: 640px; }
+    .container .twelve.columns                  { width: 700px; }
+    .container .thirteen.columns                { width: 760px; }
+    .container .fourteen.columns                { width: 820px; }
+    .container .fifteen.columns                 { width: 880px; }
+    .container .sixteen.columns                 { width: 940px; }
+
+    .container .one-third.column                { width: 300px; }
+    .container .two-thirds.column               { width: 620px; }
+
+    /* Offsets */
+    .container .offset-by-one                   { padding-left: 60px;  }
+    .container .offset-by-two                   { padding-left: 120px; }
+    .container .offset-by-three                 { padding-left: 180px; }
+    .container .offset-by-four                  { padding-left: 240px; }
+    .container .offset-by-five                  { padding-left: 300px; }
+    .container .offset-by-six                   { padding-left: 360px; }
+    .container .offset-by-seven                 { padding-left: 420px; }
+    .container .offset-by-eight                 { padding-left: 480px; }
+    .container .offset-by-nine                  { padding-left: 540px; }
+    .container .offset-by-ten                   { padding-left: 600px; }
+    .container .offset-by-eleven                { padding-left: 660px; }
+    .container .offset-by-twelve                { padding-left: 720px; }
+    .container .offset-by-thirteen              { padding-left: 780px; }
+    .container .offset-by-fourteen              { padding-left: 840px; }
+    .container .offset-by-fifteen               { padding-left: 900px; }
+
+
+
+/* #Tablet (Portrait)
+================================================== */
+
+    /* Note: Design for a width of 768px */
+
+    @media only screen and (min-width: 768px + $width-sidebar) and (max-width: 959px + $width-sidebar) {
+        .container                                  { width: 768px; }
+        .container .column,
+        .container .columns                         { margin-left: 10px; margin-right: 10px;  }
+        .column.alpha, .columns.alpha               { margin-left: 0; margin-right: 10px; }
+        .column.omega, .columns.omega               { margin-right: 0; margin-left: 10px; }
+        .alpha.omega                                { margin-left: 0; margin-right: 0; }
+
+        .container .one.column,
+        .container .one.columns                     { width: 28px; }
+        .container .two.columns                     { width: 76px; }
+        .container .three.columns                   { width: 124px; }
+        .container .four.columns                    { width: 172px; }
+        .container .five.columns                    { width: 220px; }
+        .container .six.columns                     { width: 268px; }
+        .container .seven.columns                   { width: 316px; }
+        .container .eight.columns                   { width: 364px; }
+        .container .nine.columns                    { width: 412px; }
+        .container .ten.columns                     { width: 460px; }
+        .container .eleven.columns                  { width: 508px; }
+        .container .twelve.columns                  { width: 556px; }
+        .container .thirteen.columns                { width: 604px; }
+        .container .fourteen.columns                { width: 652px; }
+        .container .fifteen.columns                 { width: 700px; }
+        .container .sixteen.columns                 { width: 748px; }
+
+        .container .one-third.column                { width: 236px; }
+        .container .two-thirds.column               { width: 492px; }
+
+        /* Offsets */
+        .container .offset-by-one                   { padding-left: 48px; }
+        .container .offset-by-two                   { padding-left: 96px; }
+        .container .offset-by-three                 { padding-left: 144px; }
+        .container .offset-by-four                  { padding-left: 192px; }
+        .container .offset-by-five                  { padding-left: 240px; }
+        .container .offset-by-six                   { padding-left: 288px; }
+        .container .offset-by-seven                 { padding-left: 336px; }
+        .container .offset-by-eight                 { padding-left: 384px; }
+        .container .offset-by-nine                  { padding-left: 432px; }
+        .container .offset-by-ten                   { padding-left: 480px; }
+        .container .offset-by-eleven                { padding-left: 528px; }
+        .container .offset-by-twelve                { padding-left: 576px; }
+        .container .offset-by-thirteen              { padding-left: 624px; }
+        .container .offset-by-fourteen              { padding-left: 672px; }
+        .container .offset-by-fifteen               { padding-left: 720px; }
+    }
+
+
+/*  #Mobile (Portrait)
+================================================== */
+
+    /* Note: Design for a width of 320px */
+
+    @media only screen and (max-width: 767px + $width-sidebar) {
+        .container { width: 300px; }
+        .container .columns,
+        .container .column { margin: 0; }
+
+        .container .one.column,
+        .container .one.columns,
+        .container .two.columns,
+        .container .three.columns,
+        .container .four.columns,
+        .container .five.columns,
+        .container .six.columns,
+        .container .seven.columns,
+        .container .eight.columns,
+        .container .nine.columns,
+        .container .ten.columns,
+        .container .eleven.columns,
+        .container .twelve.columns,
+        .container .thirteen.columns,
+        .container .fourteen.columns,
+        .container .fifteen.columns,
+        .container .sixteen.columns,
+        .container .one-third.column,
+        .container .two-thirds.column  { width: 300px; }
+
+        /* Offsets */
+        .container .offset-by-one,
+        .container .offset-by-two,
+        .container .offset-by-three,
+        .container .offset-by-four,
+        .container .offset-by-five,
+        .container .offset-by-six,
+        .container .offset-by-seven,
+        .container .offset-by-eight,
+        .container .offset-by-nine,
+        .container .offset-by-ten,
+        .container .offset-by-eleven,
+        .container .offset-by-twelve,
+        .container .offset-by-thirteen,
+        .container .offset-by-fourteen,
+        .container .offset-by-fifteen { padding-left: 0; }
+
+    }
+
+
+/* #Mobile (Landscape)
+================================================== */
+
+    /* Note: Design for a width of 480px */
+
+    @media only screen and (min-width: 480px + $width-sidebar) and (max-width: 767px + $width-sidebar) {
+        .container { width: 420px; }
+        .container .columns,
+        .container .column { margin: 0; }
+
+        .container .one.column,
+        .container .one.columns,
+        .container .two.columns,
+        .container .three.columns,
+        .container .four.columns,
+        .container .five.columns,
+        .container .six.columns,
+        .container .seven.columns,
+        .container .eight.columns,
+        .container .nine.columns,
+        .container .ten.columns,
+        .container .eleven.columns,
+        .container .twelve.columns,
+        .container .thirteen.columns,
+        .container .fourteen.columns,
+        .container .fifteen.columns,
+        .container .sixteen.columns,
+        .container .one-third.column,
+        .container .two-thirds.column { width: 420px; }
+    }
+
+
+/* #Clearing
+================================================== */
+
+    /* Self Clearing Goodness */
+    .container:after { content: "\0020"; display: block; height: 0; clear: both; visibility: hidden; }
+
+    /* Use clearfix class on parent to clear nested columns,
+    or wrap each row of columns in a <div class="row"> */
+    .clearfix:before,
+    .clearfix:after,
+    .row:before,
+    .row:after {
+      content: '\0020';
+      display: block;
+      overflow: hidden;
+      visibility: hidden;
+      width: 0;
+      height: 0; }
+    .row:after,
+    .clearfix:after {
+      clear: both; }
+    .row,
+    .clearfix {
+      zoom: 1; }
+
+    /* You can also use a <br class="clear" /> to clear columns */
+    .clear {
+      clear: both;
+      display: block;
+      overflow: hidden;
+      visibility: hidden;
+      width: 0;
+      height: 0;
+    }

data/app/assets/stylesheets/spree/backend/shared/_tables.scss

@@ -53,6 +53,7 @@ table {
 
         &:before {
           text-align: center !important;
+          padding: 0;
           width: 27px;
           display: inline-block;
         }
@@ -134,6 +135,7 @@ table {
       border-bottom: none;
       background-color: $color-tbl-thead;
       text-transform: uppercase;
+      text-align: center;
       font-size: 85%;
       font-weight: $font-weight-bold;
     }

data/app/assets/stylesheets/spree/backend/shared/_typography.scss

@@ -27,6 +27,9 @@ a {
   text-decoration: none;
   line-height: inherit;
 
+  &:active, &:hover {
+    text-decoration: none;
+  }
   &:visited {
     color: $color-link-visited;
   }
@@ -78,7 +81,8 @@ ul {
 ul.text_list {
   border-top: none;
   margin: 0;
-  list-style: disc inside none;
+  list-style-type: none;
+  padding-left: 0;
 }
 
 dl {

data/app/assets/stylesheets/spree/backend/shared/_utilities.scss

@@ -0,0 +1,35 @@
+.block-table {
+  display: table;
+  width: 100%;
+
+  .table-cell {
+    display: table-cell;
+    vertical-align: middle;
+    padding: 0 10px;
+
+    &:first-child {
+      padding-left: 0;
+    }
+    &:last-child {
+      padding-right: 0;
+    }
+  }
+}
+
+.hidden {
+  display: none;
+}
+
+// For block grids
+.frameless {
+  margin-left: -10px;
+  margin-right: -10px;
+}
+
+.container .column,
+.container .columns {
+  // Float container right instead of left.
+  .right {
+    float: right;
+  }
+}

data/app/assets/stylesheets/spree/backend/spree_admin.scss

@@ -4,33 +4,36 @@
 @import 'spree/backend/globals/variables_override';
 @import 'spree/backend/globals/variables';
 
+@import 'bootstrap_custom';
+@import 'solidus_admin/bootstrap/bootstrap';
+
 @import 'spree/backend/globals/mixins/caret';
 
+@import 'spree/backend/shared/skeleton';
 @import 'spree/backend/shared/typography';
 @import 'spree/backend/shared/tables';
 @import 'spree/backend/shared/icons';
 @import 'spree/backend/shared/forms';
 @import 'spree/backend/shared/layout';
-
-@import 'bootstrap/components/media';
+@import 'spree/backend/shared/header';
+@import 'spree/backend/shared/utilities';
 
 @import 'spree/backend/components/states';
 @import 'spree/backend/components/actions';
 @import 'spree/backend/components/date-picker';
 @import 'spree/backend/components/list_group';
 @import 'spree/backend/components/messages';
-@import 'spree/backend/components/pagination';
 @import 'spree/backend/components/progress';
 @import 'spree/backend/components/table-filter';
 @import 'spree/backend/components/navigation';
 @import 'spree/backend/components/sidebar';
 @import 'spree/backend/components/number_field_update';
 @import 'spree/backend/components/stock_table';
+@import 'spree/backend/components/tabs';
 
 @import 'font-awesome';
-@import 'spree/backend/plugins/powertip';
 @import 'spree/backend/plugins/select2';
-@import 'spree/backend/plugins/token-input';
+@import 'spree/backend/plugins/bootstrap_tooltip';
 
 @import 'spree/backend/sections/adjustments_table';
 @import 'spree/backend/sections/orders';
@@ -49,3 +52,4 @@
 @import 'spree/backend/sections/transfer_items';
 @import 'spree/backend/sections/stock_transfers';
 @import 'spree/backend/sections/style_guide';
+@import 'spree/backend/sections/payments';

data/app/controllers/spree/admin/adjustments_controller.rb

@@ -1,7 +1,6 @@
 module Spree
   module Admin
     class AdjustmentsController < ResourceController
-
       belongs_to 'spree/order', find_by: :number
 
       create.after :update_totals
@@ -35,10 +34,10 @@ module Spree
         parent.adjustments.build(order: parent)
       end
 
-      def reasons_for(adjustment)
+      def reasons_for(_adjustment)
         [
           AdjustmentReason.active.to_a,
-          @adjustment.adjustment_reason,
+          @adjustment.adjustment_reason
         ].flatten.compact.uniq.sort_by { |r| r.name.downcase }
       end
     end

data/app/controllers/spree/admin/base_controller.rb

@@ -9,62 +9,52 @@ module Spree
 
       private
 
-        def action
-          params[:action].to_sym
-        end
-
-        def authorize_admin
-          if respond_to?(:model_class, true) && model_class
-            record = model_class
-          else
-            record = controller_name.to_sym
-          end
-          authorize! :admin, record
-          authorize! action, record
-        end
-
-        # Need to generate an API key for a user due to some backend actions
-        # requiring authentication to the Spree API
-        def generate_admin_api_key
-          if (user = try_spree_current_user) && user.spree_api_key.blank?
-            user.generate_spree_api_key!
-          end
-        end
-
-        def flash_message_for(object, event_sym)
-          resource_desc  = object.class.model_name.human
-          resource_desc += " \"#{object.name}\"" if object.respond_to?(:name) && object.name.present?
-          Spree.t(event_sym, :resource => resource_desc)
-        end
-
-        def render_js_for_destroy
-          render :partial => '/spree/admin/shared/destroy'
-        end
-
-        # Index request for JSON needs to pass a CSRF token in order to prevent JSON Hijacking
-        def check_json_authenticity
-          return unless request.format.js? or request.format.json?
-          return unless protect_against_forgery?
-          auth_token = params[request_forgery_protection_token]
-          unless (auth_token and form_authenticity_token == URI.unescape(auth_token))
-            raise(ActionController::InvalidAuthenticityToken)
-          end
-        end
-
-        def config_locale
-          Spree::Backend::Config[:locale]
-        end
-
-        def lock_order
-          OrderMutex.with_lock!(@order) { yield }
-        rescue Spree::OrderMutex::LockFailed => e
-          flash[:error] = Spree.t(:order_mutex_admin_error)
-          redirect_to order_mutex_redirect_path
-        end
-
-        def order_mutex_redirect_path
-          edit_admin_order_path(@order)
-        end
+      def action
+        params[:action].to_sym
+      end
+
+      def authorize_admin
+        if respond_to?(:model_class, true) && model_class
+          record = model_class
+        else
+          record = controller_name.to_sym
+        end
+        authorize! :admin, record
+        authorize! action, record
+      end
+
+      # Need to generate an API key for a user due to some backend actions
+      # requiring authentication to the Spree API
+      def generate_admin_api_key
+        if (user = try_spree_current_user) && user.spree_api_key.blank?
+          user.generate_spree_api_key!
+        end
+      end
+
+      def flash_message_for(object, event_sym)
+        resource_desc  = object.class.model_name.human
+        resource_desc += " \"#{object.name}\"" if object.respond_to?(:name) && object.name.present?
+        Spree.t(event_sym, resource: resource_desc)
+      end
+
+      def render_js_for_destroy
+        render partial: '/spree/admin/shared/destroy'
+      end
+
+      def config_locale
+        Spree::Backend::Config[:locale]
+      end
+
+      def lock_order
+        OrderMutex.with_lock!(@order) { yield }
+      rescue Spree::OrderMutex::LockFailed
+        flash[:error] = Spree.t(:order_mutex_admin_error)
+        redirect_to order_mutex_redirect_path
+      end
+
+      def order_mutex_redirect_path
+        edit_admin_order_path(@order)
+      end
     end
   end
 end