From 4eef62b43d1961845cfda38a5e165e99ba853e90 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Thu, 15 Feb 2018 11:53:34 -0600 Subject: [PATCH 01/37] Merge branch 'dev', bump v --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index facbfcb..cbf5049 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pcp-design", - "version": "2.1.1", + "version": "2.1.2", "description": "", "main": "index.js", "scripts": { From 7ee7e909e688ad28702aa0964e4780aeb9d9b8e2 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Thu, 15 Feb 2018 14:27:39 -0600 Subject: [PATCH 02/37] initial #7 --- src/stylesheets/_pcp.shame.scss | 25 +++++++++++++++++++ src/stylesheets/core/_pcp.base.scss | 6 +++++ src/stylesheets/layouts/_pcp.section.scss | 6 +++++ src/stylesheets/prototype/_pcp.prototype.scss | 8 ++++++ 4 files changed, 45 insertions(+) diff --git a/src/stylesheets/_pcp.shame.scss b/src/stylesheets/_pcp.shame.scss index e69de29..8bd4db5 100644 --- a/src/stylesheets/_pcp.shame.scss +++ b/src/stylesheets/_pcp.shame.scss @@ -0,0 +1,25 @@ +// TODO move to fsa-style ////////////////////////////////////////////////////// + +.fsa-tophat__bd, +.fsa-header-app__bd, +.fsa-nav-global__bd, +.fsa-topper__bd, +.fsa-footer__bd, +.fsa-screen-id__bd { + @media print { + max-width: none; + } +} + +.fsa-footer, +.fsa-screen-id { + @media print { + box-shadow: none !important; + } +} + +// TODO move to elsewhere in PCP partials ////////////////////////////////////// + +.thingthing { + +} diff --git a/src/stylesheets/core/_pcp.base.scss b/src/stylesheets/core/_pcp.base.scss index 003c170..2377414 100644 --- a/src/stylesheets/core/_pcp.base.scss +++ b/src/stylesheets/core/_pcp.base.scss @@ -13,7 +13,13 @@ dfn[title] { } .pcp-app main { + min-height: calc(100vh - 580px); // Magic number, generally: "minimum height is 100% of browser height minus the height of header and footer, plus some" + + @media print { + min-height: initial; + } + } // scss-lint:disable SelectorFormat diff --git a/src/stylesheets/layouts/_pcp.section.scss b/src/stylesheets/layouts/_pcp.section.scss index d1399be..1e249b9 100644 --- a/src/stylesheets/layouts/_pcp.section.scss +++ b/src/stylesheets/layouts/_pcp.section.scss @@ -4,9 +4,15 @@ padding-right: $size-default; &__bd { + margin-left: auto; margin-right: auto; max-width: $site-max-width; + + @media print { + max-width: none; + } + } } diff --git a/src/stylesheets/prototype/_pcp.prototype.scss b/src/stylesheets/prototype/_pcp.prototype.scss index 1268aa3..e0f8995 100644 --- a/src/stylesheets/prototype/_pcp.prototype.scss +++ b/src/stylesheets/prototype/_pcp.prototype.scss @@ -139,6 +139,10 @@ $hint-color: rgba(255, 69, 0, .8); bottom: 0; } + @media print { + display: none !important; + } + } .pcp-prototype-home & { @@ -146,6 +150,10 @@ $hint-color: rgba(255, 69, 0, .8); display: none !important; } + @media print { + display: none; + } + } } From f3af529b8549a7d8136329382aa04010d6bca355 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Thu, 15 Feb 2018 15:59:06 -0600 Subject: [PATCH 03/37] amends #7 --- src/stylesheets/components/_pcp.table.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/stylesheets/components/_pcp.table.scss b/src/stylesheets/components/_pcp.table.scss index 126c56b..083cd9b 100644 --- a/src/stylesheets/components/_pcp.table.scss +++ b/src/stylesheets/components/_pcp.table.scss @@ -187,4 +187,8 @@ th.pcp-table__cell--bisect { max-height: 68vh; } + @media print { + max-height: none; + } + } From 445058ff2a4c8b024ca441faa61b74b68b2134bc Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Tue, 20 Feb 2018 09:01:03 -0600 Subject: [PATCH 04/37] more print css [#7] --- src/stylesheets/_pcp.shame.scss | 87 +++++++++++++++++++ .../components/_pcp.table-header.scss | 3 + src/stylesheets/components/_pcp.table.scss | 6 ++ 3 files changed, 96 insertions(+) diff --git a/src/stylesheets/_pcp.shame.scss b/src/stylesheets/_pcp.shame.scss index 8bd4db5..9fee7c1 100644 --- a/src/stylesheets/_pcp.shame.scss +++ b/src/stylesheets/_pcp.shame.scss @@ -1,5 +1,67 @@ // TODO move to fsa-style ////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// +@media print { + @page { + // size: landscape; + // size: 320mm 450mm; + // size: 320mm; + size: (8.5in * 1.75) (11in * 1.75); + margin: .25in; + } +} + +body { + @media print { + background-color: transparent; + } +} + +//////////////////////////////////////////////////////////////////////////////// +.fsa-nav-global { + @media print { + border-bottom-color: $color-fsa-tertiary-200; + } +} + +.fsa-nav-global__link--active .fsa-nav-global__text { + @media print { + box-shadow: none; + } +} + +//////////////////////////////////////////////////////////////////////////////// +.fsa-content-tabs { + @media print { + background-color: transparent; + background-image: none; + } +} + +.fsa-content-tabs__label-text { + + @media print { + + color: $color-fsa-tertiary-300; + + .fsa-content-tabs__label--active & { + font-weight: $font-bold; + color: black; + box-shadow: none; + } + + } +} + +//////////////////////////////////////////////////////////////////////////////// +.pcp-table__th--sticky { + @media print { + box-shadow: none; + background: transparent; + } +} + +//////////////////////////////////////////////////////////////////////////////// .fsa-tophat__bd, .fsa-header-app__bd, .fsa-nav-global__bd, @@ -18,6 +80,31 @@ } } +.fsa-screen-id { + + @media print { + border-top: 1px solid $color-fsa-tertiary-100; + background-color: transparent; + padding: initial; + padding-top: .5em; + margin: 2em 0 0; + } + + &__bd { + @media print { + color: initial; + } + } + +} + +.fsa-topper, +.fsa-footer { + @media print { + display: none; + } +} + // TODO move to elsewhere in PCP partials ////////////////////////////////////// .thingthing { diff --git a/src/stylesheets/components/_pcp.table-header.scss b/src/stylesheets/components/_pcp.table-header.scss index e32752d..9706958 100644 --- a/src/stylesheets/components/_pcp.table-header.scss +++ b/src/stylesheets/components/_pcp.table-header.scss @@ -100,5 +100,8 @@ } } + @media print { + display: none; + } } diff --git a/src/stylesheets/components/_pcp.table.scss b/src/stylesheets/components/_pcp.table.scss index 083cd9b..4039109 100644 --- a/src/stylesheets/components/_pcp.table.scss +++ b/src/stylesheets/components/_pcp.table.scss @@ -151,6 +151,10 @@ } + @media print { + margin-top: 2em; + } + } // scss-lint:disable QualifyingElement SelectorFormat @@ -188,6 +192,8 @@ th.pcp-table__cell--bisect { } @media print { + border-left: 0; + border-right: 0; max-height: none; } From b5012ea4b42dbe3e7677be75d63e0bbb2f4739fc Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Tue, 20 Feb 2018 13:54:41 -0600 Subject: [PATCH 05/37] initial #78 --- src/includes/pcp-title-action-bar__complete-review.html | 3 +++ src/stylesheets/components/_pcp.title-action-bar.scss | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/includes/pcp-title-action-bar__complete-review.html b/src/includes/pcp-title-action-bar__complete-review.html index e960ab5..45ea7ce 100644 --- a/src/includes/pcp-title-action-bar__complete-review.html +++ b/src/includes/pcp-title-action-bar__complete-review.html @@ -4,6 +4,9 @@

{{ title }}

