Merge pull request #857 from massgov/release-5.27.0

Release 5.27.0
massgov · Jun 6, 2018 · 48d2ed8 · 48d2ed8
2 parents 07b1e7d + 313ce00
commit 48d2ed8
Show file tree

Hide file tree

Showing 33 changed files with 1,370 additions and 378 deletions.
diff --git a/backstopjs/reference/regression_page_binder-page-internal_0_document_0_phone.png b/backstopjs/reference/regression_page_binder-page-internal_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_binder-page-internal_0_document_1_tablet.png b/backstopjs/reference/regression_page_binder-page-internal_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_organization-boards_0_document_0_phone.png b/backstopjs/reference/regression_page_organization-boards_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_organization-boards_0_document_1_tablet.png b/backstopjs/reference/regression_page_organization-boards_0_document_1_tablet.png
diff --git a/.../reference/regression_page_organization-elected-official_0_document_0_phone.png b/.../reference/regression_page_organization-elected-official_0_document_0_phone.png
diff --git a/...reference/regression_page_organization-elected-official_0_document_1_tablet.png b/...reference/regression_page_organization-elected-official_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_organization_0_document_0_phone.png b/backstopjs/reference/regression_page_organization_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_organization_0_document_1_tablet.png b/backstopjs/reference/regression_page_organization_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_regulation_0_document_0_phone.png b/backstopjs/reference/regression_page_regulation_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_regulation_0_document_1_tablet.png b/backstopjs/reference/regression_page_regulation_0_document_1_tablet.png
diff --git a/release-notes.md b/release-notes.md
@@ -14,6 +14,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 - DP-1234: The short description text on a [service detail](http://mayflower.digital.mass.gov/?p=pages-detail-for-service-howto-location) page banner ([@organisms/by-template/page-banner](http://mayflower.digital.mass.gov/?p=organisms-page-banner)) should now render ([PR #493](https://github.com/massgov/mayflower/pull/493))
 
 
+## 5.27.0 (6/06/2018)
+
+### Added
+- DP-8992, DP-8993, DP-8969: Adds a new 'contact row' organism to get around limitations of existing contact component options.
+
+### Changed
+- DP-8897: Relationship indicator change to expose organization on public pages
+- DP-9077: Relationship indicator changes
+
+
 ## 5.26.0 (5/30/2018)
 
 ### Fixed

diff --git a/styleguide/package.json b/styleguide/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@massds/mayflower",
   "description": "Open source UI components and visual style guide for Massachusetts government websites",
-  "version": "5.26.0",
+  "version": "5.27.0",
   "author": "Massachusetts Digital Services (MDS)",
   "repository": {
     "type": "git",

diff --git a/styleguide/source/_patterns/02-molecules/relationship-indicators.json b/styleguide/source/_patterns/02-molecules/relationship-indicators.json
@@ -0,0 +1,30 @@
+{
+  "relationshipIndicators": {
+    "offered_by": [{
+      "href": "#",
+      "text": "Department of Conservation and Recreation"
+    },{
+      "href": "#",
+      "text": "Other agency or organization"
+    }],
+    "relatedTo": [{
+      "href": "#",
+      "text": "Snowmobile in the Parks"
+    },{
+      "href": "#",
+      "text": "Cross-Country Skiing"
+    },{
+      "href": "#",
+      "text": "Accessible Hiking"
+    },{
+      "href": "#",
+      "text": "Scenic Viewing Areas"
+    },{
+      "href": "#",
+      "text": "Hunting"
+    },{
+      "href": "#",
+      "text": "Biking"
+    }]
+  }
+}
diff --git a/styleguide/source/_patterns/02-molecules/relationship-indicators.md b/styleguide/source/_patterns/02-molecules/relationship-indicators.md
@@ -0,0 +1,29 @@
+### Description
+This is a set of related links for Organization pages to inculded the Organization links and optional related links.
+
+### Status
+* Stable as of 5.0.0
+
+### Notes
+Offered By: at least one tag required
+Related To: optional
+
+### Variables
+~~~
+headerTags: {
+
+  offeredBy: [{
+    href:
+      type: string / required
+    text:
+      type: string / required
+  }],
+   relatedTo: [{
+    href:
+      type: string / optional
+    text:
+      type: string / optional
+  }]
+}
+~~~
+
diff --git a/styleguide/source/_patterns/02-molecules/relationship-indicators.twig b/styleguide/source/_patterns/02-molecules/relationship-indicators.twig
@@ -0,0 +1,35 @@
+<div class="ma__relationship-indicators">
+  <div class="ma__relationship-indicators--section offered-by">
+    <span class="ma__relationship-indicators--label">
+      Offered By:
+    </span>
+    <div class="ma__relationship-indicators--terms">
+      {% for item in relationshipIndicators.offered_by %}
+      <div class="ma__relationship-indicators--term">
+        <a href="{{ item.href }}">{{ item.text }}</a>
+      </div>
+    {% endfor %}
+    <button type="button" class="js-relationship-indicator-button">
+      show <span class="tag-count"></span> <span class="tag-state">more</span
+    </button>
+    </div>
+  </div>
+
+  {% if relationshipIndicators.relatedTo is not empty %}
+  <div class="ma__relationship-indicators--section related-to">
+    <span class="ma__relationship-indicators--label">
+      Related To:
+    </span>
+    <div class="ma__relationship-indicators--terms">
+    {% for item in relationshipIndicators.relatedTo %}
+      <div class="ma__relationship-indicators--term">
+        <a href="{{ item.href }}">{{ item.text }}</a>
+      </div>
+    {% endfor %}
+    <button type="button" class="js-relationship-indicator-button">
+      show <span class="tag-count"></span> <span class="tag-state">more</span>
+    </button>
+    </div>
+  </div>
+  {% endif %}
+</div>
diff --git a/styleguide/source/_patterns/03-organisms/by-author/contact-row.json b/styleguide/source/_patterns/03-organisms/by-author/contact-row.json
@@ -0,0 +1,141 @@
+{
+    "contactRow": {
+        "compHeading": {
+            "title": "Contact Us",
+            "sub": "",
+            "color": "",
+            "id": "contact us",
+            "centered": ""
+        },
+        "image": {
+            "alt": "eohhs logo",
+            "src": "../../assets/images/placeholder/230x130.png",
+            "height": "130",
+            "width": "230"
+        },
+        "primaryContact": {
+            "icon": "marker",
+            "name": "Address",
+            "items": [
+                {
+                    "type": "address",
+                    "label": "",
+                    "value": "One Ashburton Place, 11th Floor, Boston, MA 02108",
+                    "link": "https://www.google.com/maps/place/1+Ashburton+Pl,+Boston,+MA+02108",
+                    "details": ""
+                }
+            ]
+        },
+        "hasManyAdditional": true,
+        "additionalContacts": [
+            {
+                "icon": "phone",
+                "name": "Phone",
+                "items": [
+                    {
+                        "type": "phone",
+                        "property": "",
+                        "label": "Main:",
+                        "link": {
+                            "href": "+14134994262",
+                            "text": "(413) 499-4262",
+                            "info": "",
+                            "property": ""
+                        },
+                        "details": "This line is open from 9:00 a.m. - 5:00 p.m., M-F"
+                    },
+                    {
+                        "type": "phone",
+                        "property": "",
+                        "label": "Toll Free:",
+                        "link": {
+                            "href": "+18004324321",
+                            "text": "(800) 432-4321",
+                            "info": "",
+                            "property": ""
+                        },
+                        "details": "This line is open from 9:00 a.m. - 5:00 p.m., M-F"
+                    },
+                    {
+                        "type": "phone",
+                        "property": "",
+                        "label": "TTY:",
+                        "link": {
+                            "href": "+16175557777",
+                            "text": "(617) 555-7777",
+                            "info": "",
+                            "property": ""
+                        },
+                        "details": "For those who need accessible services"
+                    },
+                    {
+                        "type": "phone",
+                        "property": "",
+                        "label": "Voice Relay:",
+                        "link": {
+                            "href": "16175555255",
+                            "text": "(617) 555-5255",
+                            "info": "",
+                            "property": ""
+                        },
+                        "details": ""
+                    }
+                ]
+            },
+            {
+                "icon": "laptop",
+                "name": "Online",
+                "hidden": "",
+                "items": [
+                    {
+                        "type": "email",
+                        "property": "",
+                        "label": "Email:",
+                        "link": {
+                            "href": "[email protected]",
+                            "text": "[email protected]",
+                            "info": "",
+                            "property": ""
+                        },
+                        "details": ""
+                    },
+                    {
+                        "type": "online",
+                        "property": "",
+                        "label": "Web:",
+                        "link": {
+                            "href": "#",
+                            "text": "Contact Form",
+                            "info": "",
+                            "property": ""
+                        },
+                        "details": ""
+                    }
+                ]
+            },
+            {
+                "icon": "fax-icon",
+                "name": "Fax",
+                "items": [
+                    {
+                        "type": "fax",
+                        "property": "",
+                        "label": "Main:",
+                        "link": {
+                            "href": "+14134994262",
+                            "text": "(413) 499-4262",
+                            "info": "",
+                            "property": ""
+                        },
+                        "details": "Please allow 24 hours for a response"
+                    }
+                ]
+            }
+        ],
+        "moreLink": {
+            "href": "#",
+            "text": "More about this organization",
+            "info": ""
+        }
+    }
+}
diff --git a/styleguide/source/_patterns/03-organisms/by-author/contact-row.md b/styleguide/source/_patterns/03-organisms/by-author/contact-row.md
@@ -0,0 +1,40 @@
+### Description
+Displays one of more Contacts Group patterns as a static row of content alongside an image.
+
+### Status
+
+
+### Pattern Contains
+* Comp Heading
+* Image
+* Contact Group
+* Decorative Link
+
+### Variant options
+
+### Usage Guidelines
+* The hasManyAdditional should be used as an explicit flag to denote that the additionalContacts array is longer than 1
+
+### JavaScript Used
+
+
+### Variables
+~~~
+contactList: {
+  compHeading: {
+    type: compHeading / requited
+  },
+  primaryContact: {
+      type: contactGroup / optional
+  }
+  hasManyAdditional: {
+    type: boolean / optional
+  }
+  additionalContacts:[{
+    type: array of contactGroup / optional
+  }]
+  moreLink: {
+      type: decorativeLink / optional
+  }
+}
+~~~
diff --git a/styleguide/source/_patterns/03-organisms/by-author/contact-row.twig b/styleguide/source/_patterns/03-organisms/by-author/contact-row.twig
@@ -0,0 +1,51 @@
+<section class="ma__contact-row js-accordion">
+  {% set contactHeading = 2 %}
+  {% set contactHeading = (contactRow.compHeading.level ? : contactHeading) + 1 %}
+
+  {% set compHeading = contactRow.compHeading %}
+  {% include "@atoms/04-headings/comp-heading.twig" %}
+
+  {% block contactImage %}
+    {% if contactRow.image %}
+      {% set image = contactRow.image %}
+      {% include "@atoms/09-media/image.twig" %}
+    {% endif %}
+  {% endblock %}
+
+  {% if contactRow.primaryContact %}
+    <div class="ma__contact-row__primary">
+      {% block primaryContactGroup %}
+        {% set contactGroup = contactRow.primaryContact|merge({"level": contactHeading}) %}
+        {% include "@molecules/contact-group.twig" %}
+      {% endblock %}
+    </div>
+  {% endif %}
+
+  <div class="ma__contact-row__additional {{ contactRow.hasManyAdditional ? 'has-many': ''}}">
+    {% block additionalContacts %}
+      {% for contact in contactRow.additionalContacts %}
+        {% set contactGroup = contact|merge({"level": contactHeading}) %}
+        {% include "@molecules/contact-group.twig" %}
+      {% endfor %}
+    {% endblock %}
+    {% if contactRow.moreLink %}
+      <div class="ma__contact-group">
+        {% block moreLink %}
+          {% set decorativeLink = contactRow.moreLink %}
+          {% include "@atoms/decorative-link.twig" %}
+        {% endblock %}
+      </div>
+    {% endif %}
+  </div>
+
+  {% if contactRow.hasManyAdditional %}
+    <div class="ma__contact-row__expand">
+      <button type="button" class="js-accordion-link">
+        Show <span>more</span><span>less</span> contact info
+      </button>
+    </div>
+  {% endif %}
+
+
+
+</section>