From cafcbeee7bb3741fc01acf4f9db721d9c35fdc01 Mon Sep 17 00:00:00 2001 From: Natasha Pierre-Louis Date: Tue, 14 May 2024 20:49:59 -0600 Subject: [PATCH 1/3] Made updates to the homepage and main top menu --- _data/assetPaths.json | 4 +- _data/site.yaml | 2 - _includes/footer.html | 6 +-- _includes/hero.html | 8 +-- _includes/highlights.html | 71 +++++-------------------- theme/img/build-icon.webp | Bin 0 -> 4082 bytes theme/img/help-icon.webp | Bin 0 -> 4394 bytes theme/styles/_templates.scss | 98 +++++++++++++++++++++++------------ 8 files changed, 89 insertions(+), 100 deletions(-) create mode 100644 theme/img/build-icon.webp create mode 100644 theme/img/help-icon.webp diff --git a/_data/assetPaths.json b/_data/assetPaths.json index 9028289..b6a2602 100644 --- a/_data/assetPaths.json +++ b/_data/assetPaths.json @@ -54,6 +54,6 @@ "admin.map": "/assets/js/admin-GBLI77MO.js.map", "app.js": "/assets/js/app-34WFVF7Q.js", "app.map": "/assets/js/app-34WFVF7Q.js.map", - "index.css": "/assets/styles/index-PDJNSGFN.css", - "index.map": "/assets/styles/index-PDJNSGFN.css.map" + "index.css": "/assets/styles/index-BMDJFQUB.css", + "index.map": "/assets/styles/index-BMDJFQUB.css.map" } \ No newline at end of file diff --git a/_data/site.yaml b/_data/site.yaml index 4f03839..ff5a409 100644 --- a/_data/site.yaml +++ b/_data/site.yaml @@ -50,8 +50,6 @@ ga: # Site Navigation primary_navigation: - - name: Find assistance - url: /posts/find-assistance/ - name: Training & resources url: /posts/training/ - name: FAQs diff --git a/_includes/footer.html b/_includes/footer.html index 00262f7..5f5e1f5 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -19,7 +19,7 @@

