ama_layout 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a859f6a1a244e5188b9ab6a118f9fbb769d38300
-  data.tar.gz: 7178b9cd303403c7fb54c49aa191425987211950
+  metadata.gz: b8eac84ea4bf77cfcc13f31f159c75b00607a7ea
+  data.tar.gz: c7c76ee7a3127c285a418a62e68549b50f3c9b34
 SHA512:
-  metadata.gz: 2d7455794e33236e3974cf22300c12c723fc25dab322637208737eb7cd5c3bbdc4ed4b06b1b44be6b85571f7a128f0ca0946508e17e1543d605bfa3ef130ac1b
-  data.tar.gz: 6c0ad6c9ba3de514de0f599fdf7f385692a6d20996b11050428f7e16f0e429886f14e9e9591250e1ee9d85e2683a3b238a150ec0bad392a9272a9c4312a62987
+  metadata.gz: 5625b5933afb3cd6a703c806d3aeeb778788b587d963b35483a7f31d5a4d41c078a6f5736a1b8ba5356a434d808ef4a5347fe029c6097bd73d025acbc0f42fbe
+  data.tar.gz: 1fb5c2cbce4fb7696641d20c9659565d32ace692be971e0bf269bec9545d7b6c91d3bf831dd1c3568ac09a82910f75119b2d1319ba6b2e799992a1a7f51f5997

data/.gitignore

@@ -1,12 +1,14 @@
 .DS_Store
 .idea
-/.bundle/
+/.bundle
+/vendor/bundle
 /.yardoc
 /Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
 /pkg/
