Skip to content

Commit

Permalink
Merge branch 'website-updates-faq' into website-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
clemiller committed Dec 20, 2023
2 parents f7b86c3 + 0e286d0 commit 253bd0b
Show file tree
Hide file tree
Showing 6 changed files with 101 additions and 49 deletions.
16 changes: 15 additions & 1 deletion attack-theme/static/style/_layouts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,21 @@ pre {

/*FAQ*/
.faq {
line-height: rem(1.7);
.faq-section {
padding-bottom: 2rem;
}
h4, h5 {
margin-bottom: 1rem;
}
.relevant-links {
background: #EAEAEA;
margin-bottom: 1rem;
padding: .5rem 1rem;
border-radius: 3px;
.faq-link ~ .faq-link::before {
content: ', ';
}
}
}
/******/

Expand Down
2 changes: 1 addition & 1 deletion attack-theme/static/style/_search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
}
}

.searchPresentation {
.page-search {
float: right;
width: 50%;
}
Expand Down
2 changes: 1 addition & 1 deletion attack-theme/templates/general/attackcon-overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<br>
<div class="attackcon-columns">
<div class="presentations card-block {% if ifSponsor %} card-attackcon {% endif %}" id="presentations">
<input type="text" class="searchPresentation" id="searchPresentation" onkeyup="searchPresentation()"
<input type="text" class="page-search" id="searchPresentation" onkeyup="searchPresentation()"
placeholder="Search Presentations">
<h5><strong>Presentations</strong></h5>
<h6 class="presentation-count"></h6>
Expand Down
78 changes: 35 additions & 43 deletions attack-theme/templates/general/faq-overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,57 +12,49 @@
<!--stopindex-->
<div class="px-3">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="/">Home</a></li>
<li class="breadcrumb-item"><a href="/resources">Resources</a></li>
<li class="breadcrumb-item">FAQ</li>
<li class="breadcrumb-item"><a href="/">Home</a></li>
<li class="breadcrumb-item"><a href="/resources">Resources</a></li>
<li class="breadcrumb-item">Frequently Asked Questions</li>
</ol>
</div>

<div class="container pb-3 uniform-block">
<div class="faq container pb-3 uniform-block">
<div class="getting-started">
<div class="clearfix pb-3">
<h1 class="text-center">Frequently Asked Questions</h1>
<h2>Table of Contents</h2>
<div class="clearfix">
<ol class="nestedlist">
<h2>Frequently Asked Questions</h2>

<div class="card card-filter jump-to-section">
<div class="card-body">
Jump to Section
<ul>
{% for section in parsed.sections %}
<div>
<h5>
<li class="nestedlist-item">
{{section.name}}
<ol class="nestedlist">
{% for qa in section.questions %}
<li class="nestedlist-item">
<a href="#{{qa.id}}-header">{{qa.question}}</a>
</li>
{% endfor %}
</ol>
</li>
</h5>
</div>
<li>
<a href="#{{section.id}}">{{section.name}}</a>
</li>
{% endfor %}
</ol>
</ul>
</div>
<div>
{% for section in parsed.sections %}
<h2>{{section.name}}</h2>
<ol>
{% for qa in section.questions %}
<div>
<div class="card-title" id="{{qa.id}}-header">
<li>
{{qa.question}}
</li>
</div>
<div class="card-data">
{{qa.answer}}
</div>
<hr>
</div>

<div class="getting-started-content">
{% for section in parsed.sections %}
<div class="faq-section" id="{{section.id}}">
<h4><strong>{{section.name}}</strong></h4>
{% if section.relevant_links %}
<div class="relevant-links">
<span>
<strong>Relevant Links:</strong>
{% for link in section.relevant_links %}<span class="faq-link"><a href="{{link.url}}">{{link.label}}</a></span>{% endfor %}
</span>
</div>
{% endif %}
{% for qa in section.questions %}
<div class="faq-question">
<h5><strong>{{qa.question}}</strong></h5>
<p>{{qa.answer}}</p>
</div>
{% endfor %}
</ol>
{% endfor %}
</div>
{% endfor %}
</div>
{% endfor %}
</div>
</div>
</div>
Expand Down
50 changes: 48 additions & 2 deletions data/faq.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@
"sections": [
{
"name": "General",
"id": "general-faq",
"relevant_links": [
{
"label": "ATT&CK 101 Blog Post",
"url": "https://medium.com/mitre-attack/att-ck-101-17074d3bc62"
},
{
"label": "Getting Started",
"url": "/resources/getting-started"
}
],
"questions": [
{
"question": "What is ATT&CK?",
Expand Down Expand Up @@ -37,12 +48,23 @@
},
{
"question": "How can I use ATT&CK?",
"answer": "ATT&CK can be used in several ways to help security operations, threat intelligence, and security architecture. See the <a href='/resources/getting-started'>getting started</a> page for resources on how to start using ATT&CK. Also check out the <a href='/resources'>Resources</a> section of the website and the <a href='https://medium.com/mitre-attack'>blog</a> for related projects and other material."
"answer": "ATT&CK can be used in several ways to help security operations, threat intelligence, and security architecture. See the <a href='/resources/getting-started'>Getting Started</a> page for resources on how to start using ATT&CK. Also check out the <a href='/resources'>Resources</a> section of the website and the <a href='https://medium.com/mitre-attack'>blog</a> for related projects and other material."
}
]
},
{
"name": "Content",
"id": "content-faq",
"relevant_links": [
{
"label": "Contribute",
"url": "/resources/contribute"
},
{
"label": "The Design and Philosophy of ATT&CK",
"url": "/docs/ATTACK_Design_and_Philosophy_March_2020.pdf"
}
],
"questions": [
{
"question": "How often is ATT&CK updated?",
Expand All @@ -64,6 +86,17 @@
},
{
"name": "Resources",
"id": "resources-faq",
"relevant_links": [
{
"label": "Interfaces for Working with ATT&CK",
"url": "/resources/working-with-attack"
},
{
"label": "Staying Informed",
"url": "/contact"
}
],
"questions": [
{
"question": "Are there APIs I can use to access the ATT&CK content?",
Expand All @@ -73,6 +106,7 @@
},
{
"name": "Staying Informed",
"id": "staying-informed-faq",
"questions": [
{
"question": "How do I stay up to date with what's happening with ATT&CK?",
Expand All @@ -82,6 +116,7 @@
},
{
"name": "ATT&CK and Other Models",
"id": "other-models-faq",
"questions": [
{
"question": "How does ATT&CK relate to other cyber frameworks and models?",
Expand All @@ -99,6 +134,17 @@
},
{
"name": "Legal",
"id": "legal-faq",
"relevant_links": [
{
"label": "Brand Guide",
"url": "/resources/brand"
},
{
"label": "Contact Us",
"url": "/contact"
}
],
"questions": [
{
"question": "How should I reference the name ATT&CK?",
Expand All @@ -110,7 +156,7 @@
},
{
"question": "Can I use ATT&CK in my products and/or services?",
"answer": "<p>Yes – ATT&CK is open and available to any person or organization for use at no charge. If you decide to use ATT&CK, then follow the <a href=\"/resources/terms-of-use\">terms of use</a>. If you have further questions, then please reach out to us at <a href=\"mailto:[email protected]\">[email protected]</a>.</p><p class=\"mb-0\">Remember, you may never use MITRE ATT&CK, MITRE, or ATT&CK in a way that implies an endorsement of a product or service. MITRE does not endorse those organizations, individuals, etc. leveraging MITRE ATT&CK in their work. The inclusion of MITRE ATT&CK does not imply endorsement or support from MITRE.</p>"
"answer": "<p>Yes – ATT&CK is open and available to any person or organization for use at no charge. If you decide to use ATT&CK, then follow the <a href=\"/resources/terms-of-use\">Terms of Use</a>. If you have further questions, then please reach out to us at <a href=\"mailto:[email protected]\">[email protected]</a>.</p><p class=\"mb-0\">Remember, you may never use MITRE ATT&CK, MITRE, or ATT&CK in a way that implies an endorsement of a product or service. MITRE does not endorse those organizations, individuals, etc. leveraging MITRE ATT&CK in their work. The inclusion of MITRE ATT&CK does not imply endorsement or support from MITRE.</p>"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion modules/resources/templates/presentation-archive.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h2>Presentation Archive</h2>
<p>
Browse our archive of presentations by MITRE’s ATT&amp;CK team, covering various cybersecurity topics related to ATT&amp;CK. Presented at different conferences, these talks offer valuable insights and expertise from our team members.
</p>
<input type="text" class="searchPresentation" id="searchPresentation" onkeyup="searchPresentation()" placeholder="Search Presentations">
<input type="text" class="page-search" id="searchPresentation" onkeyup="searchPresentation()" placeholder="Search Presentations">
<h5><strong>Presentations</strong></h5>
<h6 class="presentation-count"></h6>
<div class="card card-filter">
Expand Down

0 comments on commit 253bd0b

Please sign in to comment.