FEMA resources

  • Privacy
    • -
    +

    Partner sites

    -
    +
    -
    +
    DEMO website of the
    Department of Homeland Security
    diff --git a/_includes/hero.html b/_includes/hero.html index d4bc837..e213c28 100644 --- a/_includes/hero.html +++ b/_includes/hero.html @@ -1,4 +1,4 @@ -
    +
    +
    +
    diff --git a/_includes/layouts/post.html b/_includes/layouts/post.html index f8a49c3..252e6e7 100644 --- a/_includes/layouts/post.html +++ b/_includes/layouts/post.html @@ -2,13 +2,13 @@ layout: layouts/default --- -
    +
    -
    +

    {{title}}

    {{ content }} -
    +
    diff --git a/_includes/layouts/results.html b/_includes/layouts/results.html index 1627e43..1c8076e 100644 --- a/_includes/layouts/results.html +++ b/_includes/layouts/results.html @@ -27,14 +27,103 @@

    Disclaimer

    {% include "./filterpanel.html" %}
    {% assign imagePath = "/assets/img/states/" | append: item.Abbr | append: ".webp" %} + {% assign stateString = item.State %} + {% assign imacDescription = item["IMAC Description"] %} + {% assign emacEGC = item["EMA+E:GC"] %} + {% assign emacPublicPrivate = item["EMAC Public/Private"] %} + {% assign emacPublicPrivateState = emacPublicPrivate | slice: 0, 5 %} + {% assign emacPublicPrivateTerritory = emacPublicPrivate | slice: 0, 9 %} + {% assign emacPublicCommon = emacPublicPrivate | slice: 0, 12 %} + {% assign emacPublicDistrict = emacPublicPrivate | slice: 0, 8 %} + {% assign imacDescriptionState = imacDescription | slice: 0, 5 %} {% assign imacPrivate = item["IMAC Private"] %} {% assign imacPublic = item["IMAC Public"] %} - {% assign imacDescription = item["IMAC Description"] %} - {% assign stateString = item.State %} + {% assign imacPublicVariable = item["Variable-IMAC-Public"] %} + {% assign imacPrivateVariable = item["Variable_IMAC_Private"] %} + {% assign first_eight_imacPrivate = imacPrivate | downcase | slice: 0, 8 %} {% assign first_eight_imacDescription = imacDescription | downcase | slice: 0, 8 %} {% assign first_eight_imacPublic = imacPublic | downcase | slice: 0, 8 %} + {% capture noKnownImacDescription %} +

    {{ stateString }} has {{ imacDescription | downcase }}

    + {% endcapture %} + + {% capture modifyImacDescription %} +

    Your state/territory does not participate in EMAC and may not be able to request resources and personnel from other states during emergencies and disasters.

    + {% endcapture %} + + {% capture emacStandard %} +

    Your state or territory has Standard EMAC which covers:

    +
      +
    • sharing of resources and personnel from other EMAC states to perform building department functions after emergencies and disasters
      • +
    • benefits and protections for out-of-state public-sector personnel, but not for volunteer or private sector personnel
      • +
    • federal reimbursement for assistance provided by other states
      • +
    + {% endcapture %} + + {% capture emacEhanced %} +

    Enhanced EMAC

    +

    Your state or territory has Enhanced EMAC which covers:

    +
      +
    • sharing of resources and personnel from other EMAC states to perform building department functions after emergencies and disasters
      • +
    • the mobilization and deployment of some volunteer or private sector personnel to carry out building department functions
      • +
    • benefits and protections for out-of-state public-sector personnel, as well as some volunteer and private sector personnel
      • +
    • federal reimbursement for assistance provided by other states and by volunteer or private sector entities
      • +
    + {% endcapture %} + + {% capture emacNonPartipant %} +

    Your state/territory does not participate in EMAC and may not be able to request resources and personnel from other states during emergencies and disasters.

    + {% endcapture %} + + {% capture imacPublicOptOut %} +

    Opt-Out IMAC Program

    +

    Your state/territory has a statewide opt-out IMAC program. This means:

    +
      +
    • All local jurisdictions within the state or territory are automatically enrolled in the IMAC agreement by default and must actively choose to opt out of the agreement if they do not wish to participate.
      • +
    • Participating jurisdictions, such as cities and counties, can share resources and personnel to perform building department functions following disasters and emergencies.
      • +
    + {% endcapture %} + + {% capture imacPublicOptIn %} +

    Opt-In IMAC Program

    +

    Your state/territory has a statewide opt-in IMAC program. This means:

    +
      +
    • Local jurisdictions are not automatically enrolled and must actively choose to participate in the IMAC agreement.
      • +
    • Participating jurisdictions, such as cities and counties, can share resources and personnel to perform building department functions following disasters and emergencies.
      • +
    + {% endcapture %} + + {% capture imacPublicIndividual %} +

    Individual Compacts

    +

    Your state/territory does not have a statewide IMAC program and instead utilizes individual compacts between local jurisdictions. This means:

    +
      +
    • Jurisdictions, such as cities and counties, with individual agreements in place can share resources and personnel to perform building department functions following disasters and emergencies.
      • +
    + {% endcapture %} + + {% capture noImac %} +

    No Public IMAC

    +
      +
    • Your state/territory has no known significant IMAC program between public entities.
      • +
    + {% endcapture %} + + {% capture imacIsPrivate %} +

    Private IMAC May Be Available

    +
      +
    • Your state may also allow jurisdictions to accept services and equipment from private and volunteer entities to carry out building department functions after disasters or emergencies. For more information, please review your state’s mutual aid fact sheet.
      • +
    + {% endcapture %} + + {% capture imacNotPrivate %} +

    Private IMAC May be Unavailable

    +
      +
    • For your state, secondresponders.gov is unaware of any significant policies related to the deployment of private or volunteer entities to carry out building department functions after disasters or emergencies.
      • +
    + {% endcapture %} + {% if first_eight_imacPrivate == "no known" %} {% assign modifiedImacPrivate = "has " | append: imacPrivate | downcase %} {% else %} @@ -48,9 +137,59 @@

    Disclaimer

    {% endif %} {% if first_eight_imacDescription == "no known" %} - {% assign modifiedImacDescription = "has " | append: imacDescription | downcase %} + {% assign modifiedImacDescription = noKnownImacDescription %} {% else %} - {% assign modifiedImacDescription = imacDescription | downcase %} + {% assign modifiedImacDescription = imacDescription %} + {% endif %} + + {% if imacDescriptionState == "State" %} + {% assign modifiedImacDescription = modifiedImacDescription | replace_first: 'State', stateString %} + {% endif %} + + {% if emacPublicPrivateState == "State" %} + {% assign modifiedEmacPublicPrivate = emacPublicPrivate | replace_first: 'State', stateString %} + {% endif %} + + {% if emacPublicPrivateTerritory == "Territory" %} + {% assign modifiedEmacPublicPrivate = emacPublicPrivate | replace_first: 'Territory', stateString %} + {% endif %} + + {% if emacPublicCommon == "Commonwealth" %} + {% assign modifiedEmacPublicPrivate = emacPublicPrivate | replace_first: 'Commonwealth', stateString %} + {% endif %} + + {% if emacPublicDistrict == "District" %} + {% assign modifiedEmacPublicPrivate = emacPublicPrivate | replace_first: 'District', stateString %} + {% endif %} + + {% if emacEGC == "Standard EMAC" %} + {% assign emacEGCText = emacStandard %} + {% elsif emacEGC == "Expanded EMAC" %} + {% assign emacEGCText = emacEhanced %} + {% elsif emacEGC == "Not Participtaing in EMAC" %} + {% assign emacEGCText = emacNonPartipant %} + {% else %} + {% assign emacEGCText = emacNonPartipant %} + {% endif %} + + {% if imacPublicVariable == "opt-out" %} + {% assign imacPublicText = imacPublicOptOut %} + {% elsif imacPublicVariable == "opt-in" %} + {% assign imacPublicText = imacPublicOptIn %} + {% elsif imacPublicVariable == "individual" %} + {% assign imacPublicText = imacPublicIndividual %} + {% elsif imacPublicVariable == "none" %} + {% assign imacPublicText = noImac %} + {% else %} + {% assign imacPublicText = noImac %} + {% endif %} + + {% if imacPrivateVariable == "Yes" %} + {% assign imacPrivateText = imacIsPrivate %} + {% elsif imacPrivateVariable == "No" %} + {% assign imacPrivateText = imacNotPrivate %} + {% else %} + {% assign imacPrivateText = imacNotPrivate %} {% endif %}
    @@ -63,13 +202,13 @@

    Overview of Mutual Aid Resources Available in {{ item.State }}

      -
    • {{ stateString }} {{ modifiedImacDescription }}
      • -
    • {{ stateString }} {{ item["EMAC Public/Private"] | downcase }}
      • +
    • {{ modifiedImacDescription }}
      • +
    • {{ modifiedEmacPublicPrivate }}
    -
    +

    State Mutual Aid Resources

    @@ -81,16 +220,10 @@

    No support type has been selected.

    -

    IMAC Public

    -
      -
    • {{ stateString }} {{ modifiedImacPublic }}
      • -
    + {{ imacPublicText }}
    -

    IMAC Private

    -
      -
    • {{ stateString }} {{ modifiedImacPrivate }}
      • -
    + {{ imacPrivateText }}
    @@ -171,16 +304,16 @@

    EMAC Status

    - +
    Standard EMAC{{ emacEGC }} - {{ item["EMAC Description"] }} + {{ emacEGCText }}

    EMAC Public/Private Details

    -