merging pre-attack sidenav changes into develop

CHANGELOG.md

@@ -31,9 +31,12 @@
 <!--          addition of notable features. When PATCH is 0 it can      -->
 <!--          be omitted                                                -->
 
-# Changes staged on Develop
+# Changes staged on develop
+## ATT&CK Website version 1.2.1
 ### Improvements
 - Updated the _roadmap_ and _matrix poster_ documents on the [General Information](https://attack.mitre.org/resources/) page.
+### Fixes
+- Fixed PRE-ATT&CK side-navigation toggle on tactics and techniques. See issue [#81](https://github.com/mitre-attack/attack-website/issues/81).
 
 # 17 February 2020
 ## ATT&CK Website version 1.2

attack-theme/templates/general/base.html

@@ -3,7 +3,7 @@
 {% set NAVIGATION_MENU = [['/matrices/', 'matrices', 'Matrices'], ['/tactics/', 'tactics', 'Tactics'], ['/techniques/', 'techniques', 'Techniques'], ['/mitigations/', 'mitigations', 'Mitigations'], ['/groups/', 'groups', 'Groups'], ['/software/', 'software', 'Software'], ['/resources/', 'resources', 'Resources'], ['https://medium.com/mitre-attack/', 'blog', 'Blog'], ['/resources/contribute', 'contribute', 'Contribute']] -%}
 {% set DOMAINS = [['PRE-ATT&CK', 'pre'], ['Enterprise', 'enterprise'], ['Mobile', 'mobile']] -%}
 {% set CONTENT_VERSION = "6.2" -%}
-{% set WEBSITE_VERSION = "1.2" -%}
+{% set WEBSITE_VERSION = "1.2.1" -%}
 {% set CHANGELOG_LOCATION = "/resources/changelog.html" -%}
 {% set active_page = active_page|default('index') -%}
 {% set title = title|default('MITRE ATT&CK™') -%}

modules/config.py

@@ -13,7 +13,7 @@
 # Settings dictionary to build website
 settings_dict = {
     "content_version": "6.2",
-    "website_version": "1.2",
+    "website_version": "1.2.1",
     "changelog_location": "/resources/changelog.html",
     "banner_enabled": "true",
     "banner_message": "<strong><a href='https://collaborate.mitre.org/attackics' target='_blank'>JUST RELEASED: ATT&CK for Industrial Control Systems</a></strong>",

modules/technique.py

@@ -349,7 +349,7 @@ def get_technique_side_nav_data(techniques, tactics):
 
         domain_data = {
             "name": domain_alias,
-            "id": domain_alias,
+            "id": domain.split("-")[0],
             "path": "/techniques/{}/".format(domain.split("-")[0]), # root level doesn't get a path
             "children": []
         }

modules/util.py

@@ -354,7 +354,7 @@ def get_element_data(element):
 
             domain_data = {
                 "name": domain_alias,
-                "id": domain_alias,
+                "id": domain.split("-")[0],
                 "path": "/{}/{}/".format(side_nav_title, domain.split("-")[0]),
                 "children": []
             }