ama_layout 10.1.0 → 11.3.1

data/app/views/ama_layout/v3/_main_nav_item.html.erb

@@ -0,0 +1,6 @@
+<li class="side-nav__item">
+  <%= link_to nav_item.text, nav_item.link,
+      target: nav_item.target, alt: nav_item.alt,
+      class: 'side-nav__link' %>
+  <%= nav_item.sidebar_sub_nav %>
+</li>

data/app/views/ama_layout/v3/_main_top_nav_item.html.erb

@@ -0,0 +1,4 @@
+<li class="has-submenu <%= nav_item.sub_nav_class %>">
+  <%= link_to nav_item.text, nav_item.link, class: 'show-for-small-only' %>
+  <%= nav_item.top_sub_nav %>
+</li>

data/app/views/ama_layout/v3/_member_links.html.erb

@@ -0,0 +1,6 @@
+<li class="small-text">
+  <%= link_to 'Update Address', "#{Rails.configuration.youraccount_site}/membership_update/new" %>
+</li>
+<li class="small-text">
+  <%= link_to 'Manage Credit Cards', "#{Rails.configuration.gatekeeper_site}/members/credit_cards" %>
+</li>

data/app/views/ama_layout/v3/_mobile_links.html.erb

@@ -0,0 +1,19 @@
+<div class="m-side-nav__content off-canvas position-left" id="offCanvasLeft" data-off-canvas>
+  <ul class="m-side-nav__list vertical menu drilldown" data-drilldown>
+    <li class="side-nav__item">
+      <%= link_to 'Sign In', "#{Rails.configuration.gatekeeper_site}/login", class: 'side-nav__link' %>
+    </li>
+    <li class="m-side-nav__item">
+      <%= link_to 'AMA Website', Rails.configuration.amaabca_site, class: 'm-side-nav__link' %>
+    </li>
+    <li class="m-side-nav__item">
+      <%= link_to 'AMA Road Reports', 'https://roadreports.ama.ab.ca', class: 'm-side-nav__link' %>
+    </li>
+    <li class="m-side-nav__item">
+      <%= link_to 'Help', "#{Rails.configuration.amaabca_site}/help", class: 'm-side-nav__link' %>
+    </li>
+    <li class="m-side-nav__item">
+      <%= link_to 'Contact Us', "#{Rails.configuration.amaabca_site}/contact", class: 'm-side-nav__link' %>
+    </li>
+  </ul>
+</div>

data/app/views/ama_layout/v3/_mobile_notification_icon.html.erb

@@ -0,0 +1,4 @@
+<a href="#" data-toggle="offCanvasRight" data-notifications-toggle>
+  <i class="fa fa-2x fa-bell notification__icon"></i>
+  <%= navigation.notification_badge %>
+</a>

data/app/views/ama_layout/v3/_notice.html.erb

@@ -0,0 +1,5 @@
+<div class="row">
+  <div class="large-12">
+    <div class="notice_notification"><span><%= message.html_safe %></span></div>
+  </div>
+</div>

data/app/views/ama_layout/v3/_notices.html.erb

@@ -0,0 +1,3 @@
+<%= notice(flash[:notice]) %>
+<%= alert(flash[:alert]) %>
+<%= success_message(flash[:success]) %>

data/app/views/ama_layout/v3/_notification.html.erb

@@ -0,0 +1,10 @@
+<div class="row <%= notification.active_class %>">
+  <div class="small-2 column">
+    <%= notification.icon %>
+  </div>
+  <div class="small-10 column">
+    <p class="bold"><%= notification.header %></p>
+    <p><%= sanitize notification.content, scrubber: AmaLayout::NotificationScrubber.new %></p>
+    <p class="micetype"><%= notification.created_at %></p>
+  </div>
+</div>

data/app/views/ama_layout/v3/_notification_icon.html.erb

@@ -0,0 +1,6 @@
+<li>
+  <a href="#" class="notification link--no-underline" data-toggle="offCanvasRight" data-notifications-toggle>
+    <i class="fa fa-2x fa-bell"></i>
+    <%= navigation.notification_badge %>
+  </a>
+</li>

data/app/views/ama_layout/v3/_notification_sidebar.html.erb

