Add ATT&CKcon 4.0

attack-theme/static/scripts/sidebar-load-all.js

@@ -1,25 +1,36 @@
-let mod_name = window.location.pathname.split("/")
-let mod_entry = "/" + mod_name[1] + "/sidebar-" + mod_name[1]
+let mod_name = window.location.pathname.split("/");
+let mod_entry;
+if (mod_name.includes('versions') && mod_name.length > 4){
+    mod_entry = "/" + mod_name[3] + "/sidebar-" + mod_name[3]
+}
+else{
+    mod_entry = "/" + mod_name[1] + "/sidebar-" + mod_name[1]
+}
 if (mod_name.includes('contact')){
     mod_entry = "/" + "resources/sidebar-resources"
 }
 $("#sidebars").load(mod_entry, function() {
+    let old_winlocation = window.location.href;
+    if (mod_name.includes('versions')){
+        let v_number = mod_name[2];
+        old_winlocation = old_winlocation.replace('/versions/'+ v_number,'');
+    }
     let navElements = document.querySelectorAll('.sidenav-head > a');
     let winlocation;
     navElements.forEach(function(element){
     if(!element.href.includes('changelog.html')){
-        if(!window.location.href.endsWith("/")){
-            winlocation = window.location.href + "/";
+        if(!old_winlocation.endsWith("/")){
+            winlocation = old_winlocation + "/";
         }
         else{
-            winlocation = window.location.href
+            winlocation = old_winlocation
         }
         if(!element.href.endsWith("/")){
             element.href = element.href + "/";
         }
     }
     else{
-        winlocation = window.location.href
+        winlocation = old_winlocation
     }
     if(element.href == winlocation){
         $(element.parentNode).addClass("active")

attack-theme/static/scripts/site.js

@@ -2,7 +2,6 @@
 function positionBody() {
     let headerHeight = $(".navbar").outerHeight();
     let viewportHeight = $(".attack-website-wrapper").outerHeight();
-    let sidebarHeight = viewportHeight - headerHeight + "px";
     $(".sidebar.nav").css({
         "top": headerHeight + "px",
         "max-height": viewportHeight - headerHeight + "px"

attack-theme/static/style/_layouts.scss

@@ -102,12 +102,6 @@ a {
     max-width: to-rem(1000);
 }
 
-.twitter-icon {
-    vertical-align: top;
-    width: to-rem(20);
-    height: to-rem(20);
-}
-
 .mitre-logo-wtrans {
     width: to-rem(144);
     height: to-rem(66);

attack-theme/static/style/_nav.scss

@@ -135,7 +135,7 @@
         display: inline-block;
     }
 
-    i.fa {
+    i.fa-solid {
         visibility: hidden;
         display: none;
         @media screen and (max-width: 47.9875rem) {

attack-theme/templates/general/attackcon-overview.html

@@ -73,15 +73,11 @@ <h5 class="mb-0">{{loop.index}}. {{presentation.title}}
                             {% endif %}
 
                             {% if "video" in presentation %}
-                            <a class="card-link" target="_blank" href="{{presentation.video}}">video <img src="/theme/images/external-site-dark.jpeg" alt="External site" class="external-icon"></a> 
-                            {% else %}
-                            <span class="card-link">(no video)</span>
+                            <a class="card-link" target="_blank" href="{{presentation.video}}">video <img src="/theme/images/external-site-dark.jpeg" alt="External site" class="external-icon"></a>
                             {% endif %}
 
                             {% if "slides" in presentation %}
-                            <a class="card-link" target="_blank" href="{{presentation.slides}}">slides <img src="/theme/images/external-site-dark.jpeg" alt="External site" class="external-icon"></a> 
-                            {% else %}
-                            <span class="card-link">(no slides)</span>
+                            <a class="card-link" target="_blank" href="{{presentation.slides}}">slides <img src="/theme/images/external-site-dark.jpeg" alt="External site" class="external-icon"></a>
                             {% endif %}
                         </div>                   
                     </div>

attack-theme/templates/general/base-template.html

@@ -33,13 +33,12 @@
         <title>{{ title }}</title>
         <!-- Bootstrap CSS -->
         <link rel='stylesheet' href='/theme/style/bootstrap.min.css' />
-        <link rel='stylesheet' href='/theme/style/bootstrap-glyphicon.min.css' />
         <link rel='stylesheet' href='/theme/style/bootstrap-tourist.css' />
         <link rel='stylesheet' href='/theme/style/bootstrap-select.min.css' />
         {% assets "style/style.scss", filters="pyscss", output="style.min.css" %}
         <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ ASSET_URL }}">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
         {% endassets %}
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
     {% endblock %}
 </head>
 
@@ -118,8 +117,7 @@
                                 <div class="footer-float-right-responsive-brand">
                                     <div class="mb-1">
                                         <a href="https://twitter.com/MITREattack" class="btn btn-primary w-100">
-                                            <!-- <i class="fa fa-twitter"></i> -->
-                                            <img src="/theme/images/twitter.png" class="mr-1 twitter-icon">
+                                            <i class="fa-brands fa-twitter fa-lg"></i>
                                             <b>@MITREattack</b>
                                         </a>
                                     </div>

attack-theme/templates/macros/navigation.html

@@ -21,8 +21,8 @@
 {% macro sidenav(root, output_file, filter=False) %}
 <div class="sidenav-wrapper">
   <div class="heading" data-toggle="collapse" data-target="#sidebar-collapse" id="v-home-tab" aria-expanded="true" aria-controls="#sidebar-collapse" aria-selected="false">{{root.name | upper}}
-    <i class="fa fa-fw fa-chevron-down"></i>
-    <i class="fa fa-fw fa-chevron-up"></i>
+    <i class="fa-solid fa-fw fa-chevron-down"></i>
+    <i class="fa-solid fa-fw fa-chevron-up"></i>
   </div>
   {% if filter %}
   <div class="checkbox-div" id="v-home-tab" aria-selected="false">

custom_jinja_filters.py

@@ -12,6 +12,7 @@
     "<span onclick=scrollToRef('scite-{}') "
     'id="scite-ref-{}-a" class="scite'
     '-citeref-number" '
+    'title="{}"'
     'data-reference="{}"><sup><a href="{}" '
     'target="_blank" data-hasqtip="{}" '
     'aria-describedby="qtip-{}">[{}]</a></sup></span>'
@@ -20,7 +21,8 @@
     "<span onclick=scrollToRef('scite-{}') "
     'id="scite-ref-{}-a" '
     'class="scite-citeref-number" '
-    'data-reference="{}">'
+    'data-reference="{}"'
+    'title="{}">'
     "<sup>[{}]</sup></span>"
 )
 
@@ -89,7 +91,8 @@ def get_html_citation(citations, citation_name):
     reference_html = ""
     if citation:
         ref_number = None
-
+        description = citation.get("description")
+
         if citation.get("number"):
             ref_number = citation["number"]
         else:
@@ -98,10 +101,10 @@ def get_html_citation(citations, citation_name):
             citation["number"] = ref_number
 
         if not citation.get("url"):
-            reference_html = reference_marker_template_no_url.format(ref_number, ref_number, citation_name, ref_number)
+            reference_html = reference_marker_template_no_url.format(ref_number, ref_number, citation_name, description, ref_number)
         else:
             reference_html = reference_marker_template.format(
-                ref_number, ref_number, citation_name, citation["url"], ref_number - 1, ref_number - 1, ref_number
+                ref_number, ref_number, description, citation_name, citation["url"], ref_number - 1, ref_number - 1, ref_number
             )
 
     return reference_html