+/spec/internal/db/*.sqlite
 /spec/reports/
 /tmp/
 *.bundle

data/README.md

@@ -104,6 +104,34 @@ Custom Navigation yaml file used to set all navigation:
         target: "_blank"
 
 
+### Custom Navigation
+
+If you want to use custom navigation in an app using this gem, you can specify the location of the navigation.yml file when exposing navigation in your controller.
+
+Example:
+
+Instead of:
+
+```
+expose(:navigation) do
+  AmaLayout::Navigation.new(
+    user: current_user, current_url: request.url
+  ).decorate
+end
+```
+
+```
+expose(:navigation) do
+  AmaLayout::Navigation.new(
+    user: current_user, current_url: request.url,
+    nav_file_path: Rails.root.join("config", "ama_layout", "navigation.yml")
+  ).decorate
+end
+```
+
+This is useful for soft-launching applications.
+
+
 ### Layout
 
 The following layout example will give you:

data/app/assets/stylesheets/ama_layout/application.scss

@@ -1,10 +1,10 @@
 @import "layout/variables";
+@import "webfonts/ss-symbolicons-block";
+@import "font-awesome-sprockets";
+@import "font-awesome";
 @import "foundation_and_overrides";
 @import "foundation";
 @import "layout/index";
 @import "layout_components/index";
 @import "old-ie";
 @import "media_queries/index";
-@import "webfonts/ss-symbolicons-block";
-@import "font-awesome-sprockets";
-@import "font-awesome";

data/app/assets/stylesheets/ama_layout/foundation_and_overrides.scss

@@ -1374,13 +1374,13 @@ $xlarge-breakpoint: em-calc(1920);
 
 // $has-tip-border-bottom: dotted 1px $iron;
 // $has-tip-font-weight: $font-weight-bold;
-// $has-tip-font-color: $oil;
+ $has-tip-font-color: $charcoal;
 // $has-tip-border-bottom-hover: dotted 1px scale-color($primary-color, $lightness: -55%);
 // $has-tip-font-color-hover: $primary-color;
 // $has-tip-cursor-type: help;
 
 // $tooltip-padding: rem-calc(12);
-// $tooltip-bg: $oil;
+ $tooltip-bg: $slate;
 // $tooltip-font-size: rem-calc(14);
 // $tooltip-font-weight: $font-weight-normal;
 // $tooltip-font-color: $white;
@@ -1483,4 +1483,4 @@ $topbar-divider-border-top: solid 1px darken($brand-blue-light, 5%);
 // $include-html-visibility-classes: $include-html-classes;
 // $include-accessibility-classes: true;
 // $include-table-visibility-classes: true;
-// $include-legacy-visibility-classes: true;
+// $include-legacy-visibility-classes: true;

data/app/assets/stylesheets/ama_layout/layout/helper-classes.scss

@@ -236,6 +236,10 @@
   background-color: $stone;
 }
 
+.light-greybg{
+  background-color: $ash;
+}
+
 .insurance-blue-bg{
   background-color: $brand-blue-insurance;
 }
@@ -252,6 +256,10 @@
   background-color: $brand-green;
 }
 
+.notice-orange-bg{
+  background-color: $notice-orange;
+}
+
 // On a coloured background, the child links should be white
 .insurance-blue-bg a,
 .light-blue-bg a,
@@ -413,10 +421,29 @@ button[disabled],
   font-size: 80%;
 }
 
+.italic{
+  font-style: italic;
+}
+
+.hint{
+  font-size: $base-font-size*0.75;
+  line-height: $base-font-size;
+  color: darken($smoke, 15%);
+  font-style: italic;
+}
+
 .green-text{
   color: $brand-green;
 }
 
+.orange-text{
+  color: $notice-orange;
+}
+
+.red-text{
+  color: $brand-red;
+}
+
 .small-text{
   font-size: $base-font-size*0.75;
 }

data/app/assets/stylesheets/ama_layout/layout/variables.scss

@@ -4,6 +4,7 @@ $white: #ffffff;
 $green: #3fae60;
 $brand-green: #78be20; //Rewards Green
 $brand-blue-insurance:#00a3e0;
+$notice-orange: #e7992b;
 // Blue tones - ordered from lightest to darkest
 $sky: #e2f4fc;
 $ocean: #8cceec;
@@ -13,6 +14,7 @@ $brand-blue-dark: #00205b;
 $ash: #f7f7f7;
 $stone: #eeeeee;
 $smoke: #cccccc;
+$stormcloud: #959595;
 $slate: #838383;
 $charcoal: #656565;
 $jet: #323232;
@@ -29,4 +31,4 @@ $base-padding: 5px;
 // Borders
 $base-border: 1px solid $smoke;
 //Radius
-$base-radius: 3px;
+$base-radius: 3px;

data/app/assets/stylesheets/ama_layout/layout_components/cart.scss

@@ -0,0 +1,135 @@
+/*Cart*/
+.summary-cart.active.summary_height{
+  min-height: 300px;
+}
+
+.summary-cart{
+  ::-webkit-scrollbar{
+    -webkit-appearance: none;
+    width: 7px;
+  }
+
+  ::-webkit-scrollbar-thumb{
+    border-radius: 4px;
+    background-color: rgba(0, 0, 0, .5);
+    -webkit-box-shadow: 0 0 1px rgba(255, 255, 255, .5);
+  }
+
+  .summary-cart-body{
+    background-color: $stone;
+    padding: $base-padding*2;
+    font-size: $base-font-size*0.875;
+    color: $charcoal;
+
+    ul{
+      list-style: none;
+      margin: 0;
+
+      li{
+        padding: 8px;
+      }
+
+      li:not(:nth-child(1)){
+        border-top: 1px solid $smoke;
+      }
+
+      .summary-flash-notice{
+        color: $white;
+        background: $brand-blue-insurance;
+
+        p,
+        a,
+        a:hover,
+        a:focus{
+          color: $white;
+        }
+
+        &:not(:nth-child(1)){
+          border-top: none;
+        }
+      }
+    }
+
+    .items{
+      overflow-y: scroll;
+      max-height: auto;
+    }
+  }
+}
+
+.floating-cart{
+  z-index: 98;
+}
+
+.summary-title{
+  background: $brand-green !important;
+  min-height: 62px;
+}
+
+.mobile-accordion-navigation{
+  @include accordion-navigation;
+}
+
+.accordion-icon{
+  width: 16px;
+  height: 16px;
+  display: block;
+  float: right;
+  color: $white;
+  margin-top: $base-margin;
+}
+
+
+.delete-icon{ //same one used in the cart and on info charts it lives outside of cart so it can be used other places
+  margin-top: $base-margin;
+  float: right;
+
+  .fa-times-circle-o{
+    font-size: $base-font-size*2;
+  }
+
+  a{
+    color: $slate;
+    text-decoration: none;
+
+    &:hover,
+    &:focus{
+      color: $charcoal;
+    }
+  }
+}
+
+@media screen and (max-width: 64em){
+  .mobile-accordion{
+    @include accordion-container;
+
+    .mobile-accordion-navigation{
+      @include accordion-navigation;
+    }
+
+    .content{
+      @include accordion-content;
+    }
+  }
+
+  span.item-num{
+    display: inline-block;
+    float: right;
+    width: 30px;
+    height: 30px;
+    border-radius: 60px;
+    text-align: center;
+    line-height: 29px;
+    color: $white;
+    font-weight: bold;
+    margin-right: $base-margin*6;
+    background: lighten($brand-green, 5%);
+  }
+
+  .summary-cart{
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+  }
+}