@@ -0,0 +1,22 @@
+<div class="off-canvas position-right right-sidebar" id="offCanvasRight" data-off-canvas>
+  <div class="row column right-sidebar__header">
+    <h2 class="mt1">Notification Centre</h2>
+    <button class="close-button" aria-label="Close menu" type="button" data-close>
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="row column">
+    <%= navigation.notifications_heading %>
+  </div>
+  <%= render partial: ama_layout_partial('notification'), collection: notifications %>
+  <div class="row column">
+    <p class="mt1">Did You Know?</p>
+    <div class="section-content">
+      <p class="bold">Sign up for Vehicle Registration Auto-Renew</p>
+      <p>
+        We'll process your payment and mail you a new registration certificate and licence plate sticker. It's that simple!
+      </p>
+      <%= link_to 'Sign up now', "#{Rails.configuration.registries_site}/order/registrations/new", class: 'button--right button--expand-small-down' %>
+    </div>
+  </div>
+</div>

data/app/views/ama_layout/v3/_sidebar.html.erb

@@ -0,0 +1,8 @@
+<aside class="side-nav" data-equalizer-watch="page-container-equalize">
+  <h2 class="side-nav__header">Online Account</h2>
+  <div class="side-nav__content">
+    <ul class="side-nav__list">
+      <%= render partial: "ama_layout/main_nav_item", collection: navigation.items, as: :nav_item %>
+    </ul>
+  </div>
+</aside>

data/app/views/ama_layout/v3/_sign_out_link.html.erb

@@ -0,0 +1,3 @@
+<li>
+  <a class="side-nav__link" href="/logout">Sign Out</a>
+</li>

data/app/views/ama_layout/v3/_siteheader.html.erb

@@ -0,0 +1,37 @@
+<div class="header">
+  <div class="title-bar" data-responsive-toggle="main-menu" data-hide-for="large">
+    <button class="menu-icon" type="button" data-toggle="offCanvasLeft"></button>
+    <%= link_to(image_tag("ama-logo.png"), Rails.configuration.amaabca_site, class: "title-bar__logo") %>
+    <%= navigation.mobile_notification_icon %>
+  </div>
+  <div class="top-bar" id="main-menu">
+    <div class="top-bar-left">
+      <a href="<%= Rails.configuration.amaabca_site %>" class="ml1 pl1"><i class="fas fa-chevron-left pr1"></i> Back to Other AMA Services</a>
+    </div>
+    <div class="top-bar-right">
+      <ul class="menu" data-responsive-menu="drilldown medium-dropdown">
+        <%= navigation.notification_icon %>
+        <li>
+          <a href="<%= Rails.configuration.amaabca_site %>/help" target="_blank">Help</a>
+        </li>
+        <li>
+          <a href="<%= Rails.configuration.amaabca_site %>/contact">Contact Us</a>
+        </li>
+        <%= navigation.account_toggle(self) %>
+        <%= navigation.top_nav %>
+      </ul>
+    </div>
+  </div>
+</div>
+<%= navigation.mobile_links %>
+<%= navigation.notification_sidebar %>
+<div class="javascript_errors error_notification" hidden></div>
+<noscript>
+  <div class="mt1 large-12 columns text-center error_notification">
+    <h2 class="mt1">There seems to be an issue with your browser.</h2>
+    <h5>Javascript is disabled in your web browser.</h5>
+    <div class='fieldset text-center small mb1 block'>
+      For full functionality of this site it is necessary to enable JavaScript. Here are the <a href="http://www.enable-javascript.com/" target="_blank"> instructions how to enable JavaScript in your web browser</a>
+    </div>
+  </div>
+</noscript>

data/app/views/ama_layout/v3/_sub_nav.html.erb

@@ -0,0 +1,3 @@
+<ul class="side-nav__child-list">
+  <%= render partial: "ama_layout/sub_nav_item", collection: sub_nav, as: :nav_item %>
+</ul>

data/app/views/ama_layout/v3/_sub_nav_item.html.erb

@@ -0,0 +1,3 @@
+<li class="side-nav__child-item">
+  <%= link_to nav_item.text, nav_item.link, class: "side-nav__child-link #{nav_item.active_class}" %>
+</li>

data/app/views/ama_layout/v3/_success.html.erb

@@ -0,0 +1,5 @@
+<div class="row">
+  <div class="large-12">
+    <div class="success_notification"><span><%= message.html_safe %></span></div>
+  </div>
+</div>

data/app/views/ama_layout/v3/_top_nav.html.erb

