diff --git a/.gitignore b/.gitignore
index a57b1721080..848e08e2e49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,10 +15,11 @@ output/
reports/
attack-theme/templates/general/base.html
-attack-theme/templates/contribute
+attack-theme/templates/benefactors
attack-theme/templates/datasources
attack-theme/templates/groups
attack-theme/templates/campaigns
+attack-theme/templates/assets
attack-theme/templates/matrices
attack-theme/templates/mitigations
attack-theme/templates/resources
@@ -28,6 +29,7 @@ attack-theme/templates/techniques
attack-theme/templates/website_build
attack-theme/templates/versions
attack-theme/static/scripts/settings.js
+attack-theme/templates/general/sidebar-resources.html
content/
data/pelican_settings.json
diff --git a/attack-search/src/settings.js b/attack-search/src/settings.js
index db171b6711a..a01ad11ff3e 100644
--- a/attack-search/src/settings.js
+++ b/attack-search/src/settings.js
@@ -2,6 +2,7 @@ const baseURL = ''; // TODO migrate from base_url (generated via Pelican)
const searchFilePaths = [
"campaigns.json",
+ "assets.json",
"datasources.json",
"groups.json",
"matrices.json",
diff --git a/attack-theme/static/scripts/mobileview-datasources.js b/attack-theme/static/scripts/mobileview-datasources.js
new file mode 100644
index 00000000000..10020cae820
--- /dev/null
+++ b/attack-theme/static/scripts/mobileview-datasources.js
@@ -0,0 +1,16 @@
+// This code is for creating a collapsable sidebar for the mobile view
+let mediaQuery = window.matchMedia('(max-width: 47.9875rem)')
+
+function mobileSidenav(e) {
+ if (e.matches) {
+ $('#sidebar-collapse').collapse('hide')
+ }
+ else{
+ $('#sidebar-collapse').collapse('show')
+ }
+}
+$(document).ready(function() {
+ mobileSidenav(mediaQuery)
+});
+
+mediaQuery.addEventListener('change', mobileSidenav)
\ No newline at end of file
diff --git a/attack-theme/static/scripts/resizer.js b/attack-theme/static/scripts/resizer.js
index eb6b3972bf1..da812317539 100644
--- a/attack-theme/static/scripts/resizer.js
+++ b/attack-theme/static/scripts/resizer.js
@@ -31,21 +31,4 @@ function resizeSidebar_mouseupHandler() {
}
resizer.addEventListener("mousedown", resizeSidebar_mousedownHandler);
-}
-
-//This code is for creating a collapsable sidebar for the mobile view
-const mediaQuery = window.matchMedia('(max-width: 47.9875rem)')
-
-function mobileSidenav(e) {
- if (e.matches) {
- $('#sidebar-collapse').collapse('hide')
- }
- else{
- $('#sidebar-collapse').collapse('show')
- }
-}
-$(document).ready(function() {
- mobileSidenav(mediaQuery)
-});
-
-mediaQuery.addEventListener('change', mobileSidenav)
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/attack-theme/static/scripts/sidebar-load-all.js b/attack-theme/static/scripts/sidebar-load-all.js
new file mode 100644
index 00000000000..e92a5e28a58
--- /dev/null
+++ b/attack-theme/static/scripts/sidebar-load-all.js
@@ -0,0 +1,52 @@
+let mod_name = window.location.pathname.split("/")
+let 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 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 + "/";
+ }
+ else{
+ winlocation = window.location.href
+ }
+ if(!element.href.endsWith("/")){
+ element.href = element.href + "/";
+ }
+ }
+ else{
+ winlocation = window.location.href
+ }
+ if(element.href == winlocation){
+ $(element.parentNode).addClass("active")
+ }});
+
+ //This code is for creating a collapsable sidebar for the mobile view
+ let mediaQuery = window.matchMedia('(max-width: 47.9875rem)')
+ function mobileSidenav(e) {
+ if (e.matches) {
+ $('#sidebar-collapse').collapse('hide')
+ }
+ else{
+ $('#sidebar-collapse').collapse('show')
+ }
+ }
+ $(document).ready(function() {
+ mobileSidenav(mediaQuery)
+ let sidenav = $(".sidenav-list");
+ let sidenav_active_elements = $(".sidenav .active");
+ if (sidenav_active_elements.length > 0) setTimeout(() => { //setTimeout gives bootstrap time to execute first
+ let offsetValue = sidenav_active_elements[0].offsetTop;
+ if (offsetValue <= 0){
+ offsetValue = sidenav_active_elements[sidenav_active_elements.length - 1].offsetTop;
+ }
+ sidenav[0].scrollTop = offsetValue - 60;
+ });
+ });
+
+ mediaQuery.addEventListener('change', mobileSidenav)
+});
\ No newline at end of file
diff --git a/attack-theme/static/style/_layouts.scss b/attack-theme/static/style/_layouts.scss
index aeabc3ea157..a95419338e0 100644
--- a/attack-theme/static/style/_layouts.scss
+++ b/attack-theme/static/style/_layouts.scss
@@ -388,6 +388,10 @@ a {
}
}
+.tables-mobile {
+ overflow-y: auto;
+}
+
.table-bordered, .blog-post table, .changelog table {
&, & td, & th {
border: 1px solid border-color(body);
@@ -1051,6 +1055,11 @@ pre {
/******/
+// how to display the sidebar
+div#sidebars {
+ display: contents
+}
+
/*Plus/Minus expand icons*/
// used in the expandable list items in the side navigation and in the expandable gray blocks in ATT&CKCON
.expand-icon {
@@ -1137,6 +1146,10 @@ pre {
}
}
+.contact-center {
+ margin-block-start: 20vh;
+}
+
/*Card Blocks*/
// container of groups of cards
.expand-panel {
diff --git a/attack-theme/templates/general/attackcon-overview.html b/attack-theme/templates/general/attackcon-overview.html
index b33437e1cac..380986eee32 100644
--- a/attack-theme/templates/general/attackcon-overview.html
+++ b/attack-theme/templates/general/attackcon-overview.html
@@ -5,9 +5,7 @@
{% import 'macros/navigation.html' as navigation %}
{% block innerleft %}
-
- {{navigation.sidenav(RESOURCE_NAV, output_file)}}
-
+
{% endblock %}
{% block innerright %}
@@ -117,5 +115,5 @@ Sponsors
{% block scripts %}
{{ super() }}
-
+
{% endblock %}
\ No newline at end of file
diff --git a/attack-theme/templates/general/base-template.html b/attack-theme/templates/general/base-template.html
index 3fad1450130..2d58912ceb4 100644
--- a/attack-theme/templates/general/base-template.html
+++ b/attack-theme/templates/general/base-template.html
@@ -161,7 +161,6 @@
-
{% endblock %}