data/app/assets/stylesheets/ama_layout/layout_components/forms.scss

@@ -34,7 +34,6 @@
 /* ------------- Custom Radio Button + Checkbox Styles  ------------- */
 .checkboxes{
   label{
-    padding: $base-padding*2;
     width: 100%;
   }
 
@@ -71,6 +70,22 @@ input[type="checkbox"] + label{
   border: $base-border;
   margin: 0;
   width: 100%;
+  position: relative;
+  cursor: pointer;
+  padding: 0 $base-padding*2 0 $base-padding*2;
+
+  &:before{
+    content: ' ';
+    display: block;
+    position: absolute;
+    left: 10px;
+    top: 8px;
+    width: 24px;
+    min-width: 24px;
+    height: 24px;
+    background-color: $white;
+    border: $base-border;
+  }
 
   &:nth-child(2){
     margin-top: -1px;
@@ -82,55 +97,51 @@ input[type="checkbox"] + label{
   }
 }
 
-input[type="checkbox"] + label > span:first-of-type,
-input[type="radio"] + label > span:first-of-type,
-input[type="radio"] + label span:first-of-type{
+.checkbox-label{
   display: inline-block;
-  width: 24px;
-  min-width: 24px;
-  height: 24px;
-  margin: $base-margin 0 $base-margin;
-  vertical-align: top;
-  cursor: pointer;
-  border-radius:  50%;
-  background-color: $white;
-  border: $base-border;
+  width: 85%;
+  margin-top: 9px;
+  margin-bottom: 9px;
+  margin-left: 32px;
 }
 
-input[type="radio"] + label > span:first-of-type,
-input[type="radio"] + label span:first-of-type{
-  margin: 7px $base-margin;
+input[type="radio"] + label{
+  margin: $base-margin 0;
 
   &:before{
-    content: ' ';
     border-radius: 100%;
-    margin: 6px auto 0 auto;
+  }
+
+  &:after{
+    content: ' ';
     transition: all .5s ease-in-out;
   }
 }
 
-input[type="radio"]:checked + label > span:first-of-type,
-input[type="radio"]:checked + label span:first-of-type{
-  background-color: $white;
-  border: 2px solid $secondary-color;
+input[type="radio"]:checked + label{
+  background-color: $sky;
+  border: 1px solid $ocean;
 
   &:before{
     content: '';
+    background-color: $white;
+    border: 2px solid $secondary-color;
+  }
+
+  &:after{
+    content: '';
+    position: absolute;
     display: block;
-    position: relative;
+    top: 16px;
+    left: 18px;
+    background-color: $brand-blue-light;
     width: 8px;
     height: 8px;
-    background-color: $secondary-color;
-    -moz-transform: scale(2,2);
-    -webkit-transform: scale(2,2);
-    transform: scale(2,2);
+    -moz-transform: scale(2, 2);
+    -webkit-transform: scale(2, 2);
+    transform: scale(2, 2);
+    border-radius: 100%;
   }
-}
-
-input[type="radio"]:checked + label{
-  background-color: $sky;
-  border: 1px solid $ocean;
-  position: relative;
 
   &>hr{
     border: solid $ocean;
@@ -144,28 +155,15 @@ input[type="radio"]:checked + label{
   }
 }
 
-input[type="checkbox"] + label > span:first-of-type{
-  border-radius: 0;
-  max-width: 10%;
-  margin: $base-margin $base-margin*2 $base-margin 0;
-}
-
-.checkbox-label{
-  display: inline-block;
-  width: 80%;
-  margin-top: 8px;
-  margin-bottom: 8px;
-}
-
 input[type="checkbox"]:checked + label{
-  position: relative;
 
-  &:before{
+  &:after{
     content: '';
     display: block;
     position: absolute;
+    z-index: 200;
     left: 14px;
-    top: 28px;
+    top: 21px;
     width: 8px;
     height: 16px;
     border-right: 3px solid $white;
@@ -179,15 +177,11 @@ input[type="checkbox"]:checked + label{
     animation:checkbox 0.8s;
   }
 
-  span:first-of-type{
+  &:before{
     background: $brand-blue-light;
   }
 }
 
-[type="checkbox"]:checked + label:after{
-  margin-left: $base-margin*6;
-}
-
 @keyframes checkbox{
   0%{
    height: 0;
@@ -224,11 +218,24 @@ input[type="checkbox"]:checked + label{
   float: right;
 }
 
-p.hint{
-  font-size: $base-font-size*0.75;
-  line-height: $base-font-size;
-  color: darken($smoke, 15%);
-  font-style: italic;
+/*-------------- Credit Card images ---------- */
+.cc-type{
+  width: 38px;
+  height: 19px;
+  display: inline-block;
+}
+
+.type-visa{
+  background: url(image-path("cc-type-visa.png")) no-repeat;
+  background-size: contain;
+  background-position: center center;
+}
+
+.type-mc,
+.type-mastercard{
+  background: url(image-path("cc-type-mc.png")) no-repeat;
+  background-size: contain;
+  background-position: center center;
 }
 
 /* ------------- Error Messaging ------------- */

data/app/assets/stylesheets/ama_layout/layout_components/index.scss

@@ -7,3 +7,5 @@
 @import "responsive-table";
 @import "accordions";
 @import "tab-accordions";
+@import "show-hide-content-box";
+@import "cart";

data/app/assets/stylesheets/ama_layout/layout_components/notification.scss

@@ -9,25 +9,34 @@
   background-color: $brand-red;
 }
 
-.summary-cart {
-  ul {
-    .summary-flash-notice {
-      color: $white;
-      background: $brand-blue-insurance;
+//Status error classes
+.orange-warning-icon{
+  @extend .fa;
+  @extend .fa-exclamation-circle;
+  @extend .orange-text;
+}
 
-      p{
-        color: $white;
-      }
-    }
+.white-warning-icon{
+  @extend .fa;
+  @extend .fa-exclamation-circle;
+  @extend .white-text;
+}
 
-    .delete-icon{
-      margin-top: $base-margin;
-      float: right;
-    }
-    
-    li{
-      padding: 8px;
-    }
-  }
+.green-active-icon{
+  @extend .fa;
+  @extend .fa-check-circle;
+  @extend .green-text;
 }
 
+.white-active-icon{
+  @extend .fa;
+  @extend .fa-check-circle;
+  @extend .white-text;
+}
+
+.status-icon{
+  font-size: 2rem !important; //needs important to overwrite the .fa font size
+  text-align: center;
+  margin: 0 auto;
+  display: block;
+}

data/app/assets/stylesheets/ama_layout/layout_components/show-hide-content-box.scss

@@ -0,0 +1,11 @@
+.expand-box-bg{
+  background-color: $stone;
+  padding: $base-padding*4;
+
+  .expand-close{
+    margin-top: -10px;
+    margin-right: -10px;
+    color: $charcoal;
+    cursor: pointer;
+  }
+}

data/lib/ama_layout/navigation.rb

@@ -3,7 +3,12 @@ module AmaLayout
     include ActiveModel::Model
     include Draper::Decoratable
 
-    attr_accessor :user, :current_url
+    attr_accessor :user, :current_url, :nav_file_path
+
+    def initialize(args = {})
+      args = defaults.merge args
+      super
+    end
 
     cattr_accessor :member do
       "member"
@@ -26,8 +31,13 @@ module AmaLayout
 
   private
     def navigation_items
-      file = File.join Gem.loaded_specs["ama_layout"].full_gem_path, "lib", "ama_layout", "navigation.yml"
-      YAML.load ERB.new(File.read file).result
+      YAML.load ERB.new(File.read nav_file_path).result
+    end
+
+    def defaults
+      {
+        nav_file_path: File.join(Gem.loaded_specs["ama_layout"].full_gem_path, "lib", "ama_layout", "navigation.yml")
+      }
     end
   end
 end

data/lib/ama_layout/version.rb

@@ -1,3 +1,3 @@
 module AmaLayout
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end

data/spec/ama_layout/decorators/navigation_decorator_spec.rb

@@ -6,6 +6,7 @@ describe AmaLayout::NavigationDecorator do
   let(:insurance_site) { "http://insurance.waffles.ca" }
   let(:membership_site) { "http://membership.waffles.ca" }
   let(:driveredonline_site) { "http://driveredonline.waffles.ca" }
+  let(:registries_site) { "http://registries.waffles.ca" }
 
   before(:each) do
     allow(Rails.configuration).to receive(:gatekeeper_site).and_return(gatekeeper_site)
@@ -13,6 +14,7 @@ describe AmaLayout::NavigationDecorator do
     allow(Rails.configuration).to receive(:insurance_site).and_return(insurance_site)
     allow(Rails.configuration).to receive(:membership_site).and_return(membership_site)
     allow(Rails.configuration).to receive(:driveredonline_site).and_return(driveredonline_site)
+    allow(Rails.configuration).to receive(:registries_site).and_return(registries_site)
   end
 
   describe "#items" do

data/spec/ama_layout/fixtures/navigation.yml

@@ -0,0 +1,5 @@
+member:
+  - text: "Fixture"
+    alt: "A fixture"
+    link: "/"
+    icon: "fa-tachometer"

data/spec/ama_layout/navigation_spec.rb

@@ -4,6 +4,7 @@ describe AmaLayout::Navigation do
   let(:insurance_site) { "http://insurance.waffles.ca" }
   let(:membership_site) { "http://membership.waffles.ca" }
   let(:driveredonline_site) { "http://driveredonline.waffles.ca" }
+  let(:registries_site) { "http://registries.waffles.ca" }
 
   before(:each) do
     allow(Rails.configuration).to receive(:gatekeeper_site).and_return(gatekeeper_site)
@@ -11,6 +12,27 @@ describe AmaLayout::Navigation do
     allow(Rails.configuration).to receive(:insurance_site).and_return(insurance_site)
     allow(Rails.configuration).to receive(:membership_site).and_return(membership_site)
     allow(Rails.configuration).to receive(:driveredonline_site).and_return(driveredonline_site)
+    allow(Rails.configuration).to receive(:registries_site).and_return(registries_site)
+  end
+
+  describe "#nav_file_path" do
+    let(:file_path) { File.join(Gem.loaded_specs["ama_layout"].full_gem_path, "lib", "ama_layout", "navigation.yml") }
+
+    it "defaults to lib/ama_layout/navigation.yml" do
+      expect(subject.nav_file_path).to eq file_path
+    end
+
+    context "overridden file path" do
+      let(:file_path) do
+        File.join(Gem.loaded_specs["ama_layout"].full_gem_path, "spec", "ama_layout", "fixtures", "navigation.yml")
+      end
+      let(:user) { double("user", navigation: AmaLayout::Navigation.member) }
+      let(:subject) { described_class.new(user: user, nav_file_path: file_path) }
+
+      it "uses the overridden file path" do
+        expect(subject.items.first.text).to eq "Fixture"
+      end
+    end
   end
 
   describe "#items" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ama_layout
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Michael van den Beuken
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foundation-rails
@@ -244,6 +244,8 @@ files:
 - ama_layout.gemspec
 - app/assets/images/AMA-Logo.svg
 - app/assets/images/alberta-blur.jpg
+- app/assets/images/cc-type-mc.png
+- app/assets/images/cc-type-visa.png
 - app/assets/images/footer-racetrack-big.png
 - app/assets/javascripts/ama_layout/ama_layout_namespace.js.coffee
 - app/assets/javascripts/ama_layout/autocorrect_email.js.coffee
@@ -269,11 +271,13 @@ files:
 - app/assets/stylesheets/ama_layout/layout/variables.scss
 - app/assets/stylesheets/ama_layout/layout_components/accordions.scss
 - app/assets/stylesheets/ama_layout/layout_components/blue-boxes.scss
+- app/assets/stylesheets/ama_layout/layout_components/cart.scss
 - app/assets/stylesheets/ama_layout/layout_components/error-page.scss
 - app/assets/stylesheets/ama_layout/layout_components/forms.scss
 - app/assets/stylesheets/ama_layout/layout_components/index.scss
 - app/assets/stylesheets/ama_layout/layout_components/notification.scss
 - app/assets/stylesheets/ama_layout/layout_components/responsive-table.scss
+- app/assets/stylesheets/ama_layout/layout_components/show-hide-content-box.scss
 - app/assets/stylesheets/ama_layout/layout_components/sidebar.scss
 - app/assets/stylesheets/ama_layout/layout_components/siteheader.scss
 - app/assets/stylesheets/ama_layout/layout_components/tab-accordions.scss
@@ -323,6 +327,7 @@ files:
 - spec/ama_layout/decorators/moneris_decorator_spec.rb
 - spec/ama_layout/decorators/navigation_decorator_spec.rb
 - spec/ama_layout/decorators/navigation_item_decorator_spec.rb
+- spec/ama_layout/fixtures/navigation.yml
 - spec/ama_layout/moneris_spec.rb
 - spec/ama_layout/navigation_item_spec.rb
 - spec/ama_layout/navigation_spec.rb
@@ -334,7 +339,6 @@ files:
 - spec/internal/app/controllers/pages_controller.rb
 - spec/internal/config/database.yml
 - spec/internal/config/routes.rb
-- spec/internal/db/combustion_test.sqlite
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
 - spec/internal/public/favicon.ico
@@ -359,7 +363,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ".ama.ab.ca site layouts"
@@ -368,6 +372,7 @@ test_files:
 - spec/ama_layout/decorators/moneris_decorator_spec.rb
 - spec/ama_layout/decorators/navigation_decorator_spec.rb
 - spec/ama_layout/decorators/navigation_item_decorator_spec.rb
+- spec/ama_layout/fixtures/navigation.yml
 - spec/ama_layout/moneris_spec.rb
 - spec/ama_layout/navigation_item_spec.rb
 - spec/ama_layout/navigation_spec.rb
@@ -379,7 +384,6 @@ test_files:
 - spec/internal/app/controllers/pages_controller.rb
 - spec/internal/config/database.yml
 - spec/internal/config/routes.rb
-- spec/internal/db/combustion_test.sqlite
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
 - spec/internal/public/favicon.ico