@@ -0,0 +1,16 @@
+<li class="has-submenu">
+  <%= link_to navigation.display_name_text, '#', class: 'link--no-underline' %>
+  <ul class="submenu menu vertical">
+    <li class="bold">
+      <%= link_to 'Account Settings', "#{Rails.configuration.gatekeeper_site}/account_settings" %>
+    </li>
+    <li class="small-text">
+      <%= link_to 'Change Email/Password', "#{Rails.configuration.gatekeeper_site}/user/edit" %>
+    </li>
+    <li class="small-text">
+      <%= link_to 'Email Subscriptions', "#{Rails.configuration.youraccount_site}/subscriptions" %>
+    </li>
+    <%= navigation.member_links %>
+    <%= navigation.sign_out_link %>
+  </ul>
+</li>

data/app/views/ama_layout/v3/_top_sub_nav.html.erb

@@ -0,0 +1,3 @@
+<ul class="submenu menu vertical" data-submenu>
+  <%= render partial: "ama_layout/top_sub_nav_item", collection: sub_nav, as: :nav_item %>
+</ul>

data/app/views/ama_layout/v3/_top_sub_nav_item.html.erb

@@ -0,0 +1,3 @@
+<li>
+  <%= link_to nav_item.text, nav_item.link %>
+</li>

data/config.ru

@@ -5,5 +5,5 @@ require "bundler"
 
 Bundler.require :default, :development
 
-Combustion.initialize! :all
+Combustion.initialize!(:all)
 run Combustion::Application

data/lib/ama_layout/ama_layout_view.rb

@@ -1,5 +1,11 @@
+# frozen_string_literal: true
+
+require_relative '../../app/helpers/ama_layout_partial_helper'
+
 module AmaLayout
   class AmaLayoutView < ActionView::Base
+    include AmaLayoutPartialHelper
+
     attr_accessor :view_data
 
     def initialize(args)

data/lib/ama_layout/decorators/agent/navigation_decorator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AmaLayout
   module Agent
     class NavigationDecorator
@@ -14,19 +16,19 @@ module AmaLayout
       def sign_out_link
         return '' unless user
 
-        h.render partial: 'ama_layout/sign_out_link'
+        h.render partial: ama_layout_partial('sign_out_link')
       end
 
       def top_nav
         return '' unless user
 
-        h.render partial: 'ama_layout/agent/top_nav', locals: { navigation: self }
+        h.render partial: ama_layout_partial('agent/top_nav'), locals: { navigation: self }
       end
 
       def sidebar
         return '' unless user
 
-        h.render partial: 'ama_layout/sidebar', locals: { navigation: self }
+        h.render partial: ('sidebar'), locals: { navigation: self }
       end
 
       def cash_drawer_name

data/lib/ama_layout/decorators/navigation_decorator.rb

@@ -15,25 +15,25 @@ module AmaLayout
     def sign_out_link
       return '' unless user
 
-      h.render partial: 'ama_layout/sign_out_link'
+      h.render partial: ama_layout_partial('sign_out_link')
     end
 
     def member_links
       return '' unless user && %w[member member_renewal member_outstanding_balance].include?(user.try(:menu_key))
 
-      h.render partial: 'ama_layout/member_links'
+      h.render partial: ama_layout_partial('member_links')
     end
 
     def top_nav
       return '' unless user
 
-      h.render partial: 'ama_layout/top_nav', locals: { navigation: self }
+      h.render partial: ama_layout_partial('top_nav'), locals: { navigation: self }
     end
 
     def sidebar
       return '' if items.none?
 
-      h.render partial: 'ama_layout/sidebar', locals: { navigation: self }
+      h.render partial: ama_layout_partial('sidebar'), locals: { navigation: self }
     end
 
     def name_or_email
@@ -47,19 +47,19 @@ module AmaLayout
     def notification_icon
       return '' unless user
 
-      h.render 'ama_layout/notification_icon', navigation: self
+      h.render ama_layout_partial('notification_icon'), navigation: self
     end
 
     def mobile_notification_icon
       return '' unless user
 
-      h.render 'ama_layout/mobile_notification_icon', navigation: self
+      h.render ama_layout_partial('mobile_notification_icon'), navigation: self
     end
 
     def mobile_links
       return '' if user
 
-      h.render 'ama_layout/mobile_links'
+      h.render ama_layout_partial('mobile_links')
     end
 
     def notification_badge
@@ -78,7 +78,7 @@ module AmaLayout
     def notification_sidebar
       return '' unless user
 
