From e4b6d80257d44e68a428f5072ecb4916a0431a9e Mon Sep 17 00:00:00 2001
From: Vince Lee <vslee888@gmail.com>
Date: Wed, 15 Jun 2016 10:38:01 +0100
Subject: [PATCH] renamed news to progress

---
 src/files/Web.config                          |  1 +
 src/pages/{latest-news => progress}/index.hbs | 12 ++++++------
 src/partials/header-nav.hbs                   | 10 +++++++++-
 src/scss/modules/_variables.scss              |  2 +-
 webpack.config.js                             |  2 +-
 5 files changed, 18 insertions(+), 9 deletions(-)
 rename src/pages/{latest-news => progress}/index.hbs (90%)

diff --git a/src/files/Web.config b/src/files/Web.config
index ff85780..4f77d7b 100644
--- a/src/files/Web.config
+++ b/src/files/Web.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
+  <location path="latest-news"><system.webServer><httpRedirect enabled="true" destination="/progress/" httpResponseStatus="Permanent" /></system.webServer></location>
   <system.webServer>
     <staticContent>
       <clientCache cacheControlCustom="public" cacheControlMode="UseMaxAge" cacheControlMaxAge="0.01:00:00" />
diff --git a/src/pages/latest-news/index.hbs b/src/pages/progress/index.hbs
similarity index 90%
rename from src/pages/latest-news/index.hbs
rename to src/pages/progress/index.hbs
index ab232fa..b85ff45 100644
--- a/src/pages/latest-news/index.hbs
+++ b/src/pages/progress/index.hbs
@@ -1,11 +1,11 @@
 ---
-title: Latest News
-description: Latest News from the Manchester Homelessness Charter
+title: Progress
+description: Latest News on the Manchester Homelessness Charter
 layout: default.hbs
 permalink: false
-appName: latestnews
+appName: progress
 section: charter
-page: latestnews
+page: progress
 ---
 
 {{> loading-anim }}
@@ -15,14 +15,14 @@ page: latestnews
     <ol class="breadcrumbs__list">
       <li class="breadcrumbs__item"><a href="https://streetsupport.net/">Home</a></li>
       <li class="breadcrumbs__item"><a href="/">Charter</a></li>
-      <li class="breadcrumbs__item">Latest News</li>
+      <li class="breadcrumbs__item">Progress</li>
     </ol>
   </div>
 </div>
 
 <div class="block block--subpage-header">
   <div class="container">
-    <h1 class="h1 block__header">Latest News</h1>
+    <h1 class="h1 block__header">Progress</h1>
     <p class="h2 block__sub-header">News and Updates on the Manchester Homelessness Charter</p>
   </div>
 </div>
diff --git a/src/partials/header-nav.hbs b/src/partials/header-nav.hbs
index d2cd01a..7897bef 100644
--- a/src/partials/header-nav.hbs
+++ b/src/partials/header-nav.hbs
@@ -26,10 +26,18 @@
         <li class="nav__item--sub-item nav__item--pledgeyoursupport"><a href="/pledge-your-support/">Pledge your Support</a></li>
         <li class="nav__item--sub-item nav__item--joinactiongroup"><a href="/join-action-group/">Action Groups</a></li>
         <li class="nav__item--sub-item nav__item--aboutthecharter"><a href="/about-the-charter/">About the Charter</a></li>
-        <li class="nav__item--sub-item nav__item--latestnews"><a href="/latest-news/">Charter News</a></li>
+        <li class="nav__item--sub-item nav__item--progress"><a href="/progress/">Progress</a></li>
       </ul>
     </li>
     <li class="nav__item nav__item--about"><a href="https://streetsupport.net/about/">About</a></li>
     <li class="nav__item nav__item--contact"><a href="https://streetsupport.net/contact/">Contact</a></li>
+    <li class="nav__item nav__item--contact">
+      <a href="http://news.streetsupport.net/">News</a>
+      <ul class="nav__list--sub-list">
+        <li class="nav__item--sub-item nav__item--stories"><a href="http://news.streetsupport.net/category/stories/">Stories</a></li>
+        <li class="nav__item--sub-item nav__item--articles"><a href="http://news.streetsupport.net/category/articles/">Articles</a></li>
+        <li class="nav__item--sub-item nav__item--latestnews"><a href="http://news.streetsupport.net/category/latest-news/">Latest News</a></li>
+      </ul>
+    </li>
   </ul>
 </nav>
diff --git a/src/scss/modules/_variables.scss b/src/scss/modules/_variables.scss
index 7883464..28df1b4 100755
--- a/src/scss/modules/_variables.scss
+++ b/src/scss/modules/_variables.scss
@@ -96,7 +96,7 @@ $nav-width: 220px;
 
 // Used to automatically generate active CSS classes
 $nav-sections: home findhelp givehelp charter about contact;
-$nav-pages: home findhelp emergencyhelp allorganisations givehelp giveitems volunteer donate partnership charter readthecharter pledgeyoursupport joinactiongroup aboutthecharter about contact;
+$nav-pages: home findhelp emergencyhelp allorganisations givehelp giveitems volunteer donate partnership charter readthecharter pledgeyoursupport joinactiongroup aboutthecharter progress about contact;
 
 // Default Grid Options
 // -----------------------------
diff --git a/webpack.config.js b/webpack.config.js
index 6c32913..42a6a4b 100755
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -20,7 +20,7 @@ module.exports = {
     pledgeYourSupport: __dirname + '/src/js/app-pledgeYourSupport',
     viewYourPledge: __dirname + '/src/js/app-viewYourPledge',
     joinActionGroup: __dirname + '/src/js/app-joinActionGroup',
-    latestNews: __dirname + '/src/js/app-latestNews',
+    progress: __dirname + '/src/js/app-latestNews',
     actionGroups: __dirname + '/src/js/app-actionGroups'
   },
   output: {