+
diff --git a/src/stylesheets/components/_pcp.title-action-bar.scss b/src/stylesheets/components/_pcp.title-action-bar.scss index b7eb53c..4973134 100644 --- a/src/stylesheets/components/_pcp.title-action-bar.scss +++ b/src/stylesheets/components/_pcp.title-action-bar.scss @@ -13,15 +13,16 @@ &__hd { @include breakpoint(L) { - @include fsa-grid-column-width(8); + // @include fsa-grid-column-width(8); } } &__ft { margin-top: $size-small; @include breakpoint(L) { - @include fsa-grid-column-width(4); + // @include fsa-grid-column-width(4); margin-top: 0; + margin-left: auto; text-align: right; } } From 34dd6bc7bea585bd5fcf37eea3e1a10c57743f65 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Tue, 20 Feb 2018 16:02:43 -0600 Subject: [PATCH 06/37] maturing #78 --- src/includes/pcp-modal__print-review.html | 95 +++++++++++++++++++ src/includes/pcp-title-action-bar.html | 10 +- ...pcp-title-action-bar__complete-review.html | 11 ++- .../pcp-title-action-bar__publish.html | 7 +- .../pcp-title-action-bar__reopen.html | 14 ++- src/stylesheets/_pcp.shame.scss | 10 ++ .../components/_pcp.title-action-bar.scss | 7 ++ src/workflow_review.html | 1 + 8 files changed, 148 insertions(+), 7 deletions(-) create mode 100644 src/includes/pcp-modal__print-review.html diff --git a/src/includes/pcp-modal__print-review.html b/src/includes/pcp-modal__print-review.html new file mode 100644 index 0000000..d0f1e79 --- /dev/null +++ b/src/includes/pcp-modal__print-review.html @@ -0,0 +1,95 @@ + diff --git a/src/includes/pcp-title-action-bar.html b/src/includes/pcp-title-action-bar.html index 1cc11b7..872fd5e 100644 --- a/src/includes/pcp-title-action-bar.html +++ b/src/includes/pcp-title-action-bar.html @@ -4,7 +4,15 @@

{{ title }}

- + +
diff --git a/src/includes/pcp-title-action-bar__complete-review.html b/src/includes/pcp-title-action-bar__complete-review.html index 45ea7ce..3be6736 100644 --- a/src/includes/pcp-title-action-bar__complete-review.html +++ b/src/includes/pcp-title-action-bar__complete-review.html @@ -4,10 +4,15 @@

{{ title }}

- + -
diff --git a/src/includes/pcp-title-action-bar__publish.html b/src/includes/pcp-title-action-bar__publish.html index 3f2c0bc..91823b4 100644 --- a/src/includes/pcp-title-action-bar__publish.html +++ b/src/includes/pcp-title-action-bar__publish.html @@ -3,7 +3,12 @@

{{ title }}

- +
diff --git a/src/includes/pcp-title-action-bar__reopen.html b/src/includes/pcp-title-action-bar__reopen.html index 14b61b9..9a14c7c 100644 --- a/src/includes/pcp-title-action-bar__reopen.html +++ b/src/includes/pcp-title-action-bar__reopen.html @@ -4,8 +4,18 @@

{{ title }}

- - + + +
diff --git a/src/stylesheets/_pcp.shame.scss b/src/stylesheets/_pcp.shame.scss index 9fee7c1..ffdeda7 100644 --- a/src/stylesheets/_pcp.shame.scss +++ b/src/stylesheets/_pcp.shame.scss @@ -17,6 +17,16 @@ body { } } +//////////////////////////////////////////////////////////////////////////////// +.fsa-btn--large { + padding-left: 18px; + padding-right: 18px; +} +//////////////////////////////////////////////////////////////////////////////// +.fsa-form-list > li > .fsa-form-list { + margin-left: 30px; +} + //////////////////////////////////////////////////////////////////////////////// .fsa-nav-global { @media print { diff --git a/src/stylesheets/components/_pcp.title-action-bar.scss b/src/stylesheets/components/_pcp.title-action-bar.scss index 4973134..5d3550c 100644 --- a/src/stylesheets/components/_pcp.title-action-bar.scss +++ b/src/stylesheets/components/_pcp.title-action-bar.scss @@ -50,4 +50,11 @@ } + &__icon { + $icon-size: ($size-medium * .9); + width: $icon-size; + height: $icon-size; + transform: translateY(-1px); + } + } diff --git a/src/workflow_review.html b/src/workflow_review.html index 5fc2504..cc73a74 100644 --- a/src/workflow_review.html +++ b/src/workflow_review.html @@ -187,6 +187,7 @@

BRL - Barley

{% include: 'includes/pcp-modal__edit-workflow.html' %} {% include: 'includes/pcp-modal__differential-footnotes.html' %} + {% include: 'includes/pcp-modal__print-review.html' %} {% include: 'includes/whiteout.html' @HIDDEN:'true' %} From e11fa6177e841df4f63807f52d4f190493bb52f8 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Tue, 20 Feb 2018 17:06:33 -0600 Subject: [PATCH 07/37] stable print features selection, including indterminate checkboxes [#78] --- src/includes/pcp-modal__print-discovery.html | 96 ++++++++++++++++++++ src/includes/pcp-modal__print-review.html | 39 ++++---- src/js/prototype.js | 33 +++++++ src/stylesheets/_pcp.shame.scss | 2 +- src/workflow_discovery.html | 1 + 5 files changed, 151 insertions(+), 20 deletions(-) create mode 100644 src/includes/pcp-modal__print-discovery.html diff --git a/src/includes/pcp-modal__print-discovery.html b/src/includes/pcp-modal__print-discovery.html new file mode 100644 index 0000000..c2ed235 --- /dev/null +++ b/src/includes/pcp-modal__print-discovery.html @@ -0,0 +1,96 @@ + diff --git a/src/includes/pcp-modal__print-review.html b/src/includes/pcp-modal__print-review.html index d0f1e79..16b8ede 100644 --- a/src/includes/pcp-modal__print-review.html +++ b/src/includes/pcp-modal__print-review.html @@ -3,51 +3,52 @@

Print: Review Adjustments

+
    -
  • +
  • - +
    • - +
    • - +
    • - +
    • - +
    • - +
    • - +
    • - +
    • - +
    • - +
    • - +
    @@ -58,30 +59,30 @@

    Print: Review Adjustments

    • -
  • +
  • - +
    • - +
    • - +
    • - +
    • - +
    • - +
    diff --git a/src/js/prototype.js b/src/js/prototype.js index db34257..726ddbd 100644 --- a/src/js/prototype.js +++ b/src/js/prototype.js @@ -205,6 +205,39 @@ $('body').on('change', '[data-behavior~="select-multi-all"]', function(event) { }) +$('body').on('change', '[data-behavior~="multi-check"]', function(event) { + + var $self = $(this); + var $component = $self.closest('[data-multi-check-group]'); + var $checks = $component.find('[data-multi-check-group__item]'); + + if($self.is(':checked')) { + $checks.prop('checked', true); + } + else { + $checks.prop('checked', false); + } + +}) + +$('body').on('change', '[data-behavior~="multi-check-item"]', function(event) { + + var $self = $(this); + var $component = $self.closest('[data-multi-check-group]'); + var $parent = $component.find('[data-multi-check-group__parent]'); + var $checks = $component.find('[data-multi-check-group__item]'); + + if ($checks.not(":checked").length === 0) { + $parent.prop('indeterminate', false); + $parent.prop('checked', true); + } + else { + $parent.prop('indeterminate', true); + $parent.prop('checked', false); + } + +}) + $('body').on('click', '[data-behavior~="popover-dismiss"]', function(event) { var $self = $(this); var $component = $self.closest('.pcp-popover'); diff --git a/src/stylesheets/_pcp.shame.scss b/src/stylesheets/_pcp.shame.scss index ffdeda7..9cb22a5 100644 --- a/src/stylesheets/_pcp.shame.scss +++ b/src/stylesheets/_pcp.shame.scss @@ -24,7 +24,7 @@ body { } //////////////////////////////////////////////////////////////////////////////// .fsa-form-list > li > .fsa-form-list { - margin-left: 30px; + margin-left: $size-medium; } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/workflow_discovery.html b/src/workflow_discovery.html index d53d77c..be7d3ef 100644 --- a/src/workflow_discovery.html +++ b/src/workflow_discovery.html @@ -49,6 +49,7 @@ {% include: 'includes/pcp-modal__entry-glf.html' %} {% include: 'includes/pcp-modal__entry-rice.html' %} {% include: 'includes/pcp-modal__edit-workflow.html' %} + {% include: 'includes/pcp-modal__print-discovery.html' %} {% include: 'includes/whiteout.html' @HIDDEN:'true' %} From c6267707a3f5abcdd38573d8da71e28d00c8845e Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Tue, 20 Feb 2018 17:47:44 -0600 Subject: [PATCH 08/37] [amends #78] --- src/includes/pcp-modal__print-discovery.html | 109 ++++++++----------- 1 file changed, 48 insertions(+), 61 deletions(-) diff --git a/src/includes/pcp-modal__print-discovery.html b/src/includes/pcp-modal__print-discovery.html index c2ed235..4c98716 100644 --- a/src/includes/pcp-modal__print-discovery.html +++ b/src/includes/pcp-modal__print-discovery.html @@ -7,87 +7,74 @@

    Print: Today's Assignments

    • - - + + + +
      • +
    • + + + + +
      • +
    • + + + -
        -
      • - - -
        • -
      • - - -
        • -
      • - - -
        • -
      • - - -
        • -
      • - - -
        • -
      • - - -
        • -
      • - - -
        • -
      • - - -
        • -
      • - - -
        • -
      • - - -
        • -
      • -
    • +
    • - - + +
    • - - + +
      • - - -
        • -
      • - - + +
      • - - + +
        • +
      +
      • +
    • + + + + +
      • - - + +
      • - - + +
      • +
    • + + + + +
      • +
    • + + + + +
    +

    From 5fc998c5ad152b75ead05c166465454dac45306d Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Tue, 20 Feb 2018 17:57:28 -0600 Subject: [PATCH 09/37] wip #78 --- .../pcp-modal__print-adjustments.html | 32 +++++++++++++++++++ src/workflow_mapping.html | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 src/includes/pcp-modal__print-adjustments.html diff --git a/src/includes/pcp-modal__print-adjustments.html b/src/includes/pcp-modal__print-adjustments.html new file mode 100644 index 0000000..a44c31d --- /dev/null +++ b/src/includes/pcp-modal__print-adjustments.html @@ -0,0 +1,32 @@ + diff --git a/src/workflow_mapping.html b/src/workflow_mapping.html index 9971a62..76bba6b 100644 --- a/src/workflow_mapping.html +++ b/src/workflow_mapping.html @@ -47,6 +47,8 @@ {% include: 'includes/pcp-modal__edit-workflow.html' %} {% include: 'includes/pcp-modal__edit-state-adjustments.html' %} + {% include: 'includes/pcp-modal__print-adjustments.html' %} + {% include: 'includes/whiteout.html' @HIDDEN:'true' %}
    From 60ad012e219b7c800c8f5617b81d1f4d1b79feb9 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Wed, 21 Feb 2018 07:06:24 -0600 Subject: [PATCH 10/37] stubbing out custom print views for Adjustments/Mapping [amends #78] --- .../pcp-modal__print-adjustments.html | 68 +++++++++++++++---- 1 file changed, 56 insertions(+), 12 deletions(-) diff --git a/src/includes/pcp-modal__print-adjustments.html b/src/includes/pcp-modal__print-adjustments.html index a44c31d..9292809 100644 --- a/src/includes/pcp-modal__print-adjustments.html +++ b/src/includes/pcp-modal__print-adjustments.html @@ -7,22 +7,66 @@

    Print: Adjustments

    • - - + + + +
      • +
    • + + + + +
      • +
    • + + + + +
      • +
    • + + + + +
      • +
    • + + + + +
      • +
    • + + + + +
      • +
    • + + + + +
      • +
    • + + + + +
      • +
    • + + + + +
      • +
    • + + +
    - YC - Corn - YSB - Soybean - SOR - Sorghum - HRW - Hard Red Winter Wheat - SRW - Soft Red Winter Wheat - WHI - Soft White Wheat - HRS - Hard Red Spring Wheat - HAD - Hard Amber Durum - OAT - Oats - BRL - Barley

    From 3c02539857a325f752dba0e80d349fbe3aed418f Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Wed, 21 Feb 2018 07:21:34 -0600 Subject: [PATCH 11/37] select all / indeterminate set for Adjustments/Mapping print [#78] --- .../pcp-modal__print-adjustments.html | 131 +++++++++--------- 1 file changed, 68 insertions(+), 63 deletions(-) diff --git a/src/includes/pcp-modal__print-adjustments.html b/src/includes/pcp-modal__print-adjustments.html index 9292809..967b56d 100644 --- a/src/includes/pcp-modal__print-adjustments.html +++ b/src/includes/pcp-modal__print-adjustments.html @@ -3,71 +3,76 @@

    Print: Adjustments

    - -
      -
    • +
      +

      - - + + -

      • -
    • - - - - -
      • -
    • - - - - -
      • -
    • - - - - -
      • -
    • - - - - -
      • -
    • - - - - -
      • -
    • - - - - -
      • -
    • - - - - -
      • -
    • - - - - -
      • -
    • - - - - -
      • -
    - - +

    +
      +
    • + + + + +
      • +
    • + + + + +
      • +
    • + + + + +
      • +
    • + + + + +
      • +
    • + + + + +
      • +
    • + + + + +
      • +
    • + + + + +
      • +
    • + + + + +
      • +
    • + + + + +
      • +
    • + + + + +
      • +
    +

    From 45759dddeab9246b70112f4a743c5c7dd207cc93 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Wed, 21 Feb 2018 07:54:22 -0600 Subject: [PATCH 12/37] more intelligent indeterminate checks [amends #78] --- src/js/prototype.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/js/prototype.js b/src/js/prototype.js index 726ddbd..bd12f35 100644 --- a/src/js/prototype.js +++ b/src/js/prototype.js @@ -227,15 +227,27 @@ $('body').on('change', '[data-behavior~="multi-check-item"]', function(event) { var $parent = $component.find('[data-multi-check-group__parent]'); var $checks = $component.find('[data-multi-check-group__item]'); - if ($checks.not(":checked").length === 0) { + checksAmt = $checks.length; + checksAmtNotChecked = $checks.not(":checked").length; + + console.log(checksAmtNotChecked + ' of ' + checksAmt + ' are NOT checked'); + + if (checksAmt === checksAmtNotChecked) { + $parent.prop('indeterminate', false); + $parent.prop('checked', false); + } + else if (checksAmtNotChecked === 0) { + // console.log('ALL children are checked'); $parent.prop('indeterminate', false); $parent.prop('checked', true); } else { + // console.log('SOME children are checked'); $parent.prop('indeterminate', true); $parent.prop('checked', false); } + }) $('body').on('click', '[data-behavior~="popover-dismiss"]', function(event) { From 6784145d38361e0072a1e570eb5d0c9a3418a79c Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Wed, 21 Feb 2018 09:33:28 -0600 Subject: [PATCH 13/37] print view template [#78] --- src/includes/pcp-info-bar__print.html | 20 +++++ ...able_review-differential__cotton__RAW.html | 11 +++ .../table_review-differential__rice__RAW.html | 49 +++++++++++ src/stylesheets/components/_pcp.info-bar.scss | 26 ++++++ src/stylesheets/components/_pcp.print.scss | 40 +++++++++ src/stylesheets/components/_pcp.table.scss | 4 + src/stylesheets/pcp.scss | 1 + src/workflow_review__print.html | 88 +++++++++++++++++++ 8 files changed, 239 insertions(+) create mode 100644 src/includes/pcp-info-bar__print.html create mode 100644 src/includes/table_review-differential__cotton__RAW.html create mode 100644 src/includes/table_review-differential__rice__RAW.html create mode 100644 src/stylesheets/components/_pcp.print.scss create mode 100644 src/workflow_review__print.html diff --git a/src/includes/pcp-info-bar__print.html b/src/includes/pcp-info-bar__print.html new file mode 100644 index 0000000..185aa20 --- /dev/null +++ b/src/includes/pcp-info-bar__print.html @@ -0,0 +1,20 @@ +
    +
    +
    + EFFECTIVE DATE + +
    +
    + ORGANIZER + Carol Brady +
    +
    + APPROVER + Mike Brady +
    +
    + NOTES + Mapping meeting may be earlier today due to possible inclement weather. +
    +
    +
    diff --git a/src/includes/table_review-differential__cotton__RAW.html b/src/includes/table_review-differential__cotton__RAW.html new file mode 100644 index 0000000..e7756e7 --- /dev/null +++ b/src/includes/table_review-differential__cotton__RAW.html @@ -0,0 +1,11 @@ +UPLAND COTTON ADJUSTED WORLD PRICE (AWP), FINE COUNT ADJUSTMENT (FCA), COARSE COUNT ADJUSTMENT (CCA), and +MARKET GAIN/LOAN DEFICIENCY PAY RATE (LDP) +Effective 12:01 a.m. Eastern Time, Friday, 10/14/16, through midnight Eastern Time, Thursday, 10/20/16: +AWP = 57.90 cents per pound +FCA 2015 crop = 0.01 cents per pound +FCA 2016 crop = 0.11 cents per pound +CCA = 0.00 cents per pound +LDP Rate = 0.00 cents per pound, subject to allowable fine count or coarse count adjustment. + + +The next scheduled AWP, FCA, and CCA announcement will be at 4:00 p.m. Eastern Time, Thursday, 10/20/16. diff --git a/src/includes/table_review-differential__rice__RAW.html b/src/includes/table_review-differential__rice__RAW.html new file mode 100644 index 0000000..3ae13f3 --- /dev/null +++ b/src/includes/table_review-differential__rice__RAW.html @@ -0,0 +1,49 @@ +The following world prices of rice are effective from 10/19/16 at +7:00 am eastern time until the next announcement occurs. The next +price announcement is scheduled for 10/26/16 at 7:00 am eastern time. + 0 +. Rates Per Hundredweight Rough +Rates Per Pound For . Rice for Farm-Stored and +Milled Rice Kernels . Warehouse Loans and LDPs +_____________________________________________________________________ +. + 0 +2015 CROP +. World Loan Market +World Loan . Market Gain and +Price Rate . Index LDP Rate +----Cents/Pound---- . ---$/Hundredweight--- +. +Long 13.56 10.22 . 12.31 0.00 +Med/Short 13.20 9.63 . 11.94 0.00 +Broken 8.18 6.51 . na na +_____________________________________________________________________ +. +2016 CROP . World Loan Market +World Loan . Market Gain and +Price Rate . Index LDP Rate +----Cents/Pound---- . ---$/Hundredweight--- +. +Long 13.22 9.98 . 11.89 0.00 +Med/Short 12.84 9.55 . 11.64 0.00 +Broken 7.97 7.16 . na na +_____________________________________________________________________ +The above prices are based on the following loan rates, world prices +and milling yields per hundredweight of rough rice: + 0 +2015 CROP +Loan Rate World Price . Whole/Broken Yield +------ $/Cwt ------ . (Pounds/Cwt) +. +Long 6.60 8.69 . 56.41/12.76 +Med/Short 6.45 8.76 . 59.91/10.45 + 0 + 0 +2016 CROP +Loan Rate World Price . Whole/Broken Yield +------ $/Cwt ------ . (Pounds/Cwt) +. +Long 6.50 8.41 . 55.67/13.17 +Med/Short 6.50 8.59 . 61.16/9.21 + 0 + diff --git a/src/stylesheets/components/_pcp.info-bar.scss b/src/stylesheets/components/_pcp.info-bar.scss index d3d4e81..a239c19 100644 --- a/src/stylesheets/components/_pcp.info-bar.scss +++ b/src/stylesheets/components/_pcp.info-bar.scss @@ -6,9 +6,19 @@ @include font-size(2); + .pcp-info-bar--print & { + @include font-size(3); + } + @include breakpoint(L) { + display: flex; align-items: center; + + .pcp-info-bar--print & { + align-items: initial; + } + } } @@ -28,21 +38,37 @@ margin-right: 0; } + .pcp-info-bar--print & { + white-space: normal; + } + } > strong { // boy was this a mistake, TODO: sometime + .pcp-info-bar--print & { + display: block; + } + margin-right: $size-base; } &--truncate { + max-width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; word-wrap: normal; + + .pcp-info-bar--print & { + white-space: normal; + } + } } + &--print {} + } diff --git a/src/stylesheets/components/_pcp.print.scss b/src/stylesheets/components/_pcp.print.scss new file mode 100644 index 0000000..3318da5 --- /dev/null +++ b/src/stylesheets/components/_pcp.print.scss @@ -0,0 +1,40 @@ +.pcp-print { + + h1, + h2, + h3, + h4, + h5, + h6 { + font-weight: $font-bold; + } + + h2 { + border-top: 2px solid $color-fsa-tertiary; + margin-top: 1em; + padding-top: $size-default; + } + + pre { + @include font-size(3); + background-color: transparent; + padding: $size-default; + color: inherit; + border: 1px solid $table-border-color; + } + + .pcp-table { + border-top-width: 3px; + border-left: 1px solid $table-border-color; + border-right: 1px solid $table-border-color; + } + + &__hd {} + + &__segment { + page-break-after: always; + } + + &__ft {} + +} diff --git a/src/stylesheets/components/_pcp.table.scss b/src/stylesheets/components/_pcp.table.scss index 4039109..6464446 100644 --- a/src/stylesheets/components/_pcp.table.scss +++ b/src/stylesheets/components/_pcp.table.scss @@ -110,6 +110,10 @@ box-shadow: none; } + @media print { + position: static; + } + } } diff --git a/src/stylesheets/pcp.scss b/src/stylesheets/pcp.scss index bb3dcd7..761750f 100644 --- a/src/stylesheets/pcp.scss +++ b/src/stylesheets/pcp.scss @@ -33,6 +33,7 @@ @import 'components/pcp.highlight'; @import 'components/pcp.file-upload'; @import 'components/pcp.rzslider'; // selectively styles items from lib/rzslider (imported above) +@import 'components/pcp.print'; // SHAME SHAME SHAME SHAME SHAME SHAME SHAME SHAME SHAME SHAME SHAME SHAME SHAME @import 'pcp.shame'; diff --git a/src/workflow_review__print.html b/src/workflow_review__print.html new file mode 100644 index 0000000..8b6d548 --- /dev/null +++ b/src/workflow_review__print.html @@ -0,0 +1,88 @@ +{% include: 'includes/html.html' %} + +{% include: 'includes/head.html' @title:'Posted County Prices: Review' %} + + + +
    + +
    + +
    +
    +
    + +
    +
    + {% include: 'includes/pcp-stepped-tabs__review.html' %} + {% include: 'includes/pcp-info-bar__print.html' %} +
    +
    +

    Commodities

    +

    YC - Corn

    + {% include: 'includes/review-adjustments__two-up.html' %} +

    YSB - Soybean

    + {% include: 'includes/review-adjustments__three-up.html' %} +

    SOR - Sorghum

    + {% include: 'includes/review-adjustments__two-up.html' %} +

    HRW - Hard Red Winter Wheat

    + {% include: 'includes/review-adjustments__three-up.html' %} +

    SRW - Soft Red Winter Wheat

    + {% include: 'includes/review-adjustments__two-up.html' %} +

    WHI - Soft White Wheat

    + {% include: 'includes/review-adjustments__two-up.html' %} +

    HRS - Hard Red Spring Wheat

    + {% include: 'includes/review-adjustments__three-up.html' %} +

    HAD - Hard Amber Durum

    + {% include: 'includes/review-adjustments__two-up.html' %} +

    OAT - Oats

    + {% include: 'includes/review-adjustments__two-up.html' %} +

    BRL - Barley

    + {% include: 'includes/review-adjustments__two-up.html' %} +
    +
    + +
    +
    + {% include: 'includes/pcp-stepped-tabs__review.html' %} + {% include: 'includes/pcp-info-bar__print.html' %} +
    +
    +

    LDP

    + {% include: 'includes/table_review-ldp-change.html' %} +
    +
    + +
    +
    + {% include: 'includes/pcp-stepped-tabs__review.html' %} + {% include: 'includes/pcp-info-bar__print.html' %} +
    +
    +

    Differential

    +

    Commodities

    + {% include: 'includes/table_review-differential__commodities.html' %} +

    Minor Oilseeds

    + {% include: 'includes/table_review-differential__oilseeds.html' %} +

    Pulses

    + {% include: 'includes/table_review-differential__pulses.html' %} +

    Cotton

    + 
    {% include: 'includes/table_review-differential__cotton__RAW.html' %}
    +

    Rice

    + 
    {% include: 'includes/table_review-differential__rice__RAW.html' %}
    +
    +
    + +
    +
    +
    + +
    + +
    + + {% include: 'includes/scripts.html' %} + + + + From 84938f9638ca5abb876daee5b8cdd16a696d6878 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Wed, 21 Feb 2018 10:11:58 -0600 Subject: [PATCH 14/37] print-specific header [#78] --- src/includes/pcp-header__profile-only.html | 4 ++-- src/includes/pcp-modal__print-review.html | 3 +-- src/includes/print-segment-header.html | 6 ++++++ src/stylesheets/components/_pcp.print.scss | 11 +++++++++++ src/workflow_review__print.html | 20 ++++++++++++++------ 5 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 src/includes/print-segment-header.html diff --git a/src/includes/pcp-header__profile-only.html b/src/includes/pcp-header__profile-only.html index fdf23a1..2d429be 100644 --- a/src/includes/pcp-header__profile-only.html +++ b/src/includes/pcp-header__profile-only.html @@ -22,8 +22,8 @@
    - PCP - Posted Country Prices + PCP + Posted County Prices
    diff --git a/src/includes/pcp-modal__print-review.html b/src/includes/pcp-modal__print-review.html index 16b8ede..1c10925 100644 --- a/src/includes/pcp-modal__print-review.html +++ b/src/includes/pcp-modal__print-review.html @@ -3,7 +3,6 @@

    Print: Review Adjustments

    -
    • @@ -89,7 +88,7 @@

      Print: Review Adjustments

    - + Print

    diff --git a/src/includes/print-segment-header.html b/src/includes/print-segment-header.html new file mode 100644 index 0000000..90c39df --- /dev/null +++ b/src/includes/print-segment-header.html @@ -0,0 +1,6 @@ +
    + PCP + Posted County Prices +
    +{% include: 'includes/pcp-info-bar__print.html' %} +{% include: 'includes/pcp-stepped-tabs__review.html' %} diff --git a/src/stylesheets/components/_pcp.print.scss b/src/stylesheets/components/_pcp.print.scss index 3318da5..8d650ca 100644 --- a/src/stylesheets/components/_pcp.print.scss +++ b/src/stylesheets/components/_pcp.print.scss @@ -29,12 +29,23 @@ border-right: 1px solid $table-border-color; } + .pcp-stepped-tabs { + margin-left: -($size-default + .1rem); + margin-right: -($size-default + .1rem); + margin-bottom: -($size-default + .1rem); + } + &__hd {} &__segment { page-break-after: always; } + &__segment-hd { + border: 1px solid $table-border-color; + padding: $size-default; + } + &__ft {} } diff --git a/src/workflow_review__print.html b/src/workflow_review__print.html index 8b6d548..5610ac2 100644 --- a/src/workflow_review__print.html +++ b/src/workflow_review__print.html @@ -14,8 +14,9 @@
    - {% include: 'includes/pcp-stepped-tabs__review.html' %} - {% include: 'includes/pcp-info-bar__print.html' %} +
    + {% include: 'includes/print-segment-header.html' %} +

    Commodities

    @@ -44,8 +45,9 @@

    BRL - Barley

    - {% include: 'includes/pcp-stepped-tabs__review.html' %} - {% include: 'includes/pcp-info-bar__print.html' %} +
    + {% include: 'includes/print-segment-header.html' %} +

    LDP

    @@ -55,8 +57,9 @@

    LDP

    - {% include: 'includes/pcp-stepped-tabs__review.html' %} - {% include: 'includes/pcp-info-bar__print.html' %} +
    + {% include: 'includes/print-segment-header.html' %} +

    Differential

    @@ -82,6 +85,11 @@

    Rice

    {% include: 'includes/scripts.html' %} + From 500e289eb68a3dc6008b8c926adcec2777832e26 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Wed, 21 Feb 2018 12:46:24 -0600 Subject: [PATCH 15/37] printy printing mcprinterson [#78] --- src/includes/pcp-modal__print-discovery.html | 15 ++- .../print-segment-header__discovery.html | 6 + ...html => print-segment-header__review.html} | 0 src/stylesheets/_pcp.shame.scss | 8 ++ src/stylesheets/components/_pcp.print.scss | 8 +- src/workflow_discovery__print.html | 105 ++++++++++++++++++ src/workflow_review__print.html | 3 +- 7 files changed, 137 insertions(+), 8 deletions(-) create mode 100644 src/includes/print-segment-header__discovery.html rename src/includes/{print-segment-header.html => print-segment-header__review.html} (100%) create mode 100644 src/workflow_discovery__print.html diff --git a/src/includes/pcp-modal__print-discovery.html b/src/includes/pcp-modal__print-discovery.html index 4c98716..498eaa4 100644 --- a/src/includes/pcp-modal__print-discovery.html +++ b/src/includes/pcp-modal__print-discovery.html @@ -3,7 +3,11 @@

    Print: Today's Assignments

    - +
    +

    + Customize your printout by selecting: GLF, PNW, and Rice +

    +
    • @@ -12,7 +16,7 @@

      Print: Today's Assignments
    • - + @@ -30,7 +34,7 @@

      Print: Today's Assignments
    • - + @@ -46,7 +50,7 @@

      Print: Today's Assignments

  • - + @@ -74,9 +78,8 @@

    Print: Today's Assignments
-

- + Print

diff --git a/src/includes/print-segment-header__discovery.html b/src/includes/print-segment-header__discovery.html new file mode 100644 index 0000000..355df52 --- /dev/null +++ b/src/includes/print-segment-header__discovery.html @@ -0,0 +1,6 @@ +
+ PCP + Posted County Prices +
+{% include: 'includes/pcp-info-bar__print.html' %} +{% include: 'includes/pcp-stepped-tabs__discovery.html' %} diff --git a/src/includes/print-segment-header.html b/src/includes/print-segment-header__review.html similarity index 100% rename from src/includes/print-segment-header.html rename to src/includes/print-segment-header__review.html diff --git a/src/stylesheets/_pcp.shame.scss b/src/stylesheets/_pcp.shame.scss index 9cb22a5..b4e375a 100644 --- a/src/stylesheets/_pcp.shame.scss +++ b/src/stylesheets/_pcp.shame.scss @@ -17,11 +17,19 @@ body { } } +//////////////////////////////////////////////////////////////////////////////// +.fsa-label { + // brute-force to override any inheritance (e.g. within an

) + font-family: $font-sans; + font-weight: $font-normal; +} + //////////////////////////////////////////////////////////////////////////////// .fsa-btn--large { padding-left: 18px; padding-right: 18px; } + //////////////////////////////////////////////////////////////////////////////// .fsa-form-list > li > .fsa-form-list { margin-left: $size-medium; diff --git a/src/stylesheets/components/_pcp.print.scss b/src/stylesheets/components/_pcp.print.scss index 8d650ca..18e975c 100644 --- a/src/stylesheets/components/_pcp.print.scss +++ b/src/stylesheets/components/_pcp.print.scss @@ -24,11 +24,17 @@ } .pcp-table { - border-top-width: 3px; + border-top: 3px solid $table-border-color; border-left: 1px solid $table-border-color; border-right: 1px solid $table-border-color; } + .pcp-overflow-table { + max-height: none; + border: 0; + margin-bottom: 2em; + } + .pcp-stepped-tabs { margin-left: -($size-default + .1rem); margin-right: -($size-default + .1rem); diff --git a/src/workflow_discovery__print.html b/src/workflow_discovery__print.html new file mode 100644 index 0000000..53af838 --- /dev/null +++ b/src/workflow_discovery__print.html @@ -0,0 +1,105 @@ +{% include: 'includes/html.html' %} + +{% include: 'includes/head.html' @title:'Posted County Prices: Discovery' %} + + + +
+ +
+ +
+
+
+ +
+
+
+ {% include: 'includes/print-segment-header__discovery.html' %} +
+
+
+

GLF - Gulf of Mexico Ports

+
    +
  • + Status: + Complete +
    • +
  • + Assignee: + Woody Boyd +
    • +
+ {% include: 'includes/program-entry__glf.html' %} +
+
+ +
+
+
+ {% include: 'includes/print-segment-header__discovery.html' %} +
+
+
+

PNW - Pacific Northwest

+
    +
  • + Status: + In Progess +
    • +
  • + Assignee: + Sam Malone +
    • +
+

Markets

+ {% include: 'includes/program-entry__pnw.html' %} +

Proteins

+ {% include: 'includes/program-entry__pnw-proteins.html' %} +
+
+ +
+
+
+ {% include: 'includes/print-segment-header__discovery.html' %} +
+
+
+

Rice

+
    +
  • + Status: + Not Started +
    • +
  • + Assignee: + Sam Malone +
    • +
+

Market Prices

+ 
{% include: 'includes/rice-markets__080917.txt' %}
+

LDP

+ 
{% include: 'includes/rice-ldp__080917.txt' %}
+
+
+ +
+
+
+ +
+ +
+ + {% include: 'includes/scripts.html' %} + + + + + + diff --git a/src/workflow_review__print.html b/src/workflow_review__print.html index 5610ac2..b1a323f 100644 --- a/src/workflow_review__print.html +++ b/src/workflow_review__print.html @@ -15,7 +15,7 @@
- {% include: 'includes/print-segment-header.html' %} + {% include: 'includes/print-segment-header__review.html' %}
@@ -85,6 +85,7 @@

Rice

{% include: 'includes/scripts.html' %} + + + + + From 6dc48640ff601919f8db479beb55bf61e636180a Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Mon, 26 Feb 2018 09:14:24 -0600 Subject: [PATCH 17/37] amends #78 --- src/stylesheets/components/_pcp.print.scss | 6 ++++++ src/workflow_mapping__print.html | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/stylesheets/components/_pcp.print.scss b/src/stylesheets/components/_pcp.print.scss index 18e975c..4f9e64e 100644 --- a/src/stylesheets/components/_pcp.print.scss +++ b/src/stylesheets/components/_pcp.print.scss @@ -41,6 +41,12 @@ margin-bottom: -($size-default + .1rem); } + .pcp-adjust { + border: 1px solid $table-border-color; + border-bottom: 0; + outline: 5px solid red; + } + &__hd {} &__segment { diff --git a/src/workflow_mapping__print.html b/src/workflow_mapping__print.html index 1c4931b..2f8c611 100644 --- a/src/workflow_mapping__print.html +++ b/src/workflow_mapping__print.html @@ -51,13 +51,13 @@

HRW - Hard Red Winter

-
+
{% include: 'includes/pcp-adjust__terminal.html' @title:'Terminal Adjustments' %}
-
+
{% include: 'includes/pcp-adjust__state.html' @title:'State Adjustments' %}
-
+
{% include: 'includes/pcp-adjust__protein-discounts.html' @title:'Premiums/Discount' %}
From bb7929004ea889c108fab2877205d6432cbaa36d Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Mon, 26 Feb 2018 13:28:39 -0600 Subject: [PATCH 18/37] relatively stable print view [#78] --- src/stylesheets/_pcp.shame.scss | 18 +++++++++++++++++- src/stylesheets/components/_pcp.adjust.scss | 17 ++++++++++++++++- src/stylesheets/components/_pcp.marker.scss | 16 ++++++---------- src/stylesheets/components/_pcp.print.scss | 1 - src/workflow_mapping__print.html | 3 +++ src/workflow_review__print.html | 4 ++-- 6 files changed, 44 insertions(+), 15 deletions(-) diff --git a/src/stylesheets/_pcp.shame.scss b/src/stylesheets/_pcp.shame.scss index b4e375a..5511106 100644 --- a/src/stylesheets/_pcp.shame.scss +++ b/src/stylesheets/_pcp.shame.scss @@ -7,7 +7,7 @@ // size: 320mm 450mm; // size: 320mm; size: (8.5in * 1.75) (11in * 1.75); - margin: .25in; + // margin: .25in; } } @@ -17,11 +17,27 @@ body { } } +//////////////////////////////////////////////////////////////////////////////// +.fsa-badge--alert { + + @media print { + background-color: shade($badge-bgc-alert, 60%); + } + +} + //////////////////////////////////////////////////////////////////////////////// .fsa-label { // brute-force to override any inheritance (e.g. within an

) font-family: $font-sans; font-weight: $font-normal; + + &--alert { + @media print { + background-color: shade($label-bgc-alert, 60%); + } + } + } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/stylesheets/components/_pcp.adjust.scss b/src/stylesheets/components/_pcp.adjust.scss index 5a00cc9..98ce791 100644 --- a/src/stylesheets/components/_pcp.adjust.scss +++ b/src/stylesheets/components/_pcp.adjust.scss @@ -5,15 +5,21 @@ // --------------------------------------------------------------------------- - &__hd { + position: relative; position: sticky; top: 0; z-index: 1; + + @media print { + position: static + } + } &__title { + @include font-size(2); text-transform: uppercase; margin: 0; @@ -22,6 +28,11 @@ font-weight: $font-bold; font-family: $font-sans; color: $color-fsa-tertiary; + + .pcp-print & { + display: none; + } + } &__options { @@ -138,6 +149,10 @@ &--adj {} + .pcp-print & { + background-color: $color-fsa-tertiary-100; + } + } &__td { diff --git a/src/stylesheets/components/_pcp.marker.scss b/src/stylesheets/components/_pcp.marker.scss index 35eae6c..b860fc2 100644 --- a/src/stylesheets/components/_pcp.marker.scss +++ b/src/stylesheets/components/_pcp.marker.scss @@ -120,14 +120,18 @@ $marker-color-affected: $color-fsa-aqua-300; // from USWDS } .pcp-marker--high & { + background-color: $marker-bgcolor-high; - // border-color: $marker-border-color-high; color: $marker-text-high; + + @media print { + background-color: shade($marker-bgcolor-high, 60%); + } + } .pcp-marker--low & { background-color: $marker-bgcolor-low; - // border-color: $marker-border-color-low; color: $marker-text-low; } @@ -157,14 +161,6 @@ $marker-color-affected: $color-fsa-aqua-300; // from USWDS z-index: 20; } - // .pcp-marker--high &:before { - // background-color: $marker-bgcolor-high; - // } - // - // .pcp-marker--low &:before { - // background-color: $marker-bgcolor-low; - // } - .pcp-marker--active &:after { z-index: 10; pointer-events: none; diff --git a/src/stylesheets/components/_pcp.print.scss b/src/stylesheets/components/_pcp.print.scss index 4f9e64e..be554a3 100644 --- a/src/stylesheets/components/_pcp.print.scss +++ b/src/stylesheets/components/_pcp.print.scss @@ -44,7 +44,6 @@ .pcp-adjust { border: 1px solid $table-border-color; border-bottom: 0; - outline: 5px solid red; } &__hd {} diff --git a/src/workflow_mapping__print.html b/src/workflow_mapping__print.html index 2f8c611..e8ed9a8 100644 --- a/src/workflow_mapping__print.html +++ b/src/workflow_mapping__print.html @@ -52,12 +52,15 @@

HRW - Hard Red Winter

+

Terminal Adjustments

{% include: 'includes/pcp-adjust__terminal.html' @title:'Terminal Adjustments' %}
+

State Adjustments

{% include: 'includes/pcp-adjust__state.html' @title:'State Adjustments' %}
+

Premiums / Discount

{% include: 'includes/pcp-adjust__protein-discounts.html' @title:'Premiums/Discount' %}
diff --git a/src/workflow_review__print.html b/src/workflow_review__print.html index b1a323f..0706b18 100644 --- a/src/workflow_review__print.html +++ b/src/workflow_review__print.html @@ -46,7 +46,7 @@

BRL - Barley

- {% include: 'includes/print-segment-header.html' %} + {% include: 'includes/print-segment-header__review.html' %}
@@ -58,7 +58,7 @@

LDP

- {% include: 'includes/print-segment-header.html' %} + {% include: 'includes/print-segment-header__review.html' %}
From c154d71aa8f8ddc34e349d6405f93c902e79248e Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Mon, 26 Feb 2018 15:50:02 -0600 Subject: [PATCH 19/37] checkMultiCheck: onload, if at least one checked, make parent indeterminate [amends #78] --- src/includes/pcp-modal__print-adjustments.html | 2 -- src/js/prototype.js | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/includes/pcp-modal__print-adjustments.html b/src/includes/pcp-modal__print-adjustments.html index b74d75e..360ee17 100644 --- a/src/includes/pcp-modal__print-adjustments.html +++ b/src/includes/pcp-modal__print-adjustments.html @@ -3,7 +3,6 @@

Print: Adjustments

-

Commodities

@@ -108,7 +107,6 @@

Map Layers

-

Print

diff --git a/src/js/prototype.js b/src/js/prototype.js index bd12f35..aa243bc 100644 --- a/src/js/prototype.js +++ b/src/js/prototype.js @@ -205,6 +205,20 @@ $('body').on('change', '[data-behavior~="select-multi-all"]', function(event) { }) +function checkMultiCheck() { + + var $component = $('[data-multi-check-group]'); + var $checker = $component.find('[data-behavior~="multi-check"]'); + var $checks = $component.find('[data-multi-check-group__item]'); + + if ($checks.is(':checked')) { + $checker.prop('indeterminate', true); + } + +} + +checkMultiCheck(); + $('body').on('change', '[data-behavior~="multi-check"]', function(event) { var $self = $(this); From 6f081240df884052950f27516d194f416704347d Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Mon, 26 Feb 2018 16:16:09 -0600 Subject: [PATCH 20/37] printy printees printing prints [#78] --- src/includes/pcp-modal__print-adjustments.html | 2 +- src/includes/pcp-modal__print-discovery.html | 2 +- src/includes/pcp-modal__print-review.html | 2 +- src/js/prototype.js | 14 ++++++++++++++ src/stylesheets/components/_pcp.print.scss | 2 ++ 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/includes/pcp-modal__print-adjustments.html b/src/includes/pcp-modal__print-adjustments.html index 360ee17..8ba1be9 100644 --- a/src/includes/pcp-modal__print-adjustments.html +++ b/src/includes/pcp-modal__print-adjustments.html @@ -108,7 +108,7 @@

Map Layers

- Print + Print

diff --git a/src/includes/pcp-modal__print-discovery.html b/src/includes/pcp-modal__print-discovery.html index 498eaa4..e1b6b8f 100644 --- a/src/includes/pcp-modal__print-discovery.html +++ b/src/includes/pcp-modal__print-discovery.html @@ -79,7 +79,7 @@

Print: Today's Assignments

- Print + Print

diff --git a/src/includes/pcp-modal__print-review.html b/src/includes/pcp-modal__print-review.html index 1c10925..48ece31 100644 --- a/src/includes/pcp-modal__print-review.html +++ b/src/includes/pcp-modal__print-review.html @@ -88,7 +88,7 @@

Print: Review Adjustments

- Print + Print

diff --git a/src/js/prototype.js b/src/js/prototype.js index aa243bc..b7d46e5 100644 --- a/src/js/prototype.js +++ b/src/js/prototype.js @@ -327,6 +327,20 @@ $('body').on('change', '[data-behavior~="DEMO-FAKING-SELECT-CONTENT-SWAP"]', fun }) +var windowObjectReference; // global variable + +$('body').on('click', '[data-behavior~="new-print-window"]', function(event) { + + windowObjectReference = window.open( + this.href, + "PCP Custom Print", + "width=1200, height=540, resizable, scrollbars=yes, status=1, left=0, top=200, location=no" + ); + + return false; + +}) + $('body').on('click', '[data-behavior~="rift-pin"]', function(event) { alert('Pin this!') diff --git a/src/stylesheets/components/_pcp.print.scss b/src/stylesheets/components/_pcp.print.scss index be554a3..c82e3da 100644 --- a/src/stylesheets/components/_pcp.print.scss +++ b/src/stylesheets/components/_pcp.print.scss @@ -1,5 +1,7 @@ .pcp-print { + padding: $size-base; + h1, h2, h3, From 61939eb716ac3ab27ef46b540e0ab310485f212b Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Tue, 27 Feb 2018 10:13:47 -0600 Subject: [PATCH 21/37] prin... tees! [#78] --- .../pcp-modal__print-adjustments.html | 13 ++++- src/includes/pcp-modal__print-discovery.html | 27 +++++++--- src/includes/pcp-modal__print-review.html | 15 +++++- src/js/prototype.js | 54 ++++++++++++++++--- 4 files changed, 90 insertions(+), 19 deletions(-) diff --git a/src/includes/pcp-modal__print-adjustments.html b/src/includes/pcp-modal__print-adjustments.html index 8ba1be9..5f3e7f1 100644 --- a/src/includes/pcp-modal__print-adjustments.html +++ b/src/includes/pcp-modal__print-adjustments.html @@ -108,7 +108,18 @@

Map Layers

- Print + + Print +

diff --git a/src/includes/pcp-modal__print-discovery.html b/src/includes/pcp-modal__print-discovery.html index e1b6b8f..59c1dec 100644 --- a/src/includes/pcp-modal__print-discovery.html +++ b/src/includes/pcp-modal__print-discovery.html @@ -9,25 +9,25 @@

Print: Today's Assignments

    -
  • +
    • -
  • +
    • -
  • +
    • -
  • +
  • @@ -60,18 +60,18 @@

    Print: Today's Assignments

  • - +
-
  • +
    • -
  • +
  • @@ -79,7 +79,18 @@

    Print: Today's Assignments

    • - Print + + Print +

    diff --git a/src/includes/pcp-modal__print-review.html b/src/includes/pcp-modal__print-review.html index 48ece31..3be9f94 100644 --- a/src/includes/pcp-modal__print-review.html +++ b/src/includes/pcp-modal__print-review.html @@ -11,7 +11,7 @@

    Print: Review Adjustments

    • - +
    • @@ -88,7 +88,18 @@

      Print: Review Adjustments

    - Print + + Print +

    diff --git a/src/js/prototype.js b/src/js/prototype.js index b7d46e5..a835024 100644 --- a/src/js/prototype.js +++ b/src/js/prototype.js @@ -208,12 +208,33 @@ $('body').on('change', '[data-behavior~="select-multi-all"]', function(event) { function checkMultiCheck() { var $component = $('[data-multi-check-group]'); - var $checker = $component.find('[data-behavior~="multi-check"]'); - var $checks = $component.find('[data-multi-check-group__item]'); - if ($checks.is(':checked')) { - $checker.prop('indeterminate', true); - } + $component.each(function(index) { + + var $self = $(this); + + var $checker = $self.find('[data-behavior~="multi-check"]'); + var $checks = $self.find('[data-multi-check-group__item]'); + + checksAmt = $checks.length; + checksAmtNotChecked = $checks.not(":checked").length; + + if ($checks.is(':checked')) { + if (checksAmt === checksAmtNotChecked) { + $checker.prop('indeterminate', false); + $checker.prop('checked', false); + } + else if (checksAmtNotChecked === 0) { + $checker.prop('indeterminate', false); + $checker.prop('checked', true); + } + else { + $checker.prop('indeterminate', true); + $checker.prop('checked', false); + } + } + + }); } @@ -261,7 +282,6 @@ $('body').on('change', '[data-behavior~="multi-check-item"]', function(event) { $parent.prop('checked', false); } - }) $('body').on('click', '[data-behavior~="popover-dismiss"]', function(event) { @@ -331,10 +351,28 @@ var windowObjectReference; // global variable $('body').on('click', '[data-behavior~="new-print-window"]', function(event) { + var $self = $(this); + + var popTitle = $self.data('pop-title'); + var popWidth = $self.data('pop-width'); + var popHeight = $self.data('pop-height'); + var popLeft = $self.data('pop-left'); + var popTop = $self.data('pop-top'); + + console.log('Print Window Attributes:\nTITLE: ' + popTitle + ', WIDTH: ' + popWidth + ', HEIGHT: ' + popHeight + ', LEFT: ' + popLeft + ', TOP: ' + popTop ) + + // function OpenMe(){ + // var height = 250; + // var width = 550; + // var top = window.innerHeight-height; + // var left = window.innerHeight-width; + // window.open('https://google.com', '_blank', 'location=yes, height=250,width=550, top='+top+', left='+left+', scrollbars=yes,status=yes'); + // } + windowObjectReference = window.open( this.href, - "PCP Custom Print", - "width=1200, height=540, resizable, scrollbars=yes, status=1, left=0, top=200, location=no" + popTitle, + 'width=' + popWidth + ',height=' + popHeight + ',left=' + popLeft + ',top=' + popTop + ',resizable,scrollbars,status=no,centerscreen' ); return false; From 79ddc26a97358255dbe0ebad96db394579e8d7d6 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Tue, 27 Feb 2018 10:18:42 -0600 Subject: [PATCH 22/37] [#78] --- src/includes/pcp-modal__print-discovery.html | 2 +- src/includes/pcp-modal__print-review.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/includes/pcp-modal__print-discovery.html b/src/includes/pcp-modal__print-discovery.html index 59c1dec..49be3f2 100644 --- a/src/includes/pcp-modal__print-discovery.html +++ b/src/includes/pcp-modal__print-discovery.html @@ -60,7 +60,7 @@

    Print: Today's Assignments

  • - +
    • diff --git a/src/includes/pcp-modal__print-review.html b/src/includes/pcp-modal__print-review.html index 3be9f94..028d869 100644 --- a/src/includes/pcp-modal__print-review.html +++ b/src/includes/pcp-modal__print-review.html @@ -11,7 +11,7 @@

    Print: Review Adjustments

    • - +
    • From 4c4dcb65674b68c3553e204fe387f3e089647084 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Tue, 27 Feb 2018 11:05:15 -0600 Subject: [PATCH 23/37] printing via popup window [#78] --- .../pcp-modal__print-adjustments.html | 7 ++-- src/includes/pcp-modal__print-discovery.html | 7 ++-- src/includes/pcp-modal__print-review.html | 7 ++-- src/js/prototype.js | 32 ++++++++----------- 4 files changed, 23 insertions(+), 30 deletions(-) diff --git a/src/includes/pcp-modal__print-adjustments.html b/src/includes/pcp-modal__print-adjustments.html index 5f3e7f1..48a385f 100644 --- a/src/includes/pcp-modal__print-adjustments.html +++ b/src/includes/pcp-modal__print-adjustments.html @@ -113,10 +113,9 @@

      Map Layers

      href="workflow_mapping__print.html" data-behavior="new-print-window" data-pop-title="PCP_CUSTOM_PRINT" - data-pop-width="1200" - data-pop-height="540" - data-pop-left="0" - data-pop-top="50" + data-pop-width="1212" + data-pop-height="640" + data-pop-extras="" > Print diff --git a/src/includes/pcp-modal__print-discovery.html b/src/includes/pcp-modal__print-discovery.html index 49be3f2..8584014 100644 --- a/src/includes/pcp-modal__print-discovery.html +++ b/src/includes/pcp-modal__print-discovery.html @@ -84,10 +84,9 @@

      Print: Today's Assignments

      href="workflow_discovery__print.html" data-behavior="new-print-window" data-pop-title="PCP_CUSTOM_PRINT" - data-pop-width="1200" - data-pop-height="540" - data-pop-left="0" - data-pop-top="50" + data-pop-width="1212" + data-pop-height="640" + data-pop-extras="" > Print diff --git a/src/includes/pcp-modal__print-review.html b/src/includes/pcp-modal__print-review.html index 028d869..50ad220 100644 --- a/src/includes/pcp-modal__print-review.html +++ b/src/includes/pcp-modal__print-review.html @@ -93,10 +93,9 @@

      Print: Review Adjustments

      href="workflow_review__print.html" data-behavior="new-print-window" data-pop-title="PCP_CUSTOM_PRINT" - data-pop-width="1200" - data-pop-height="540" - data-pop-left="0" - data-pop-top="50" + data-pop-width="1212" + data-pop-height="640" + data-pop-extras="" > Print diff --git a/src/js/prototype.js b/src/js/prototype.js index a835024..0965d80 100644 --- a/src/js/prototype.js +++ b/src/js/prototype.js @@ -349,6 +349,12 @@ $('body').on('change', '[data-behavior~="DEMO-FAKING-SELECT-CONTENT-SWAP"]', fun var windowObjectReference; // global variable +function popupCenter(url, title, w, h) { + var left = (screen.width / 2) - ( w / 2); + var top = (screen.height / 2 ) - ( h / 2); + return window.open(url, title, 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=no, copyhistory=no, width='+w+', height='+h+', top='+top+', left='+left); +} + $('body').on('click', '[data-behavior~="new-print-window"]', function(event) { var $self = $(this); @@ -356,24 +362,14 @@ $('body').on('click', '[data-behavior~="new-print-window"]', function(event) { var popTitle = $self.data('pop-title'); var popWidth = $self.data('pop-width'); var popHeight = $self.data('pop-height'); - var popLeft = $self.data('pop-left'); - var popTop = $self.data('pop-top'); - - console.log('Print Window Attributes:\nTITLE: ' + popTitle + ', WIDTH: ' + popWidth + ', HEIGHT: ' + popHeight + ', LEFT: ' + popLeft + ', TOP: ' + popTop ) - - // function OpenMe(){ - // var height = 250; - // var width = 550; - // var top = window.innerHeight-height; - // var left = window.innerHeight-width; - // window.open('https://google.com', '_blank', 'location=yes, height=250,width=550, top='+top+', left='+left+', scrollbars=yes,status=yes'); - // } - - windowObjectReference = window.open( - this.href, - popTitle, - 'width=' + popWidth + ',height=' + popHeight + ',left=' + popLeft + ',top=' + popTop + ',resizable,scrollbars,status=no,centerscreen' - ); + var popExtras = 'resizable,scrollbars,menubar=no,directories=no,location=no,toolbar=no,status=no,copyhistory=no,' + $self.data('pop-extras'); + var popLeft = (screen.width / 2) - ( popWidth / 2); + var popTop = (screen.height / 2 ) - ( popHeight / 2); + var popFeatures = 'width=' + popWidth + ',height=' + popHeight + ',left=' + popLeft + ',top=' + popTop + ',' + popExtras; + + console.log('WINDOW FEATURES: ' + popFeatures); + + windowObjectReference = window.open(this.href, popTitle, popFeatures); return false; From 47471e443e48b10614840c14d65633c58fed63fe Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Wed, 28 Feb 2018 07:57:32 -0600 Subject: [PATCH 24/37] moor #78 --- ...pcp-adjust__protein-discounts___print.html | 41 +++ src/includes/pcp-adjust__state___print.html | 48 +++ .../pcp-adjust__terminal___print.html | 55 ++++ .../pcp-modal__print-adjustments.html | 12 +- src/includes/pcp-modal__print-discovery.html | 12 +- src/includes/pcp-modal__print-review.html | 12 +- src/includes/program-entry__glf___print.html | 128 ++++++++ .../program-entry__pnw-proteins___print.html | 308 ++++++++++++++++++ src/includes/program-entry__pnw___print.html | 128 ++++++++ ...iew-differential__commodities___print.html | 215 ++++++++++++ .../table_review-ldp-change__print.html | 223 +++++++++++++ src/js/prototype.js | 4 + src/stylesheets/components/_pcp.adjust.scss | 8 - src/stylesheets/components/_pcp.print.scss | 73 ++++- src/workflow_discovery__print.html | 14 +- src/workflow_mapping__print.html | 14 +- src/workflow_review__print.html | 10 +- 17 files changed, 1228 insertions(+), 77 deletions(-) create mode 100644 src/includes/pcp-adjust__protein-discounts___print.html create mode 100644 src/includes/pcp-adjust__state___print.html create mode 100644 src/includes/pcp-adjust__terminal___print.html create mode 100644 src/includes/program-entry__glf___print.html create mode 100644 src/includes/program-entry__pnw-proteins___print.html create mode 100644 src/includes/program-entry__pnw___print.html create mode 100644 src/includes/table_review-differential__commodities___print.html create mode 100644 src/includes/table_review-ldp-change__print.html diff --git a/src/includes/pcp-adjust__protein-discounts___print.html b/src/includes/pcp-adjust__protein-discounts___print.html new file mode 100644 index 0000000..e1cf105 --- /dev/null +++ b/src/includes/pcp-adjust__protein-discounts___print.html @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      MarketAmberChangeDurumChange
      MIN-0.99-1.08-0.01
      PNW-1.00-0.01-2.00-0.01
      LOS-1.00-0.02-1.30
      WCD0.70-8.00-8.02
      diff --git a/src/includes/pcp-adjust__state___print.html b/src/includes/pcp-adjust__state___print.html new file mode 100644 index 0000000..451e94e --- /dev/null +++ b/src/includes/pcp-adjust__state___print.html @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      StateMarketAdjustmemtChange
      KSGLF0.00
      OKGLF-0.03
      COGLF0.00-0.08
      NEGLF-0.05
      SDGLF0.00
      CAGLF0.00
      diff --git a/src/includes/pcp-adjust__terminal___print.html b/src/includes/pcp-adjust__terminal___print.html new file mode 100644 index 0000000..ef2e7a4 --- /dev/null +++ b/src/includes/pcp-adjust__terminal___print.html @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      MarketPriceChangeAdjustmentChange
      AMA3.13-0.01-0.07-0.02
      KCM4.490.01-1.06
      GLF4.630.00-0.73
      MIN4.18-0.02-0.67
      PWN4.810.00-1.00
      WCD4.840.04-1.28
      diff --git a/src/includes/pcp-modal__print-adjustments.html b/src/includes/pcp-modal__print-adjustments.html index 48a385f..68bd000 100644 --- a/src/includes/pcp-modal__print-adjustments.html +++ b/src/includes/pcp-modal__print-adjustments.html @@ -108,17 +108,7 @@

      Map Layers

      - - Print - + Print

      diff --git a/src/includes/pcp-modal__print-discovery.html b/src/includes/pcp-modal__print-discovery.html index 8584014..c03c3af 100644 --- a/src/includes/pcp-modal__print-discovery.html +++ b/src/includes/pcp-modal__print-discovery.html @@ -79,17 +79,7 @@

      Print: Today's Assignments

    - - Print - + Print

    diff --git a/src/includes/pcp-modal__print-review.html b/src/includes/pcp-modal__print-review.html index 50ad220..ac7d101 100644 --- a/src/includes/pcp-modal__print-review.html +++ b/src/includes/pcp-modal__print-review.html @@ -88,17 +88,7 @@

    Print: Review Adjustments

    - - Print - + Print

    diff --git a/src/includes/program-entry__glf___print.html b/src/includes/program-entry__glf___print.html new file mode 100644 index 0000000..49eb804 --- /dev/null +++ b/src/includes/program-entry__glf___print.html @@ -0,0 +1,128 @@ +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    MarketSRW - Soft Red Winter WheatHRW - Hard Red Winter WheatYC - Corn
    MarketValueChangeValueChangeValueChange
    LMN + 1.06 + + 0.08 + + 0.34 + + -0.01 + + 2.85 + + +
    ABC + 6.06 + + 0.02 + + 4.06 + + + + 3.06 + + 0.01 +
    XYZ + 1.03 + + + + 0.02 + + + + 2.03 + + -0.07 +
    QRS + 1.28 + + + + 4.11 + + -0.03 + + 1.06 + + 0.05 +
    TRE + 1.23 + + -0.01 + + 0.22 + + + + 1.99 + + +
    +
    diff --git a/src/includes/program-entry__pnw-proteins___print.html b/src/includes/program-entry__pnw-proteins___print.html new file mode 100644 index 0000000..b35b9a6 --- /dev/null +++ b/src/includes/program-entry__pnw-proteins___print.html @@ -0,0 +1,308 @@ +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ScalePNW / HRWWCD / HRWPNW / HRS
    ValueChangeValueChangeValueChange
    Ordinary + 0.23 + 0.08 + -0.07 + -0.03 + 0.07 +
    10.00 + -0.20 + + -1.22 + + 0.22 + -0.02
    10.25 + -0.15 + 0.02 + -1.11 + -1.02 + -0.11 +
    10.50 + -0.10 + + 0.09 + + 0.09 +
    10.75 + -0.05 + + 1.95 + + -1.95 + -0.12
    11.00 + 0.00 + -0.12 + 0.50 + 0.35 + 1.50 +
    11.25 + 0.21 + + 0.91 + + -1.91 +
    11.50 + 1.05 + -0.02 + 0.45 + -0.02 + 0.45 +
    11.75 + 0.29 + + 0.09 + + 1.09 +
    12.00 + -0.34 + + -0.24 + + 1.24 + 0.01
    12.25 + 0.39 + + 0.37 + 0.01 + 1.37 +
    12.50 + 0.44 + + 0.40 + -0.12 + 0.40 +
    12.75 + 0.54 + + 1.45 + + 1.45 +
    13.00 + -0.64 + 0.02 + -1.40 + + -0.40 + 0.02
    13.25 + 0.64 + 0.01 + 1.47 + + 0.47 +
    13.50 + 0.51 + -0.02 + 0.10 + -0.01 + -0.10 +
    13.75 + 0.21 + + 1.25 + + 0.25 +
    14.00 + 0.71 + + 0.59 + + -0.00 +
    14.25 + + 0.00 + + 0.00 + + 1.22 + -0.01
    +
    diff --git a/src/includes/program-entry__pnw___print.html b/src/includes/program-entry__pnw___print.html new file mode 100644 index 0000000..7599a02 --- /dev/null +++ b/src/includes/program-entry__pnw___print.html @@ -0,0 +1,128 @@ +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    MarketSRW - Soft Red Winter WheatHRW - Hard Red Winter WheatYC - Corn
    MarketValueChangeValueChangeValueChange
    CIN + 6.06 + + 0.02 + + 4.06 + + + + 3.06 + + 0.01 +
    TOL + 1.03 + + + + 0.02 + + + + 2.03 + + -0.07 +
    EVN + 1.06 + + 0.08 + + 0.34 + + -0.01 + + 2.85 + + +
    MEM + 1.23 + + -0.01 + + 0.22 + + + + 1.99 + + +
    CCC + 1.28 + + + + 4.11 + + -0.03 + + 1.06 + + 0.05 +
    +
    diff --git a/src/includes/table_review-differential__commodities___print.html b/src/includes/table_review-differential__commodities___print.html new file mode 100644 index 0000000..1f4fdf2 --- /dev/null +++ b/src/includes/table_review-differential__commodities___print.html @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Terminal Markets: Commodities
    MarketHRWHRSSRWWHIHADYCBRLOATYSBSOR
    GLF4.674.653.883.4410.126.92
    KCM4.333.353.143.059.43
    MIN4.275.737.352.992.852.798.985.69
    TOL4.064.063.349.36
    diff --git a/src/includes/table_review-ldp-change__print.html b/src/includes/table_review-ldp-change__print.html new file mode 100644 index 0000000..09a6f6e --- /dev/null +++ b/src/includes/table_review-ldp-change__print.html @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    LDP Changes
    CommodityToday's DatePrevious Day's DateToday's Highest LDPPrevious Highest LDPLDP Change
    BRL10/17/201710/16/2017000
    CAN10/17/201710/16/2017000
    CHK10/17/201710/16/20170.0200.02
    CHL10/17/201710/16/2017000
    CRA10/17/201710/16/2017000
    DUM10/17/201710/16/2017000
    FLX10/17/201710/16/20170.0100.01
    HRS10/17/201710/16/2017000
    HW10/17/201710/16/2017000
    LEN10/17/201710/16/20170.0200.02
    MUS10/17/201710/16/201700.010
    OAT10/17/201710/16/2017000
    PEA10/17/201710/16/2017000
    RAP10/17/201710/16/201700.010
    RR10/17/201710/16/20170.0100
    RR10/17/201710/16/2017000
    RR10/17/201710/16/2017000
    SAF10/17/201710/16/20170.0100
    SEM10/17/201710/16/2017000
    SFN10/17/201710/16/2017000
    SOR10/17/201710/16/2017000
    SRW10/17/201710/16/2017000
    SUN10/17/201710/16/20170.0100.01
    WHI10/17/201710/16/2017000
    YC10/17/201710/16/2017000
    YSB10/17/201710/16/2017000
    diff --git a/src/js/prototype.js b/src/js/prototype.js index 0965d80..e206362 100644 --- a/src/js/prototype.js +++ b/src/js/prototype.js @@ -355,6 +355,10 @@ function popupCenter(url, title, w, h) { return window.open(url, title, 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=no, copyhistory=no, width='+w+', height='+h+', top='+top+', left='+left); } +function pcpCustomPrint() { + document.addEventListener('DOMContentLoaded', this.print()); +} + $('body').on('click', '[data-behavior~="new-print-window"]', function(event) { var $self = $(this); diff --git a/src/stylesheets/components/_pcp.adjust.scss b/src/stylesheets/components/_pcp.adjust.scss index 98ce791..30203ec 100644 --- a/src/stylesheets/components/_pcp.adjust.scss +++ b/src/stylesheets/components/_pcp.adjust.scss @@ -12,10 +12,6 @@ top: 0; z-index: 1; - @media print { - position: static - } - } &__title { @@ -29,10 +25,6 @@ font-family: $font-sans; color: $color-fsa-tertiary; - .pcp-print & { - display: none; - } - } &__options { diff --git a/src/stylesheets/components/_pcp.print.scss b/src/stylesheets/components/_pcp.print.scss index c82e3da..6f112b9 100644 --- a/src/stylesheets/components/_pcp.print.scss +++ b/src/stylesheets/components/_pcp.print.scss @@ -2,6 +2,38 @@ padding: $size-base; + ////////////////////////////////////////////////////////////////////////////// + + &__draft { + font-size: ($font-size-3 * 15); + line-height: 1; + font-weight: $font-bold; + color: transparentize(black, .85); + text-align: center; + text-transform: uppercase; + position: fixed; + top: 25%; + left: 0; + right: 0; + z-index: 10; + transform: rotate(-45deg); + } + + &__hd {} + + &__segment { + page-break-after: always; + } + + &__segment-hd { + border: 1px solid $table-border-color; + padding: $size-default; + } + + &__ft {} + + ////////////////////////////////////////////////////////////////////////////// + h1, h2, h3, @@ -25,6 +57,14 @@ border: 1px solid $table-border-color; } + ////////////////////////////////////////////////////////////////////////////// + + .pcp-stepped-tabs { + margin-left: -($size-default + .1rem); + margin-right: -($size-default + .1rem); + margin-bottom: -($size-default + .1rem); + } + .pcp-table { border-top: 3px solid $table-border-color; border-left: 1px solid $table-border-color; @@ -37,28 +77,29 @@ margin-bottom: 2em; } - .pcp-stepped-tabs { - margin-left: -($size-default + .1rem); - margin-right: -($size-default + .1rem); - margin-bottom: -($size-default + .1rem); - } - .pcp-adjust { + border: 1px solid $table-border-color; border-bottom: 0; - } - &__hd {} + &__table { + border-top: 3px solid $table-border-color; + border-left: 1px solid $table-border-color; + border-right: 1px solid $table-border-color; + } - &__segment { - page-break-after: always; - } + &__th, + &__td { + padding-top: $size-default; + padding-bottom: $size-default; + border-top: 1px solid $table-border-color; + border-bottom: 1px solid $table-border-color; + } - &__segment-hd { - border: 1px solid $table-border-color; - padding: $size-default; - } + &__td { + font-size: $font-size-3; + } - &__ft {} + } } diff --git a/src/workflow_discovery__print.html b/src/workflow_discovery__print.html index 61fb8a6..8d96a98 100644 --- a/src/workflow_discovery__print.html +++ b/src/workflow_discovery__print.html @@ -8,6 +8,8 @@
    +
    Draft
    +
    @@ -30,7 +32,7 @@

    GLF - Gulf of Mexico Ports

    Woody Boyd - {% include: 'includes/program-entry__glf.html' %} + {% include: 'includes/program-entry__glf___print.html' %}
    @@ -53,9 +55,9 @@

    PNW - Pacific Northwest

    Markets

    - {% include: 'includes/program-entry__pnw.html' %} + {% include: 'includes/program-entry__pnw___print.html' %}

    Proteins

    - {% include: 'includes/program-entry__pnw-proteins.html' %} + {% include: 'includes/program-entry__pnw-proteins___print.html' %} @@ -94,10 +96,8 @@

    LDP

    {% include: 'includes/scripts.html' %} - diff --git a/src/workflow_mapping__print.html b/src/workflow_mapping__print.html index e8ed9a8..a551d66 100644 --- a/src/workflow_mapping__print.html +++ b/src/workflow_mapping__print.html @@ -8,6 +8,8 @@
    +
    Draft
    +
    @@ -53,15 +55,15 @@

    HRW - Hard Red Winter

    Terminal Adjustments

    - {% include: 'includes/pcp-adjust__terminal.html' @title:'Terminal Adjustments' %} + {% include: 'includes/pcp-adjust__terminal___print.html' @title:'Terminal Adjustments' %}

    State Adjustments

    - {% include: 'includes/pcp-adjust__state.html' @title:'State Adjustments' %} + {% include: 'includes/pcp-adjust__state___print.html' @title:'State Adjustments' %}

    Premiums / Discount

    - {% include: 'includes/pcp-adjust__protein-discounts.html' @title:'Premiums/Discount' %} + {% include: 'includes/pcp-adjust__protein-discounts___print.html' @title:'Premiums/Discount' %}
    @@ -78,10 +80,8 @@

    Premiums / Discount

    {% include: 'includes/scripts.html' %} - diff --git a/src/workflow_review__print.html b/src/workflow_review__print.html index 0706b18..5ae6f87 100644 --- a/src/workflow_review__print.html +++ b/src/workflow_review__print.html @@ -51,7 +51,7 @@

    BRL - Barley

    LDP

    - {% include: 'includes/table_review-ldp-change.html' %} + {% include: 'includes/table_review-ldp-change__print.html' %}
    @@ -64,7 +64,7 @@

    LDP

    Differential

    Commodities

    - {% include: 'includes/table_review-differential__commodities.html' %} + {% include: 'includes/table_review-differential__commodities___print.html' %}

    Minor Oilseeds

    {% include: 'includes/table_review-differential__oilseeds.html' %}

    Pulses

    @@ -86,10 +86,8 @@

    Rice

    {% include: 'includes/scripts.html' %} - From 57280322201cb024855322a9628aa156c3fb44eb Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Wed, 28 Feb 2018 12:33:11 -0600 Subject: [PATCH 25/37] initial #80 --- src/component_spinbox.html | 32 +-- src/includes/program-entry__glf.html | 60 ++--- src/includes/program-entry__pnw-proteins.html | 228 +++++++++--------- .../program-entry__pnw-proteins__marked.html | 228 +++++++++--------- src/includes/program-entry__pnw.html | 60 ++--- src/includes/program-entry__pnw__marked.html | 60 ++--- src/includes/spinbox.html | 4 +- 7 files changed, 336 insertions(+), 336 deletions(-) diff --git a/src/component_spinbox.html b/src/component_spinbox.html index f4280ce..bbe3f93 100644 --- a/src/component_spinbox.html +++ b/src/component_spinbox.html @@ -52,8 +52,8 @@

    Default

    - - + +
    @@ -68,8 +68,8 @@

    Align Right

    - - + +
    @@ -84,8 +84,8 @@

    Large

    - - + +
    @@ -100,8 +100,8 @@

    Small

    - - + +
    @@ -122,8 +122,8 @@

    Disabled

    - - + +
    @@ -145,8 +145,8 @@

    step="5"

    - - + +
    @@ -161,8 +161,8 @@

    step="1" min="3" max="8"

    - - + +
    @@ -179,8 +179,8 @@

    In a Field

    - - + +
    Helpful message diff --git a/src/includes/program-entry__glf.html b/src/includes/program-entry__glf.html index 8759bf7..2427ff6 100644 --- a/src/includes/program-entry__glf.html +++ b/src/includes/program-entry__glf.html @@ -26,8 +26,8 @@
    - - + +
    @@ -40,8 +40,8 @@
    - - + +
    @@ -54,8 +54,8 @@
    - - + +
    @@ -71,8 +71,8 @@
    - - + +
    @@ -85,8 +85,8 @@
    - - + +
    @@ -99,8 +99,8 @@
    - - + +
    @@ -116,8 +116,8 @@
    - - + +
    @@ -130,8 +130,8 @@
    - - + +
    @@ -144,8 +144,8 @@
    - - + +
    @@ -161,8 +161,8 @@
    - - + +
    @@ -175,8 +175,8 @@
    - - + +
    @@ -189,8 +189,8 @@
    - - + +
    @@ -206,8 +206,8 @@
    - - + +
    @@ -220,8 +220,8 @@
    - - + +
    @@ -234,8 +234,8 @@
    - - + +
    diff --git a/src/includes/program-entry__pnw-proteins.html b/src/includes/program-entry__pnw-proteins.html index f9230bf..3bf6c87 100644 --- a/src/includes/program-entry__pnw-proteins.html +++ b/src/includes/program-entry__pnw-proteins.html @@ -26,8 +26,8 @@
    - - + +
    @@ -38,8 +38,8 @@
    - - + +
    @@ -50,8 +50,8 @@
    - - + +
    @@ -65,8 +65,8 @@
    - - + +
    @@ -77,8 +77,8 @@
    - - + +
    @@ -89,8 +89,8 @@
    - - + +
    @@ -104,8 +104,8 @@
    - - + +
    @@ -116,8 +116,8 @@
    - - + +
    @@ -128,8 +128,8 @@
    - - + +
    @@ -143,8 +143,8 @@
    - - + +
    @@ -155,8 +155,8 @@
    - - + +
    @@ -167,8 +167,8 @@
    - - + +
    @@ -182,8 +182,8 @@
    - - + +
    @@ -194,8 +194,8 @@
    - - + +
    @@ -206,8 +206,8 @@
    - - + +
    @@ -221,8 +221,8 @@
    - - + +
    @@ -233,8 +233,8 @@
    - - + +
    @@ -245,8 +245,8 @@
    - - + +
    @@ -260,8 +260,8 @@
    - - + +
    @@ -272,8 +272,8 @@
    - - + +
    @@ -284,8 +284,8 @@
    - - + +
    @@ -299,8 +299,8 @@
    - - + +
    @@ -311,8 +311,8 @@
    - - + +
    @@ -323,8 +323,8 @@
    - - + +
    @@ -338,8 +338,8 @@
    - - + +
    @@ -350,8 +350,8 @@
    - - + +
    @@ -362,8 +362,8 @@
    - - + +
    @@ -377,8 +377,8 @@
    - - + +
    @@ -389,8 +389,8 @@
    - - + +
    @@ -401,8 +401,8 @@
    - - + +
    @@ -416,8 +416,8 @@
    - - + +
    @@ -428,8 +428,8 @@
    - - + +
    @@ -440,8 +440,8 @@
    - - + +
    @@ -455,8 +455,8 @@
    - - + +
    @@ -467,8 +467,8 @@
    - - + +
    @@ -479,8 +479,8 @@
    - - + +
    @@ -494,8 +494,8 @@
    - - + +
    @@ -506,8 +506,8 @@
    - - + +
    @@ -518,8 +518,8 @@
    - - + +
    @@ -533,8 +533,8 @@
    - - + +
    @@ -545,8 +545,8 @@
    - - + +
    @@ -557,8 +557,8 @@
    - - + +
    @@ -572,8 +572,8 @@
    - - + +
    @@ -584,8 +584,8 @@
    - - + +
    @@ -596,8 +596,8 @@
    - - + +
    @@ -611,8 +611,8 @@
    - - + +
    @@ -623,8 +623,8 @@
    - - + +
    @@ -635,8 +635,8 @@
    - - + +
    @@ -650,8 +650,8 @@
    - - + +
    @@ -662,8 +662,8 @@
    - - + +
    @@ -674,8 +674,8 @@
    - - + +
    @@ -689,8 +689,8 @@
    - - + +
    @@ -701,8 +701,8 @@
    - - + +
    @@ -713,8 +713,8 @@
    - - + +
    @@ -728,8 +728,8 @@
    - - + +
    @@ -740,8 +740,8 @@
    - - + +
    @@ -752,8 +752,8 @@
    - - + +
    diff --git a/src/includes/program-entry__pnw-proteins__marked.html b/src/includes/program-entry__pnw-proteins__marked.html index 5aaed00..3975088 100644 --- a/src/includes/program-entry__pnw-proteins__marked.html +++ b/src/includes/program-entry__pnw-proteins__marked.html @@ -26,8 +26,8 @@
    - - + +
    @@ -38,8 +38,8 @@
    - - + +
    @@ -50,8 +50,8 @@
    - - + +
    @@ -65,8 +65,8 @@
    - - + +
    @@ -77,8 +77,8 @@
    - - + +
    @@ -89,8 +89,8 @@
    - - + +
    @@ -104,8 +104,8 @@
    - - + +
    @@ -116,8 +116,8 @@
    - - + +
    @@ -128,8 +128,8 @@
    - - + +
    @@ -143,8 +143,8 @@
    - - + +
    @@ -155,8 +155,8 @@
    - - + +
    @@ -167,8 +167,8 @@
    - - + +
    @@ -182,8 +182,8 @@
    - - + +
    @@ -194,8 +194,8 @@
    - - + +
    @@ -206,8 +206,8 @@
    - - + +
    @@ -221,8 +221,8 @@
    - - + +
    @@ -233,8 +233,8 @@
    - - + +
    @@ -245,8 +245,8 @@
    - - + +
    @@ -260,8 +260,8 @@
    - - + +
    @@ -272,8 +272,8 @@
    - - + +
    @@ -284,8 +284,8 @@
    - - + +
    @@ -299,8 +299,8 @@
    - - + +
    @@ -311,8 +311,8 @@
    - - + +
    @@ -323,8 +323,8 @@
    - - + +
    @@ -338,8 +338,8 @@
    - - + +
    @@ -350,8 +350,8 @@
    - - + +
    @@ -362,8 +362,8 @@
    - - + +
    @@ -377,8 +377,8 @@
    - - + +
    @@ -389,8 +389,8 @@
    - - + +
    @@ -401,8 +401,8 @@
    - - + +
    @@ -416,8 +416,8 @@
    - - + +
    @@ -428,8 +428,8 @@
    - - + +
    @@ -440,8 +440,8 @@
    - - + +
    @@ -455,8 +455,8 @@
    - - + +
    @@ -467,8 +467,8 @@
    - - + +
    @@ -479,8 +479,8 @@
    - - + +
    @@ -494,8 +494,8 @@
    - - + +
    @@ -506,8 +506,8 @@
    - - + +
    @@ -518,8 +518,8 @@
    - - + +
    @@ -533,8 +533,8 @@
    - - + +
    @@ -545,8 +545,8 @@
    - - + +
    @@ -557,8 +557,8 @@
    - - + +
    @@ -572,8 +572,8 @@
    - - + +
    @@ -584,8 +584,8 @@
    - - + +
    @@ -596,8 +596,8 @@
    - - + +
    @@ -611,8 +611,8 @@
    - - + +
    @@ -623,8 +623,8 @@
    - - + +
    @@ -635,8 +635,8 @@
    - - + +
    @@ -650,8 +650,8 @@
    - - + +
    @@ -662,8 +662,8 @@
    - - + +
    @@ -674,8 +674,8 @@
    - - + +
    @@ -689,8 +689,8 @@
    - - + +
    @@ -701,8 +701,8 @@
    - - + +
    @@ -713,8 +713,8 @@
    - - + +
    @@ -728,8 +728,8 @@
    - - + +
    @@ -740,8 +740,8 @@
    - - + +
    @@ -752,8 +752,8 @@
    - - + +
    diff --git a/src/includes/program-entry__pnw.html b/src/includes/program-entry__pnw.html index 9e4bf15..3aa8f56 100644 --- a/src/includes/program-entry__pnw.html +++ b/src/includes/program-entry__pnw.html @@ -26,8 +26,8 @@
    - - + +
    @@ -40,8 +40,8 @@
    - - + +
    @@ -54,8 +54,8 @@
    - - + +
    @@ -71,8 +71,8 @@
    - - + +
    @@ -85,8 +85,8 @@
    - - + +
    @@ -99,8 +99,8 @@
    - - + +
    @@ -116,8 +116,8 @@
    - - + +
    @@ -130,8 +130,8 @@
    - - + +
    @@ -144,8 +144,8 @@
    - - + +
    @@ -161,8 +161,8 @@
    - - + +
    @@ -175,8 +175,8 @@
    - - + +
    @@ -189,8 +189,8 @@
    - - + +
    @@ -206,8 +206,8 @@
    - - + +
    @@ -220,8 +220,8 @@
    - - + +
    @@ -234,8 +234,8 @@
    - - + +
    diff --git a/src/includes/program-entry__pnw__marked.html b/src/includes/program-entry__pnw__marked.html index 26adbb0..1a8643a 100644 --- a/src/includes/program-entry__pnw__marked.html +++ b/src/includes/program-entry__pnw__marked.html @@ -26,8 +26,8 @@
    - - + +
    @@ -40,8 +40,8 @@
    - - + +
    @@ -54,8 +54,8 @@
    - - + +
    @@ -71,8 +71,8 @@
    - - + +
    @@ -85,8 +85,8 @@
    - - + +
    @@ -99,8 +99,8 @@
    - - + +
    @@ -116,8 +116,8 @@
    - - + +
    @@ -130,8 +130,8 @@
    - - + +
    @@ -144,8 +144,8 @@
    - - + +
    @@ -161,8 +161,8 @@
    - - + +
    @@ -175,8 +175,8 @@
    - - + +
    @@ -189,8 +189,8 @@
    - - + +
    @@ -206,8 +206,8 @@
    - - + +
    @@ -220,8 +220,8 @@
    - - + +
    @@ -234,8 +234,8 @@
    - - + +
    diff --git a/src/includes/spinbox.html b/src/includes/spinbox.html index e3f0969..0352e5d 100644 --- a/src/includes/spinbox.html +++ b/src/includes/spinbox.html @@ -3,7 +3,7 @@
    - - + +
    From 4ad18ed1b211e72c8d03dd131d8c5c3ce5184c54 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Wed, 28 Feb 2018 13:23:09 -0600 Subject: [PATCH 26/37] mer #80 --- src/component_spinbox.html | 2 +- src/stylesheets/components/_pcp.spinbox.scss | 33 +++++++++++++------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/component_spinbox.html b/src/component_spinbox.html index bbe3f93..4783bae 100644 --- a/src/component_spinbox.html +++ b/src/component_spinbox.html @@ -27,7 +27,7 @@

    Component: Spinbox

    As seen on

    diff --git a/src/stylesheets/components/_pcp.spinbox.scss b/src/stylesheets/components/_pcp.spinbox.scss index 4c8e99e..6e62c8c 100644 --- a/src/stylesheets/components/_pcp.spinbox.scss +++ b/src/stylesheets/components/_pcp.spinbox.scss @@ -57,7 +57,7 @@ &::-webkit-inner-spin-button, &::-webkit-outer-spin-button { -webkit-appearance: none; - margin: 0; + display: none; } &::-webkit-inner-spin-button { @@ -65,6 +65,10 @@ margin-right: $size-base; } + &::-ms-clear { + display: none; + } + &:focus { outline: 0; } @@ -76,12 +80,12 @@ .pcp-adjust__spinbox & { - background-color: transparent; - border-color: transparentize($form-outline-color, .5); + // background-color: transparent; + // border-color: transparentize($form-outline-color, .5); &:hover, &:focus { - background-color: $color-white; + // background-color: $color-white; border-color: $button-border-color-hover; } @@ -101,16 +105,16 @@ right: 0; bottom: 0; - .pcp-adjust__spinbox & { - opacity: .4; - pointer-events: none; - } + // .pcp-adjust__spinbox & { + // opacity: .4; + // pointer-events: none; + // } // scss-lint:disable SelectorFormat - .pcp-adjust__spinbox--focused & { - opacity: 1; - pointer-events: initial; - } + // .pcp-adjust__spinbox--focused & { + // opacity: 1; + // pointer-events: initial; + // } } @@ -208,6 +212,8 @@ .pcp-spinbox--large & { border-bottom-width: $button-arrow-size-large; + // BOO + margin-top: -($size-base + .1rem); } } @@ -218,10 +224,13 @@ .pcp-spinbox--small & { border-top-width: $button-arrow-size-small; + margin-top: -($size-base + .1rem); } .pcp-spinbox--large & { border-top-width: $button-arrow-size-large; + // BOO + margin-top: -($size-base + .1rem); } } From 0349226a549e2360cdbc55fc348f04e6dfa691b1 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Wed, 28 Feb 2018 15:00:01 -0600 Subject: [PATCH 27/37] Stepped Tabs: hover only for interactive elements (i.e. not span, div) --- .../components/_pcp.stepped-tabs.scss | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/stylesheets/components/_pcp.stepped-tabs.scss b/src/stylesheets/components/_pcp.stepped-tabs.scss index 658a169..a135a9e 100644 --- a/src/stylesheets/components/_pcp.stepped-tabs.scss +++ b/src/stylesheets/components/_pcp.stepped-tabs.scss @@ -118,13 +118,17 @@ &:active, &:hover { // scss-lint:disable ImportantRule - color: $color-fsa-white; + &:not(span,div) { + color: $color-fsa-white; + } } &:focus, &:hover { - outline: 0; - background-color: $colorDark; + &:not(span,div) { + outline: 0; + background-color: $colorDark; + } } } @@ -140,11 +144,15 @@ &:active, &:hover { // scss-lint:disable ImportantRule - color: $color-fsa-white !important; + &:not(span,div) { + color: $color-fsa-white !important; + } } &:hover { - background-color: $colorDark; + &:not(span,div) { + background-color: $colorDark; + } } } From a22be47e0fc68d51840ddde4be346f5f513c2b97 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Wed, 28 Feb 2018 15:01:01 -0600 Subject: [PATCH 28/37] amends #78 --- .../pcp-modal__print-adjustments.html | 2 +- src/includes/pcp-modal__print-discovery.html | 2 +- src/includes/pcp-modal__print-review.html | 2 +- .../pcp-stepped-tabs__discovery___print.html | 42 +++++++++++++++++++ .../pcp-stepped-tabs__mapping___print.html | 42 +++++++++++++++++++ .../pcp-stepped-tabs__review___print.html | 42 +++++++++++++++++++ .../print-segment-header__discovery.html | 2 +- .../print-segment-header__mapping.html | 2 +- .../print-segment-header__review.html | 2 +- src/index.html | 1 + src/js/prototype.js | 17 +++++++- src/stylesheets/components/_pcp.print.scss | 4 ++ 12 files changed, 152 insertions(+), 8 deletions(-) create mode 100644 src/includes/pcp-stepped-tabs__discovery___print.html create mode 100644 src/includes/pcp-stepped-tabs__mapping___print.html create mode 100644 src/includes/pcp-stepped-tabs__review___print.html diff --git a/src/includes/pcp-modal__print-adjustments.html b/src/includes/pcp-modal__print-adjustments.html index 68bd000..dbff935 100644 --- a/src/includes/pcp-modal__print-adjustments.html +++ b/src/includes/pcp-modal__print-adjustments.html @@ -108,7 +108,7 @@

    Map Layers

    - Print + Generate Print View

    diff --git a/src/includes/pcp-modal__print-discovery.html b/src/includes/pcp-modal__print-discovery.html index c03c3af..3b6830a 100644 --- a/src/includes/pcp-modal__print-discovery.html +++ b/src/includes/pcp-modal__print-discovery.html @@ -79,7 +79,7 @@

    Print: Today's Assignments

    - Print + Generate Print View

    diff --git a/src/includes/pcp-modal__print-review.html b/src/includes/pcp-modal__print-review.html index ac7d101..7c38487 100644 --- a/src/includes/pcp-modal__print-review.html +++ b/src/includes/pcp-modal__print-review.html @@ -88,7 +88,7 @@

    Print: Review Adjustments

    - Print + Generate Print View

    diff --git a/src/includes/pcp-stepped-tabs__discovery___print.html b/src/includes/pcp-stepped-tabs__discovery___print.html new file mode 100644 index 0000000..aff7541 --- /dev/null +++ b/src/includes/pcp-stepped-tabs__discovery___print.html @@ -0,0 +1,42 @@ +
    +
    +
      +
    1. + + {% include: 'includes/icon.html' @NAME:'checkmark' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Initialize + +
      2. +
    2. + + {% include: 'includes/icon.html' @NAME:'contrast' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Discovery + +
      3. +
    3. + + {% include: 'includes/icon.html' @NAME:'radio-unchecked' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Closing + +
      4. +
    4. + + {% include: 'includes/icon.html' @NAME:'radio-unchecked' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Adjustments + +
      5. +
    5. + + {% include: 'includes/icon.html' @NAME:'radio-unchecked' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Review + +
      6. +
    6. + + {% include: 'includes/icon.html' @NAME:'radio-unchecked' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Publish + +
      7. +
    +
    +
    diff --git a/src/includes/pcp-stepped-tabs__mapping___print.html b/src/includes/pcp-stepped-tabs__mapping___print.html new file mode 100644 index 0000000..0f1736f --- /dev/null +++ b/src/includes/pcp-stepped-tabs__mapping___print.html @@ -0,0 +1,42 @@ +
    +
    +
      +
    1. + + {% include: 'includes/icon.html' @NAME:'checkmark' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Initialize + +
      2. +
    2. + + {% include: 'includes/icon.html' @NAME:'checkmark' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Discovery + +
      3. +
    3. + + {% include: 'includes/icon.html' @NAME:'checkmark' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Closing + +
      4. +
    4. + + {% include: 'includes/icon.html' @NAME:'contrast' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Adjustments + +
      5. +
    5. + + {% include: 'includes/icon.html' @NAME:'radio-unchecked' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Review + +
      6. +
    6. + + {% include: 'includes/icon.html' @NAME:'radio-unchecked' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Publish + +
      7. +
    +
    +
    diff --git a/src/includes/pcp-stepped-tabs__review___print.html b/src/includes/pcp-stepped-tabs__review___print.html new file mode 100644 index 0000000..1b82df7 --- /dev/null +++ b/src/includes/pcp-stepped-tabs__review___print.html @@ -0,0 +1,42 @@ +
    +
    +
      +
    1. + + {% include: 'includes/icon.html' @NAME:'checkmark' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Initialize + +
      2. +
    2. + + {% include: 'includes/icon.html' @NAME:'checkmark' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Discovery + +
      3. +
    3. + + {% include: 'includes/icon.html' @NAME:'checkmark' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Closing + +
      4. +
    4. + + {% include: 'includes/icon.html' @NAME:'checkmark' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Adjustments + +
      5. +
    5. + + {% include: 'includes/icon.html' @NAME:'contrast' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Review + +
      6. +
    6. + + {% include: 'includes/icon.html' @NAME:'radio-unchecked' @SIZE:' ' @CLASS:'pcp-stepped-tabs__icon' %} + Publish + +
      7. +
    +
    +
    diff --git a/src/includes/print-segment-header__discovery.html b/src/includes/print-segment-header__discovery.html index 355df52..296c4ca 100644 --- a/src/includes/print-segment-header__discovery.html +++ b/src/includes/print-segment-header__discovery.html @@ -3,4 +3,4 @@ Posted County Prices {% include: 'includes/pcp-info-bar__print.html' %} -{% include: 'includes/pcp-stepped-tabs__discovery.html' %} +{% include: 'includes/pcp-stepped-tabs__discovery___print.html' %} diff --git a/src/includes/print-segment-header__mapping.html b/src/includes/print-segment-header__mapping.html index cb997e9..17b94ab 100644 --- a/src/includes/print-segment-header__mapping.html +++ b/src/includes/print-segment-header__mapping.html @@ -3,4 +3,4 @@ Posted County Prices {% include: 'includes/pcp-info-bar__print.html' %} -{% include: 'includes/pcp-stepped-tabs__mapping.html' %} +{% include: 'includes/pcp-stepped-tabs__mapping___print.html' %} diff --git a/src/includes/print-segment-header__review.html b/src/includes/print-segment-header__review.html index 90c39df..7983f3a 100644 --- a/src/includes/print-segment-header__review.html +++ b/src/includes/print-segment-header__review.html @@ -3,4 +3,4 @@ Posted County Prices {% include: 'includes/pcp-info-bar__print.html' %} -{% include: 'includes/pcp-stepped-tabs__review.html' %} +{% include: 'includes/pcp-stepped-tabs__review___print.html' %} diff --git a/src/index.html b/src/index.html index 67af1c3..9f41db3 100644 --- a/src/index.html +++ b/src/index.html @@ -61,6 +61,7 @@

    PCP-II

    diff --git a/src/js/prototype.js b/src/js/prototype.js index e206362..9801731 100644 --- a/src/js/prototype.js +++ b/src/js/prototype.js @@ -52,7 +52,7 @@ $('body').on('blur', '[data-behavior~="validate-commodity"], [data-behavior~="va $('body').on('keyup', '[data-behavior~="validate-closing"]', function(event) { var $self = $(this); - var $target = $('#' + $self.attr('data-save-target')); + var $target = $('#' + $self.attr('data-save-target'));'' if ($self.val() == '') { $target.attr('disabled', true); @@ -356,11 +356,24 @@ function popupCenter(url, title, w, h) { } function pcpCustomPrint() { - document.addEventListener('DOMContentLoaded', this.print()); + // document.addEventListener('DOMContentLoaded', this.print()); } $('body').on('click', '[data-behavior~="new-print-window"]', function(event) { + // USAGE: + // + // text + // + + var $self = $(this); var popTitle = $self.data('pop-title'); diff --git a/src/stylesheets/components/_pcp.print.scss b/src/stylesheets/components/_pcp.print.scss index 6f112b9..096bc43 100644 --- a/src/stylesheets/components/_pcp.print.scss +++ b/src/stylesheets/components/_pcp.print.scss @@ -34,6 +34,10 @@ ////////////////////////////////////////////////////////////////////////////// + // *:not(code, kbd, pre, samp) { + // font-family: $helvetica; + // } + h1, h2, h3, From 924fcce3f87d6a1287042af563f804497a65371f Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Wed, 28 Feb 2018 15:05:36 -0600 Subject: [PATCH 29/37] no hover on disabled spinbox (adjustment panel) [amends #80, #77] --- src/stylesheets/components/_pcp.spinbox.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/stylesheets/components/_pcp.spinbox.scss b/src/stylesheets/components/_pcp.spinbox.scss index 6e62c8c..f48b0b0 100644 --- a/src/stylesheets/components/_pcp.spinbox.scss +++ b/src/stylesheets/components/_pcp.spinbox.scss @@ -86,7 +86,9 @@ &:hover, &:focus { // background-color: $color-white; - border-color: $button-border-color-hover; + &:not([disabled]) { + border-color: $button-border-color-hover; + } } } From d03e04b5936eb7fd9ceb02a730b8fb08f4901865 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Mon, 5 Mar 2018 12:50:01 -0600 Subject: [PATCH 30/37] rift collection alignment [closes #81] --- src/stylesheets/components/_pcp.rift-detail.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/stylesheets/components/_pcp.rift-detail.scss b/src/stylesheets/components/_pcp.rift-detail.scss index efd013e..b558cb8 100644 --- a/src/stylesheets/components/_pcp.rift-detail.scss +++ b/src/stylesheets/components/_pcp.rift-detail.scss @@ -296,6 +296,7 @@ $swapDistance: 2.8rem; flex-wrap: wrap-reverse; margin-right: 58px; // Temporary to allow interaction with legend/controls on right side of map and prevent overlaying them transition: all .23s ease-in-out; + align-items: flex-start; &--closed { left: $size-default; @@ -317,6 +318,7 @@ $swapDistance: 2.8rem; .pcp-rift-popup { width: 220px; + pointer-events: auto; margin-bottom: $size-default; margin-right: $size-default; transition: margin .23s ease-in-out; From ab26c85c8dcbc67f44890c655d5888d58bb9b3ed Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Mon, 5 Mar 2018 13:06:00 -0600 Subject: [PATCH 31/37] [amends #81] --- src/stylesheets/components/_pcp.rift-detail.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/stylesheets/components/_pcp.rift-detail.scss b/src/stylesheets/components/_pcp.rift-detail.scss index b558cb8..193c671 100644 --- a/src/stylesheets/components/_pcp.rift-detail.scss +++ b/src/stylesheets/components/_pcp.rift-detail.scss @@ -297,6 +297,7 @@ $swapDistance: 2.8rem; margin-right: 58px; // Temporary to allow interaction with legend/controls on right side of map and prevent overlaying them transition: all .23s ease-in-out; align-items: flex-start; + pointer-events: none; &--closed { left: $size-default; From f22164abde21a9d730e52872013790f59faeedac Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Mon, 5 Mar 2018 13:27:47 -0600 Subject: [PATCH 32/37] Marker: pointer events --- src/stylesheets/components/_pcp.marker.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/stylesheets/components/_pcp.marker.scss b/src/stylesheets/components/_pcp.marker.scss index b860fc2..f5f534f 100644 --- a/src/stylesheets/components/_pcp.marker.scss +++ b/src/stylesheets/components/_pcp.marker.scss @@ -145,6 +145,7 @@ $marker-color-affected: $color-fsa-aqua-300; // from USWDS $pinpoint-size: $size-default; display: block; + pointer-events: none; &:before { content: ''; From 562c87cbe8e3611c5f5952a73d50abe57a4dd2c3 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Tue, 6 Mar 2018 14:56:27 -0600 Subject: [PATCH 33/37] print and shame moved to fsa-style; minor tweak to table sort icons --- src/stylesheets/_pcp.shame.scss | 42 +++++++++++----------- src/stylesheets/components/_pcp.table.scss | 10 ++++++ src/stylesheets/core/_pcp.base.scss | 4 --- 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/src/stylesheets/_pcp.shame.scss b/src/stylesheets/_pcp.shame.scss index 5511106..46fa7ff 100644 --- a/src/stylesheets/_pcp.shame.scss +++ b/src/stylesheets/_pcp.shame.scss @@ -1,6 +1,18 @@ + +// TODO move elsewhere in PCP SCSS ///////////////////////////////////////////// + +.sample-sample-sample { + outline: 1px solid red; +} + // TODO move to fsa-style ////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////// +// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ +body { + overflow-x: auto; +} + +// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ @media print { @page { // size: landscape; @@ -17,7 +29,7 @@ body { } } -//////////////////////////////////////////////////////////////////////////////// +// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ .fsa-badge--alert { @media print { @@ -26,7 +38,7 @@ body { } -//////////////////////////////////////////////////////////////////////////////// +// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ .fsa-label { // brute-force to override any inheritance (e.g. within an

    ) font-family: $font-sans; @@ -40,18 +52,18 @@ body { } -//////////////////////////////////////////////////////////////////////////////// +// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ .fsa-btn--large { padding-left: 18px; padding-right: 18px; } -//////////////////////////////////////////////////////////////////////////////// +// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ .fsa-form-list > li > .fsa-form-list { margin-left: $size-medium; } -//////////////////////////////////////////////////////////////////////////////// +// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ .fsa-nav-global { @media print { border-bottom-color: $color-fsa-tertiary-200; @@ -64,7 +76,7 @@ body { } } -//////////////////////////////////////////////////////////////////////////////// +// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ .fsa-content-tabs { @media print { background-color: transparent; @@ -87,15 +99,7 @@ body { } } -//////////////////////////////////////////////////////////////////////////////// -.pcp-table__th--sticky { - @media print { - box-shadow: none; - background: transparent; - } -} - -//////////////////////////////////////////////////////////////////////////////// +// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ .fsa-tophat__bd, .fsa-header-app__bd, .fsa-nav-global__bd, @@ -138,9 +142,3 @@ body { display: none; } } - -// TODO move to elsewhere in PCP partials ////////////////////////////////////// - -.thingthing { - -} diff --git a/src/stylesheets/components/_pcp.table.scss b/src/stylesheets/components/_pcp.table.scss index 6464446..6ea81ee 100644 --- a/src/stylesheets/components/_pcp.table.scss +++ b/src/stylesheets/components/_pcp.table.scss @@ -112,6 +112,8 @@ @media print { position: static; + box-shadow: none; + background: transparent; } } @@ -153,6 +155,14 @@ background-image: url('../img/chevron-down.svg'); } + &:hover:not(.pcp-table__sort--up, .pcp-table__sort--down) { + &:after { + background-image: url('#{$image-path}/chevron-up.png'); + background-image: url('#{$image-path}/chevron-up.svg'); + opacity: .4; + } + } + } @media print { diff --git a/src/stylesheets/core/_pcp.base.scss b/src/stylesheets/core/_pcp.base.scss index 2377414..c6e8306 100644 --- a/src/stylesheets/core/_pcp.base.scss +++ b/src/stylesheets/core/_pcp.base.scss @@ -1,7 +1,3 @@ -body { - overflow-x: auto; -} - // scss-lint:disable QualifyingElement abbr[title], From 057dc25b68a7314342f404a427e39f2c278204fb Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Thu, 15 Mar 2018 10:01:07 -0500 Subject: [PATCH 34/37] updated fsa-style dependency to 2.1.2 [closes #84] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cbf5049..2bca0e0 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,6 @@ }, "dependencies": { "jquery": "^2.2.2", - "fsa-style": "^2.1.1" + "fsa-style": "^2.1.2" } } From d13f79f27e6ae1c33a7023269b2be44efc0a8fff Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Thu, 15 Mar 2018 10:14:35 -0500 Subject: [PATCH 35/37] closes #83 --- src/component_table.html | 2 +- src/includes/program-entry__glf.html | 2 +- src/includes/program-entry__glf___print.html | 2 +- src/includes/program-entry__pnw-proteins.html | 2 +- .../program-entry__pnw-proteins___print.html | 2 +- .../program-entry__pnw-proteins__marked.html | 2 +- src/includes/program-entry__pnw.html | 2 +- src/includes/program-entry__pnw___print.html | 2 +- src/includes/program-entry__pnw__marked.html | 2 +- src/includes/table_assignments.html | 2 +- src/includes/table_assignments__complete.html | 2 +- src/includes/table_assignments__limited.html | 2 +- src/includes/table_classes.html | 2 +- src/includes/table_commodities.html | 2 +- .../table_edit-state-adjustments.html | 2 +- .../table_edit-state-adjustments__empty.html | 2 +- src/includes/table_markets.html | 2 +- src/includes/table_permissions.html | 2 +- src/includes/table_programs.html | 2 +- src/includes/table_publish.html | 38 +++++++++---------- src/includes/table_roles.html | 2 +- src/includes/table_subclasses.html | 2 +- 22 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/component_table.html b/src/component_table.html index deaf78c..aa21781 100644 --- a/src/component_table.html +++ b/src/component_table.html @@ -20,7 +20,7 @@

    Component: Table

    - 
    class="fsa-table fsa-table--borderless fsa-table--responsive pcp-table"
    + 
    class="fsa-table fsa-table--borderless fsa-table--responsive fsa-table--responsive-horizontal pcp-table"
    diff --git a/src/includes/program-entry__glf.html b/src/includes/program-entry__glf.html index 2427ff6..b1620b7 100644 --- a/src/includes/program-entry__glf.html +++ b/src/includes/program-entry__glf.html @@ -1,5 +1,5 @@
    - +
    diff --git a/src/includes/program-entry__glf___print.html b/src/includes/program-entry__glf___print.html index 49eb804..f1dd61d 100644 --- a/src/includes/program-entry__glf___print.html +++ b/src/includes/program-entry__glf___print.html @@ -1,5 +1,5 @@
    -
    Market
    +
    diff --git a/src/includes/program-entry__pnw-proteins.html b/src/includes/program-entry__pnw-proteins.html index 3bf6c87..e163dc8 100644 --- a/src/includes/program-entry__pnw-proteins.html +++ b/src/includes/program-entry__pnw-proteins.html @@ -1,5 +1,5 @@
    -
    Market
    +
    diff --git a/src/includes/program-entry__pnw-proteins___print.html b/src/includes/program-entry__pnw-proteins___print.html index b35b9a6..d028b58 100644 --- a/src/includes/program-entry__pnw-proteins___print.html +++ b/src/includes/program-entry__pnw-proteins___print.html @@ -1,5 +1,5 @@
    -
    Scale
    +
    diff --git a/src/includes/program-entry__pnw-proteins__marked.html b/src/includes/program-entry__pnw-proteins__marked.html index 3975088..8dec338 100644 --- a/src/includes/program-entry__pnw-proteins__marked.html +++ b/src/includes/program-entry__pnw-proteins__marked.html @@ -1,5 +1,5 @@
    -
    Scale
    +
    diff --git a/src/includes/program-entry__pnw.html b/src/includes/program-entry__pnw.html index 3aa8f56..2027276 100644 --- a/src/includes/program-entry__pnw.html +++ b/src/includes/program-entry__pnw.html @@ -1,5 +1,5 @@
    -
    Scale
    +
    diff --git a/src/includes/program-entry__pnw___print.html b/src/includes/program-entry__pnw___print.html index 7599a02..89f3d61 100644 --- a/src/includes/program-entry__pnw___print.html +++ b/src/includes/program-entry__pnw___print.html @@ -1,5 +1,5 @@
    -
    Market
    +
    diff --git a/src/includes/program-entry__pnw__marked.html b/src/includes/program-entry__pnw__marked.html index 1a8643a..0bf82e8 100644 --- a/src/includes/program-entry__pnw__marked.html +++ b/src/includes/program-entry__pnw__marked.html @@ -1,5 +1,5 @@
    -
    Market
    +
    diff --git a/src/includes/table_assignments.html b/src/includes/table_assignments.html index 29efde3..80471f8 100644 --- a/src/includes/table_assignments.html +++ b/src/includes/table_assignments.html @@ -1,4 +1,4 @@ -
    Market
    +
    diff --git a/src/includes/table_assignments__complete.html b/src/includes/table_assignments__complete.html index 39afb40..3d9789d 100644 --- a/src/includes/table_assignments__complete.html +++ b/src/includes/table_assignments__complete.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/src/includes/table_assignments__limited.html b/src/includes/table_assignments__limited.html index 248ca88..5001c5a 100644 --- a/src/includes/table_assignments__limited.html +++ b/src/includes/table_assignments__limited.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/src/includes/table_classes.html b/src/includes/table_classes.html index 9ecc69c..5c6f240 100644 --- a/src/includes/table_classes.html +++ b/src/includes/table_classes.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/src/includes/table_commodities.html b/src/includes/table_commodities.html index 32de985..e54a2ea 100644 --- a/src/includes/table_commodities.html +++ b/src/includes/table_commodities.html @@ -1,4 +1,4 @@ - +
    diff --git a/src/includes/table_edit-state-adjustments.html b/src/includes/table_edit-state-adjustments.html index c34285f..0550ee1 100644 --- a/src/includes/table_edit-state-adjustments.html +++ b/src/includes/table_edit-state-adjustments.html @@ -1,4 +1,4 @@ - +
    diff --git a/src/includes/table_edit-state-adjustments__empty.html b/src/includes/table_edit-state-adjustments__empty.html index 0cd3e10..b6fcbae 100644 --- a/src/includes/table_edit-state-adjustments__empty.html +++ b/src/includes/table_edit-state-adjustments__empty.html @@ -1,4 +1,4 @@ - +
    diff --git a/src/includes/table_markets.html b/src/includes/table_markets.html index 5140b0d..6eec9d4 100644 --- a/src/includes/table_markets.html +++ b/src/includes/table_markets.html @@ -1,4 +1,4 @@ - +
    diff --git a/src/includes/table_permissions.html b/src/includes/table_permissions.html index f43dc67..686015b 100644 --- a/src/includes/table_permissions.html +++ b/src/includes/table_permissions.html @@ -1,4 +1,4 @@ - +
    diff --git a/src/includes/table_programs.html b/src/includes/table_programs.html index 61c8d58..c59e154 100644 --- a/src/includes/table_programs.html +++ b/src/includes/table_programs.html @@ -1,4 +1,4 @@ - +
    diff --git a/src/includes/table_publish.html b/src/includes/table_publish.html index 6841d8e..d3ccee5 100644 --- a/src/includes/table_publish.html +++ b/src/includes/table_publish.html @@ -1,4 +1,4 @@ - +
    @@ -10,17 +10,17 @@ - - + - - - - - + - - - - - + - - -
    Name
    Loan Deficiency Payments + Loan Deficiency Payments {% include: 'includes/icon.html' @SIZE:' ' @CLASS:'fsa-m-r--xs' @NAME:'file-text2' %}pcp-ldp-rates--03-22-2017.txt - 6.2 MB + + 6.2 MB + Text Document + @@ -28,17 +28,17 @@
    Market Rates + Market Rates {% include: 'includes/icon.html' @SIZE:' ' @CLASS:'fsa-m-r--xs' @NAME:'file-text2' %}pcp-market-rates--03-22-2017.txt - 18 KB + + 18 KB + Text Document + @@ -46,17 +46,17 @@
    Protein Scales + Protein Scales {% include: 'includes/icon.html' @SIZE:' ' @CLASS:'fsa-m-r--xs' @NAME:'file-text2' %}pcp-protein-scales--03-22-2017.txt - 5 KB + + 5 KB + Text Document + diff --git a/src/includes/table_roles.html b/src/includes/table_roles.html index 744e8ce..c74df5d 100644 --- a/src/includes/table_roles.html +++ b/src/includes/table_roles.html @@ -1,4 +1,4 @@ - +
    diff --git a/src/includes/table_subclasses.html b/src/includes/table_subclasses.html index 4652607..ed1a4d1 100644 --- a/src/includes/table_subclasses.html +++ b/src/includes/table_subclasses.html @@ -1,4 +1,4 @@ - +
    From 0199de058cac15a68154bd7cca674ace41895ad4 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Thu, 15 Mar 2018 10:15:24 -0500 Subject: [PATCH 36/37] closes #78 --- src/stylesheets/_pcp.shame.scss | 136 -------------------------------- 1 file changed, 136 deletions(-) diff --git a/src/stylesheets/_pcp.shame.scss b/src/stylesheets/_pcp.shame.scss index 46fa7ff..4fb5f01 100644 --- a/src/stylesheets/_pcp.shame.scss +++ b/src/stylesheets/_pcp.shame.scss @@ -6,139 +6,3 @@ } // TODO move to fsa-style ////////////////////////////////////////////////////// - -// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ -body { - overflow-x: auto; -} - -// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ -@media print { - @page { - // size: landscape; - // size: 320mm 450mm; - // size: 320mm; - size: (8.5in * 1.75) (11in * 1.75); - // margin: .25in; - } -} - -body { - @media print { - background-color: transparent; - } -} - -// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ -.fsa-badge--alert { - - @media print { - background-color: shade($badge-bgc-alert, 60%); - } - -} - -// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ -.fsa-label { - // brute-force to override any inheritance (e.g. within an

    ) - font-family: $font-sans; - font-weight: $font-normal; - - &--alert { - @media print { - background-color: shade($label-bgc-alert, 60%); - } - } - -} - -// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ -.fsa-btn--large { - padding-left: 18px; - padding-right: 18px; -} - -// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ -.fsa-form-list > li > .fsa-form-list { - margin-left: $size-medium; -} - -// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ -.fsa-nav-global { - @media print { - border-bottom-color: $color-fsa-tertiary-200; - } -} - -.fsa-nav-global__link--active .fsa-nav-global__text { - @media print { - box-shadow: none; - } -} - -// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ -.fsa-content-tabs { - @media print { - background-color: transparent; - background-image: none; - } -} - -.fsa-content-tabs__label-text { - - @media print { - - color: $color-fsa-tertiary-300; - - .fsa-content-tabs__label--active & { - font-weight: $font-bold; - color: black; - box-shadow: none; - } - - } -} - -// ✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔✔ -.fsa-tophat__bd, -.fsa-header-app__bd, -.fsa-nav-global__bd, -.fsa-topper__bd, -.fsa-footer__bd, -.fsa-screen-id__bd { - @media print { - max-width: none; - } -} - -.fsa-footer, -.fsa-screen-id { - @media print { - box-shadow: none !important; - } -} - -.fsa-screen-id { - - @media print { - border-top: 1px solid $color-fsa-tertiary-100; - background-color: transparent; - padding: initial; - padding-top: .5em; - margin: 2em 0 0; - } - - &__bd { - @media print { - color: initial; - } - } - -} - -.fsa-topper, -.fsa-footer { - @media print { - display: none; - } -} From 361f69a400fd7c5dd1e29cfc8e455ab914d61fb4 Mon Sep 17 00:00:00 2001 From: Francis Rupert Date: Thu, 15 Mar 2018 10:27:06 -0500 Subject: [PATCH 37/37] swapped out pcp-table__sort with fsa-table__sort [ref #81] --- src/includes/table_assignments.html | 6 ++--- src/includes/table_assignments__complete.html | 6 ++--- src/includes/table_assignments__limited.html | 6 ++--- src/includes/table_classes.html | 24 +++++++++---------- src/includes/table_commodities.html | 10 ++++---- .../table_edit-state-adjustments.html | 6 ++--- .../table_edit-state-adjustments__empty.html | 6 ++--- src/includes/table_markets.html | 12 +++++----- src/includes/table_permissions.html | 10 ++++---- src/includes/table_programs.html | 20 ++++++++-------- src/includes/table_roles.html | 12 +++++----- src/includes/table_subclasses.html | 8 +++---- 12 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/includes/table_assignments.html b/src/includes/table_assignments.html index 80471f8..6b1b4ce 100644 --- a/src/includes/table_assignments.html +++ b/src/includes/table_assignments.html @@ -1,9 +1,9 @@ - - - + + + diff --git a/src/includes/table_assignments__complete.html b/src/includes/table_assignments__complete.html index 3d9789d..462819c 100644 --- a/src/includes/table_assignments__complete.html +++ b/src/includes/table_assignments__complete.html @@ -1,9 +1,9 @@
    - - - + + + diff --git a/src/includes/table_assignments__limited.html b/src/includes/table_assignments__limited.html index 5001c5a..a29dc52 100644 --- a/src/includes/table_assignments__limited.html +++ b/src/includes/table_assignments__limited.html @@ -1,9 +1,9 @@
    - - - + + + diff --git a/src/includes/table_classes.html b/src/includes/table_classes.html index 5c6f240..79c5cc3 100644 --- a/src/includes/table_classes.html +++ b/src/includes/table_classes.html @@ -2,40 +2,40 @@ diff --git a/src/includes/table_commodities.html b/src/includes/table_commodities.html index e54a2ea..c2c7775 100644 --- a/src/includes/table_commodities.html +++ b/src/includes/table_commodities.html @@ -1,17 +1,17 @@
    - + - + - + - + - + - + - + - + - + - + - + - +
    - diff --git a/src/includes/table_edit-state-adjustments.html b/src/includes/table_edit-state-adjustments.html index 0550ee1..f7697bc 100644 --- a/src/includes/table_edit-state-adjustments.html +++ b/src/includes/table_edit-state-adjustments.html @@ -2,13 +2,13 @@ diff --git a/src/includes/table_edit-state-adjustments__empty.html b/src/includes/table_edit-state-adjustments__empty.html index b6fcbae..4af57bc 100644 --- a/src/includes/table_edit-state-adjustments__empty.html +++ b/src/includes/table_edit-state-adjustments__empty.html @@ -2,13 +2,13 @@ diff --git a/src/includes/table_markets.html b/src/includes/table_markets.html index 6eec9d4..58d4f33 100644 --- a/src/includes/table_markets.html +++ b/src/includes/table_markets.html @@ -1,14 +1,14 @@
    - + + - + - + - +
    - + - + - +
    - + - + - +
    - - - diff --git a/src/includes/table_permissions.html b/src/includes/table_permissions.html index 686015b..4fa8787 100644 --- a/src/includes/table_permissions.html +++ b/src/includes/table_permissions.html @@ -1,18 +1,18 @@
    - + + - + + - + +
    - diff --git a/src/includes/table_programs.html b/src/includes/table_programs.html index c59e154..407ed07 100644 --- a/src/includes/table_programs.html +++ b/src/includes/table_programs.html @@ -1,20 +1,20 @@
    - + + - + - + - +
    - - - - - diff --git a/src/includes/table_roles.html b/src/includes/table_roles.html index c74df5d..0ce1845 100644 --- a/src/includes/table_roles.html +++ b/src/includes/table_roles.html @@ -1,20 +1,20 @@
    - + + - + + - + + - + + - + +
    - diff --git a/src/includes/table_subclasses.html b/src/includes/table_subclasses.html index ed1a4d1..5aff140 100644 --- a/src/includes/table_subclasses.html +++ b/src/includes/table_subclasses.html @@ -2,16 +2,16 @@
    - + + - + - + - + - +
    - + - + - + - +