-      h.render 'ama_layout/notification_sidebar', navigation: self, notifications: decorated_notifications
+      h.render ama_layout_partial('notification_sidebar'), navigation: self, notifications: decorated_notifications
     end
 
     def notifications_heading

data/lib/ama_layout/draper_replacement.rb

@@ -1,8 +1,14 @@
+# frozen_string_literal: true
+
+require_relative '../../app/helpers/ama_layout_partial_helper'
+
 module AmaLayout
   module DraperReplacement
     extend ActiveSupport::Concern
 
     included do
+      include AmaLayoutPartialHelper
+
       attr_accessor :object, :controller
 
       def h(view_data = {})

data/lib/ama_layout/moneris.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AmaLayout
   class Moneris
     include ActiveModel::Model
@@ -9,7 +11,14 @@ module AmaLayout
     attr_accessor :textbox_style_file
 
     def textbox_style_file
-      @textbox_style_file ||= File.join Gem.loaded_specs["ama_layout"].full_gem_path, "lib", "ama_layout", "moneris", "textbox.txt"
+      @textbox_style_file ||= File.join(
+        Gem.loaded_specs['ama_layout'].full_gem_path,
+        'lib',
+        'ama_layout',
+        'moneris',
+        Rails.configuration.stylesheet_resolver.version,
+        'textbox.txt'
+      )
     end
   end
 end

data/lib/ama_layout/moneris/v3/textbox.txt

@@ -0,0 +1,62 @@
+-webkit-appearance: none;
+-webkit-box-shadow: none;
+-webkit-rtl-ordering: logical;
+-webkit-transition-delay: 0s, 0s;
+-webkit-transition-duration: 0.45s, 0.45s;
+-webkit-transition-property: box-shadow, border-color;
+-webkit-transition-timing-function: ease, ease-in-out;
+-webkit-user-select: text;
+-webkit-writing-mode: horizontal-tb;
+background-color: rgb(255, 255, 255);
+border-bottom-color: rgb(160, 160, 161);
+border-bottom-style: solid;
+border-bottom-width: 2px;
+border-image-outset: 0px;
+border-image-repeat: stretch;
+border-image-slice: 100%;
+border-image-source: none;
+border-image-width: 1;
+border-left-color: rgb(160, 160, 161);
+border-left-style: solid;
+border-left-width: 2px;
+border-right-color: rgb(160, 160, 161);
+border-right-style: solid;
+border-right-width: 2px;
+border-top-color: rgb(160, 160, 161);
+border-top-style: solid;
+border-top-width: 2px;
+box-shadow: none;
+border-radius: 9px;
+box-sizing: border-box;
+color: rgba(0, 0, 0, 0.74902);
+cursor: auto;
+display: block;
+font-family: 'Open Sans', Helvetica, Roboto, Arial, sans-serif;
+font-size: 18px;
+font-style: normal;
+font-variant: normal;
+font-weight: normal;
+height: 63px !important;
+overflow: hidden;
+letter-spacing: normal;
+line-height: normal;
+margin-bottom: 0px;
+margin-left: 0px;
+margin-right: 0px;
+margin-top: 0px;
+outline-color: rgb(36, 108, 169);
+padding-bottom: 8px;
+padding-left: 8px;
+padding-right: 8px;
+padding-top: 8px;
+text-align: start;
+text-indent: 0px;
+text-shadow: none;
+text-transform: none;
+transition-delay: 0s, 0s;
+transition-duration: 0.45s, 0.45s;
+transition-property: box-shadow, border-color;
+transition-timing-function: ease, ease-in-out;
+width: 100%;
+word-spacing: 0px;
+writing-mode: lr-tb;

data/lib/ama_layout/navigation.yml

@@ -51,7 +51,7 @@ member:
   - text: "My Travel"
     link: "<%= Rails.configuration.travel_login_url %>"
   - text: "My Account Settings"
-    link: "<%= Rails.configuration.gatekeeper_site %>/user/edit"
+    link: "<%= Rails.configuration.gatekeeper_site %>/account_settings"
     icon: "fa-cogs"
     sub_nav:
       - text: "Change Email/Password"
@@ -136,7 +136,7 @@ member-in-renewal:
   - text: "My Travel"
     link: "<%= Rails.configuration.travel_login_url %>"
   - text: "My Account Settings"
-    link: "<%= Rails.configuration.gatekeeper_site %>/user/edit"
+    link: "<%= Rails.configuration.gatekeeper_site %>/account_settings"
     icon: "fa-cogs"
     sub_nav:
       - text: "Change Email/Password"

