Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/#120 add tooltips to matrices #144

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
- Lists within data cards, e.g the platforms of a technique, are now in alphabetical order. See issue [#84](https://github.com/mitre-attack/attack-website/issues/84).
- Matrix timestamps are now calculated from the modified date on the x-mitre-matrix STIX object. Additionally, said timestamps are now formatted the same as modified dates on other pages of the website. See issue [#27](https://github.com/mitre-attack/attack-website/issues/27).
- Revisions to the layout of the matrix pages to improve readability when multiple matrices occur within a domain.
- Added tooltips to all matrices to show tactic IDs, technique IDs, and subtechnique IDs when hovering over tactic names, technique names, and subtechnique names. See issue [#120](https://github.com/mitre-attack/attack-website/issues/120).

## [ATT&CK Content version 7.0-beta](https://github.com/mitre/cti/releases/tag/ATT%26CK-v7.0-beta)
See release notes [here](https://attack.mitre.org/beta/resources/updates/updates-march-2020/index.html).
Expand Down
7 changes: 4 additions & 3 deletions attack-theme/templates/macros/matrix.html
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ <h3 class="text-center matrix-title">{{matrix.name}}</h3>
<thead>
<tr>
{% for tactic in tactics %}
<td class="tactic name"><a href="{{tactic.url}}">{{tactic.name}}</a></td>
<td class="tactic name"><a href="{{tactic.url}}" data-toggle="tooltip" data-placement="top" title="{{tactic.external_id}}">{{tactic.name}}</a></td>
{% endfor %}
</tr>
<tr>
Expand Down Expand Up @@ -164,7 +164,7 @@ <h3 class="text-center matrix-title">{{matrix.name}}</h3>
<thead>
<tr>
{% for tactic in tactics %}
<td class="tactic name"><a href="{{tactic.url}}">{{tactic.name}}</a></td>
<td class="tactic name"><a href="{{tactic.url}}" data-toggle="tooltip" data-placement="top" title="{{tactic.external_id}}">{{tactic.name}}</a></td>
{% endfor %}
</tr>
<tr>
Expand Down Expand Up @@ -234,7 +234,8 @@ <h3 class="text-center matrix-title">{{matrix.name}}</h3>

<!-- Helper macro for creating a [sub]technique cell. Param is a Technique (defined above) and boolean noting whether or not it is a subtechnique-->
{% macro technique_cell(technique, is_supertechnique) %}

<div class="technique-cell {% if is_supertechnique %} supertechniquecell{% endif %}{% if technique.color %} colored{% endif %}" {% if technique.color %} style="background: {{technique.color}}"{% endif %}>
<a href="{{technique.url}}">{{technique.name}}{% if technique.subtechniques | length > 0 %}&nbsp;<sub>({{technique.subtechniques | length}})</sub>{% endif %}</a>
<a href="{{technique.url}}" data-toggle="tooltip" data-placement="top" title="{{technique.external_id}}">{{technique.name}}{% if technique.subtechniques | length > 0 %}&nbsp;<sub>({{technique.subtechniques | length}})</sub>{% endif %}</a>
</div>
{% endmacro %}
4 changes: 2 additions & 2 deletions attack-theme/templates/resources/contribute.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h5 class="mb-0">November 2019 Contribution Update</h5>
<p class="card-text">
If you send technique contributions, it may take us several months to get back to you. We may ask you follow-up questions
to help us understand your contribution and gather additional information.
We recommend you read our philosophy paper to understand our approach to maintaining ATT&CK so that we get the right
We recommend you read our <a href="/docs/ATTACK_Design_and_Philosophy_March_2020.pdf">philosophy paper</a> to understand our approach to maintaining ATT&CK so that we get the right
details up front. If we find the contribution fills a gap, then we will make edits and send you a draft version of the
technique page for your review prior to it being published, listing you as a contributor if desired. The next content update
will not be until 2020 and will be in a parallel site to attack.mitre.org to allow the community time to incorporate
Expand All @@ -62,7 +62,7 @@ <h1 class="blog-post-title mb-4">Contribute</h1>
<p>
All contributions and feedback to ATT&amp;CK are appreciated. Due to the high volume of contributions,
it may take us about a week to get back to you. We may ask you follow-up questions to help us understand your contribution
and gather additional information. We recommend you read our <a href="https://www.mitre.org/publications/technical-papers/mitre-attack-design-and-philosophy">philosophy paper</a> to understand
and gather additional information. We recommend you read our <a href="/docs/ATTACK_Design_and_Philosophy_March_2020.pdf">philosophy paper</a> to understand
our approach to maintaining ATT&amp;CK so that we get the right details up front. If we find the contribution fills a gap,
then we will make edits and send you a draft version of the technique or Group/Software page for your review prior to
it being published, listing you as a contributor if desired. Content updates happen roughly every 3-6 months.
Expand Down
2 changes: 1 addition & 1 deletion attack-theme/templates/resources/getting-started.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h2>Getting Started</h2>
<div class="mb-2"><a href="https://www.mitre.org/sites/default/files/publications/mitre-getting-started-with-attack-october-2019.pdf">Getting Started with ATT&CK eBook</a> <div class="card-data">Pulls together the content from our four Getting Started blog posts on Threat Intelligence, Detection and Analytics, Adversary Emulation and Red Teaming, and Assessments and Engineering onto a single convenient package.</div></div>
</li>
<li>
<div class="mb-2"><a href="https://www.mitre.org/publications/technical-papers/mitre-attack-design-and-philosophy">Philosophy Paper</a> <div class="card-data">An in-depth look at why MITRE created ATT&CK, how we update and maintain it, and what the community commonly uses it for.</div></div>
<div class="mb-2"><a href="/docs/ATTACK_Design_and_Philosophy_March_2020.pdf">Philosophy Paper</a> <div class="card-data">An in-depth look at why MITRE created ATT&CK, how we update and maintain it, and what the community commonly uses it for.</div></div>
</li>
<!-- <li>
<div class="mb-2"><a href="https://www.youtube.com/watch?v=p7Hyd7d9k-c">ATT&CKing the Status Quo Presentation</a> <div class="card-data">Overview of ATT&CK along with details on two use cases. <a href="https://www.slideshare.net/KatieNickels/bsideslv-2018-katie-nickels-and-john-wunder-attcking-the-status-quo">Slides are also available</a>.</div></div>
Expand Down
Binary file not shown.
Loading