cleanup sample_notifications.json and fix ng-repeat for buttons

uPortal-Attic · Aug 25, 2016 · 1351def · 1351def
1 parent 01fe335
commit 1351def
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/uw-frame-components/portal/notifications/partials/notification-bell.html b/uw-frame-components/portal/notifications/partials/notification-bell.html
@@ -35,8 +35,8 @@
       <a ng-href="{{priority.actionURL}}" alt="{{priority.actionAlt}}" class="notification-message">{{priority.title}}</a>
       <div layout="row" layout-align="center center" ng-if="priority.actionButtons && priority.actionButtons.length > 0" class="notification-buttons">
         <md-button class="md-raised"
-                   ng-href="button.url"
-                   ng-repeat="button in priority.buttonText track by button.caption"
+                   ng-href="{{button.url}}"
+                   ng-repeat="button in priority.actionButtons track by button.label"
                    ng-class="{'md-primary' : $index === 0, 'md-accent' : $index > priority.buttonText.length / 2 - 1}"
                    ng-click="button.action"
                    aria-label="{{button.label}}">

diff --git a/uw-frame-components/staticFeeds/sample_notifications.json b/uw-frame-components/staticFeeds/sample_notifications.json
@@ -1,14 +1,26 @@
 {"notifications" :
     [
+      {
+  		"id"     : 1,
+  		"groups" : ["Everyone"],
+  		"title"  : "This is an admin notification smoke test.",
+  		"actionURL" : "http://www.google.com",
+  		"actionAlt" : "Google",
+  		"dismissable" : false,
+  		"priority" : true,
+  		"actionButtons" : [
+  		  {"label" : "Feedback", "url" : "/web/exclusive/feedback", "action" : ""},
+  		  {"label" : "Return To Old", "url" : "https://my.wisconsin.edu",  "action" : ""}
+  		]
+      },
       {
         "id"     : 2,
         "groups" : ["Users - Student SSN Update"],
         "title"  : "Our records indicate the Social Security Number in your Personal Information is invalid or missing. Please provide your Social Security Number or select to not provide your Social Security Number.",
         "actionURL" : "/portal/p/my-info-student-center-ssn.ctf1/max/action.uP?pP_action=loginAction",
         "actionAlt" : "UW-Madison Student Information",
         "dismissable" : true,
-        "priority" : false,
-		"actionButtons" : []
+        "priority" : false
       },
       {
         "id"     : 3,
@@ -17,21 +29,7 @@
         "actionURL" : "https://www.mynetid.wisc.edu/modify",
         "actionAlt" : "Activate Services",
         "dismissable" : true,
-        "priority" : true,
-		"actionButtons" : []
-      },
-	  {
-		"id"     : 1,
-		"groups" : ["Everyone"],
-		"title"  : "This is an admin notification smoke test.",
-		"actionURL" : "http://www.google.com",
-		"actionAlt" : "Google",
-		"dismissable" : false,
-		"priority" : true,
-		"actionButtons" : [
-		  {"label" : "Feedback", "url" : "/exclusive/feedback", "action" : ""},
-		  {"label" : "Return To Old", "url" : "my.wisconsin.edu",  "action" : ""}
-		]
-	  }
+        "priority" : false
+      }
     ]
 }