data/lib/ama_layout/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AmaLayout
-  VERSION = '10.1.0'
+  VERSION = '11.3.1'
 end

data/spec/ama_layout/decorators/moneris_decorator_spec.rb

@@ -14,7 +14,7 @@ describe AmaLayout::MonerisDecorator, type: :decorator do
       expect(moneris_presenter.textbox).to include "-webkit-user-select: text;"
       expect(moneris_presenter.textbox).to include "-webkit-writing-mode: horizontal-tb;"
       expect(moneris_presenter.textbox).to include "background-color: rgb(255, 255, 255);"
-      expect(moneris_presenter.textbox).to include "border-bottom-color: rgb(229, 229, 229);"
+      expect(moneris_presenter.textbox).to include "border-bottom-color: rgb(160, 160, 161);"
       expect(moneris_presenter.textbox).to include "border-bottom-style: solid;"
       expect(moneris_presenter.textbox).to include "border-bottom-width: 2px;"
       expect(moneris_presenter.textbox).to include "border-image-outset: 0px;"
@@ -22,13 +22,13 @@ describe AmaLayout::MonerisDecorator, type: :decorator do
       expect(moneris_presenter.textbox).to include "border-image-slice: 100%;"
       expect(moneris_presenter.textbox).to include "border-image-source: none;"
       expect(moneris_presenter.textbox).to include "border-image-width: 1;"
-      expect(moneris_presenter.textbox).to include "border-left-color: rgb(229, 229, 229);"
+      expect(moneris_presenter.textbox).to include "border-left-color: rgb(160, 160, 161)"
       expect(moneris_presenter.textbox).to include "border-left-style: solid;"
       expect(moneris_presenter.textbox).to include "border-left-width: 2px;"
-      expect(moneris_presenter.textbox).to include "border-right-color: rgb(229, 229, 229);"
+      expect(moneris_presenter.textbox).to include "border-right-color: rgb(160, 160, 161)"
       expect(moneris_presenter.textbox).to include "border-right-style: solid;"
       expect(moneris_presenter.textbox).to include "border-right-width: 2px;"
-      expect(moneris_presenter.textbox).to include "border-top-color: rgb(229, 229, 229);"
+      expect(moneris_presenter.textbox).to include "border-top-color: rgb(160, 160, 161)"
       expect(moneris_presenter.textbox).to include "border-top-style: solid;"
       expect(moneris_presenter.textbox).to include "border-top-width: 2px;"
       expect(moneris_presenter.textbox).to include "box-shadow: none;"
@@ -36,16 +36,19 @@ describe AmaLayout::MonerisDecorator, type: :decorator do
       expect(moneris_presenter.textbox).to include "color: rgba(0, 0, 0, 0.74902);"
       expect(moneris_presenter.textbox).to include "cursor: auto;"
       expect(moneris_presenter.textbox).to include "display: block;"
-      expect(moneris_presenter.textbox).to include "font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;font-size: 14px;"
-      expect(moneris_presenter.textbox).to include "font-style: normal;font-variant: normal;"
+      expect(moneris_presenter.textbox).to include "font-family: 'Open Sans', Helvetica, Roboto, Arial, sans-serif;"
+      expect(moneris_presenter.textbox).to include "font-size: 18px;"
+      expect(moneris_presenter.textbox).to include "font-style: normal;"
+      expect(moneris_presenter.textbox).to include "font-variant: normal;"
       expect(moneris_presenter.textbox).to include "font-weight: normal;"
-      expect(moneris_presenter.textbox).to include "height: 44px;"
+      expect(moneris_presenter.textbox).to include "height: 63px !important;"
       expect(moneris_presenter.textbox).to include "letter-spacing: normal;"
       expect(moneris_presenter.textbox).to include "line-height: normal;"
       expect(moneris_presenter.textbox).to include "margin-bottom: 0px;"
       expect(moneris_presenter.textbox).to include "margin-left: 0px;"
       expect(moneris_presenter.textbox).to include "margin-right: 0px;"
       expect(moneris_presenter.textbox).to include "margin-top: 0px;"
+      expect(moneris_presenter.textbox).to include "outline-color: rgb(36, 108, 169);"
       expect(moneris_presenter.textbox).to include "padding-bottom: 8px;"
       expect(moneris_presenter.textbox).to include "padding-left: 8px;"
       expect(moneris_presenter.textbox).to include "padding-right: 8px;"