Merge pull request #2210 from CityOfPhiladelphia/cherrypick-trash-ale…

…rt-change Cherrypick trash alert change
CityOfPhiladelphia · Dec 2, 2024 · 446ec68 · 446ec68
2 parents 5aff4ec + 13e5a9a
commit 446ec68
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/wp/wp-content/themes/phila.gov-theme/css/scss/_standards-overrides.scss b/wp/wp-content/themes/phila.gov-theme/css/scss/_standards-overrides.scss
@@ -56,4 +56,28 @@ hr{
 
 html{
   scroll-behavior: smooth;
+}
+
+.service-update{
+  .icon-only {
+    padding: 1rem 0 1rem 1rem;
+  }
+  td {
+    background: #f0f0f0 !important;
+    border-right: 0px;
+    border-left: 0px;
+  }
+  th{
+    background: #f0f0f0 !important;
+    border-right: 0px;
+    border-left: 0px;
+  }
+  .service-update--warning, .service-update--critical {
+    i {
+      color: red;
+    }
+  }
+  i {
+    color: green;
+  }
 }
diff --git a/wp/wp-content/themes/phila.gov-theme/partials/posts/trashday-alerts.php b/wp/wp-content/themes/phila.gov-theme/partials/posts/trashday-alerts.php
@@ -49,12 +49,18 @@
       }
         ?>">
         <th class="phl-mu <?php if ( !phila_is_department_homepage( $post ) && !is_home() && $a['icon_padding'] == 0 ) echo 'icon-only';?>">
-          <i class="fa-2x fa-fw fas fa-trash-alt service-icon <?php if( $a['icon_padding'] && $a['icon_padding'] == 1) echo 'plm-mu' ?>" aria-hidden="true"></i>
+          <i class="fa-solid fa-xl service-icon service-icon <?php if( $a['icon_padding'] && $a['icon_padding'] == 1) echo 'plm-mu' ?> 
+          <?php 
+            if ( $status == 1 || $status == 2 || $status == 3 || $is_holiday == true )
+            { echo "fa-circle-exclamation"; } 
+          else if ( $status == 0) 
+            { echo "fa-circle-check"; } 
+           ?>" aria-hidden="true"></i>
           <?php if ( $a['icon_text'] && $a['icon_text'] == 1 ) { ?>
             <span class="icon-label">Trash & recycling</span>
           <?php } ?>
         </th>
-        <td class="pam">
+        <td class="prm pbm ptm">
           <span class="bold">
             <?php if 
               ( $status == 3 ) { echo $flexible_collection['phila_flexible_collection_status']; } else if