Merge branch 'hotfix/383'

uccser · Sep 5, 2016 · b197199 · b197199
2 parents 8411c26 + 2dd0225
commit b197199
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/generateguide.py b/generateguide.py
@@ -631,7 +631,8 @@ def create_landing_page(outputted_languages, html_generator, primary_guide):
         'languages': outputted_languages,
         'path_to_guide_root': outputted_languages[0][0] + '/',
         'analytics_code': primary_guide.generator_settings['General']['Google Analytics Code'],
-        'version_number': primary_guide.generator_settings['General']['Version Number']
+        'version_number': primary_guide.generator_settings['General']['Version Number'],
+        'contributors_path': outputted_languages[0][0] + '/further-information/contributors.html'
         }
     output_folder = primary_guide.generator_settings['Output']['Base Folder']
     write_html_file(html_generator, output_folder, 'index', 'website_page_landing', context)

diff --git a/generator/generator-settings.conf b/generator/generator-settings.conf
@@ -1,5 +1,5 @@
 [General]
-Version Number: v2.7.0
+Version Number: v2.7.1
 Google Analytics Code: UA-49289263-2
 Domain: http://www.csfieldguide.org.nz/
 

diff --git a/generator/html-templates.conf b/generator/html-templates.conf
@@ -277,7 +277,7 @@ MathJax.Hub.Config({
   </div>
   <div class='footer-second'>
     <div class='container'>
-      <p>{{ translations.footer_contributor_text }}</p>
+      <p>{{ translations.footer_contributor_text | format(contributors_path)}}</p>
     </div>
   </div>
   <div class='footer-third'>

diff --git a/text/en/further-information/releases.md b/text/en/further-information/releases.md
@@ -19,6 +19,19 @@ We have listed major changes for each release below.
 
 ## Current Release
 
+### v2.7.1
+
+**Release date:** 5th September 2016
+
+**Downloads:** [Source available on GitHub](https://github.com/uccser/cs-field-guide/releases/tag/v2.7.1)
+
+**Notable changes:**
+- Fixed broken link in footer to contributors page.
+
+A full list of changes in this version is [available on GitHub](https://github.com/uccser/cs-field-guide/compare/v2.7.0...v2.7.1).
+
+## Older Releases
+
 ### v2.7.0
 
 **Release date:** 23rd August 2016
@@ -36,8 +49,6 @@ We have listed major changes for each release below.
 
 A full list of changes in this version is [available on GitHub](https://github.com/uccser/cs-field-guide/compare/v2.6.1...v2.7.0).
 
-## Older Releases
-
 ### v2.6.1
 
 **Release date:** 14th July 2016

diff --git a/text/en/settings.yaml b/text/en/settings.yaml
@@ -95,7 +95,7 @@ text_values:
     footer_useful_links_sitemap: "Sitemap"
     footer_useful_links_twitter: "Twitter"
     footer_useful_links_github: "GitHub"
-    footer_contributor_text: "Produced by the <a href='http://www.cosc.canterbury.ac.nz/research/RG/CSE/'>CS Education Research Group</a>, <a href='http://www.canterbury.ac.nz/'>University of Canterbury</a>, New Zealand, and <a href='{{ contributors_path }}'>by many others</a>."
+    footer_contributor_text: "Produced by the <a href='http://www.cosc.canterbury.ac.nz/research/RG/CSE/'>CS Education Research Group</a>, <a href='http://www.canterbury.ac.nz/'>University of Canterbury</a>, New Zealand, and <a href='%s'>by many others</a>."
     footer_license_text: "The Computer Science Field Guide uses a <a rel='license' href='https://creativecommons.org/licenses/by-nc-sa/4.0/'>Creative Commons (CC BY-NC-SA 4.0) license</a>."
     homepage_chapters: "Chapters"
     homepage_curriculum_guides: "Curriculum Guides"