Merge branch '2.0' into 2.1

silverstripe · Nov 7, 2018 · 5c490fd · 5c490fd
2 parents c4af354 + a99e9dd
commit 5c490fd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/templates/Includes/Footer.ss b/templates/Includes/Footer.ss
@@ -56,7 +56,7 @@
       <% if $SiteConfig.FooterLogoLink %>
         href="$SiteConfig.FooterLogoLink">
       <% else %>
-        href="http://newzealand.govt.nz/">
+        href="https://www.govt.nz/">
       <% end_if %>
 
       <img
@@ -69,7 +69,7 @@
       <% if $SiteConfig.FooterLogoDescription %>
         alt="$SiteConfig.FooterLogoDescription"
       <% else %>
-        alt="<%t CWP.Footer.GovAlt "newzealand.govt.nz - connecting you to New Zealand central &amp; local government services" %>"
+        alt="<%t CWP.Footer.GovAlt "Govt.nz - connecting you to New Zealand central &amp; local government services" %>"
       <% end_if %>
       />
     </a>

diff --git a/templates/Includes/NewsSummary.ss b/templates/Includes/NewsSummary.ss
@@ -4,9 +4,11 @@
     <% loop $getNewsItems(3) %>
         <article class="news-item">
             <h4 class="h5"><a href="{$Link}">{$Title}</a></h4>
-            <p class="meta-info">
-                <time datetime="$Created.Nice">{$Created.Nice}</time>
-            </p>
+            <% if $Date %>
+                <p class="meta-info">
+                    <time datetime="$Date.Nice">{$Date.Nice}</time>
+                </p>
+            <% end_if %>
             <% if $Abstract %>
                 <p>{$Abstract}</p>
             <% else %>