Merge branch 'master' into doc-zombie-announcement

CHANGELOG.md

@@ -8,8 +8,23 @@ and this project adheres to
 
 ## [Unreleased][]
 
-* Generate static content div identifier by fname rather than by
+## [9.1.0][] - 2019-05-10
+
+### Fixes in unreleased
+
+* Generates static content div identifier by fname rather than by
   not-reliably-unique nodeId #876
+* Fixes widget grid not displaying properly in Firefox #881
+
+### Dependency upgrades in unreleased
+
+Upgrades to uPortal-app-framework 12.1.0 from 12.0.0. Highlights:
+
+* myuw-banner feature
+* `widgetConfig.launchUrl` support
+* fix for uniqueness of widget HTML element ids
+* improved loading splash screen
+* fix reducing duplicate session expiration dialogs
 
 ### Documentation in unreleased
 
@@ -528,6 +543,7 @@ See also:
 * the [6.0.0 milestone](https://github.com/uPortal-Project/uportal-home/milestone/5?closed=1).
 
 [unreleased]: https://github.com/uPortal-Project/uportal-home/compare/uportal-home-parent-9.0.0...HEAD
+[9.1.0]: https://github.com/uPortal-Project/uportal-home/compare/uportal-home-parent-9.0.0...uportal-home-parent-9.1.0
 [9.0.0]: https://github.com/uPortal-Project/uportal-home/compare/uportal-home-parent-8.3.6...uportal-home-parent-9.0.0
 [8.3.6]: https://github.com/uPortal-Project/uportal-home/compare/uportal-home-parent-8.3.5...uportal-home-parent-8.3.6
 [8.3.5]: https://github.com/uPortal-Project/uportal-home/compare/uportal-home-parent-8.3.4...uportal-home-parent-8.3.5

web/src/main/webapp/css/home.less

@@ -235,6 +235,7 @@ div.table-cell {
   }
 
   &.compact {
+    justify-content: center;
     grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
     grid-auto-rows: minmax(150px, 1fr);
     grid-gap: 10px;

web/src/main/webapp/staticFeeds/messages.json

@@ -3,13 +3,8 @@
     {
       "id": "sample-everyone-basic-notification",
       "title": "This is a basic notification. It should appear to everyone, even when group filtering is enabled.",
-      "titleShort": null,
-      "description": null,
-      "descriptionShort": null,
-      "messageType": "notification",
       "goLiveDate": null,
       "expireDate": null,
-      "featureImageUrl": null,
       "priority": null,
       "audienceFilter": {
         "groups": [],
@@ -24,19 +19,13 @@
       "moreInfoButton": {
         "label": "More info",
         "url": "http://www.google.com"
-      },
-      "confirmButton": null
+      }
     },
     {
       "id": "sample-uw-madison-high-priority-notification",
       "title": "This is a high priority notification. It should only appear if group filtering is disabled in /settings",
-      "titleShort": null,
-      "description": null,
-      "descriptionShort": null,
-      "messageType": "notification",
       "goLiveDate": "2017-08-03",
       "expireDate": null,
-      "featureImageUrl": null,
       "priority": "high",
       "audienceFilter": {
         "groups": ["no-one-is-in-this-made-up-group"],
@@ -45,85 +34,7 @@
         "dataArrayFilter": {}
       },
       "actionButton": null,
-      "moreInfoButton": null,
-      "confirmButton": null
-    },
-    {
-      "id": "sample-uw-madison-mascot-announcement",
-      "title": "This is a mascot announcement's long title",
-      "titleShort": "This is a UW-Madison mascot announcement",
-      "description": "This mascot announcement should appear to the UW-Madison group only (unless group filtering is disabled).",
-      "descriptionShort": "This is a short description",
-      "messageType": "announcement",
-      "goLiveDate": "2017-08-01T09:30",
-      "expireDate": "2017-08-15",
-      "featureImageUrl": "img/features/bucky-announcement.png",
-      "priority": null,
-      "audienceFilter": {
-        "groups": ["UW-Madison"],
-        "dataUrl": "",
-        "dataObject": "",
-        "dataArrayFilter": {}
-      },
-      "actionButton": null,
-      "moreInfoButton": {
-        "label": "Read more",
-        "url": "/features"
-      },
-      "confirmButton": null
-    },
-    {
-      "id": "sample-uw-madison-add-to-home-announcement",
-      "title": "This will add campus news to your home",
-      "titleShort": "Add campus news to your home page",
-      "description": "This mascot announcement should appear to the UW-Madison group only (unless group filtering is disabled).",
-      "descriptionShort": "Add campus news",
-      "messageType": "announcement",
-      "goLiveDate": "2017-08-01T09:30",
-      "expireDate": "2017-08-15",
-      "featureImageUrl": "img/features/bucky-announcement.png",
-      "priority": null,
-      "audienceFilter": {
-        "groups": ["UW-Madison"],
-        "dataUrl": "",
-        "dataObject": "",
-        "dataArrayFilter": {}
-      },
-      "actionButton": {
-        "label": "Add To Home",
-        "url": "addToHome/campus-news"
-      },
-      "moreInfoButton": {
-        "label": "Read more",
-        "url": "/features"
-      },
-      "confirmButton": null
-    },
-    {
-      "id": "sample-filtered-popup-announcement",
-      "title": "This is a filtered popup",
-      "titleShort": "Filtered popup",
-      "description": "This popup message should not appear to anyone unless group filtering is disabled (via beta settings).",
-      "descriptionShort": "You must have disabled group filtering!",
-      "messageType": "announcement",
-      "goLiveDate": "2017-08-01T09:30",
-      "expireDate": "2017-08-15",
-      "featureImageUrl": "img/the-cow.png",
-      "priority": "high",
-      "audienceFilter": {
-        "groups": ["Nonexistent-Group"],
-        "dataUrl": "",
-        "dataObject": "",
-        "dataArrayFilter": {}
-      },
-      "actionButton": null,
-      "moreInfoButton": {
-        "label": "Read more",
-        "url": "/features"
-      },
-      "confirmButton": {
-        "label": "Got it!"
-      }
+      "moreInfoButton": null
     }
   ]
 }