owasp-td-jekyll 1.0.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86c4914bf13080db99302809f72257ee0edd9b9349ea66c0687a18b1a3e6fe25
-  data.tar.gz: aaeb095a90a07b44a1ab5a85966ca5f32a9ccb6f78cb1ed842bee02a72e0ddbd
+  metadata.gz: aaa2627f56350e83ea403e4ce637cb61f78a9d682b2181272c769fb508798bdd
+  data.tar.gz: f6771a9a5442bd06155df82a85832465530a6a04d59da7eb9d9d4622095fbf03
 SHA512:
-  metadata.gz: 4a6d885f86bc462306d0f7337ae2a5b2ad51e6e654ee261b52b71cbf37638b1715112a5d1b27664e6d3e8cfc309c9b5e9a65bc5cca4ddf54f506d6dcc7c04e3c
-  data.tar.gz: deea5ef7d7e55ca03ac95862dbf455f50b5727f3c0c7705b3142397f0c1965b2b1b413e9196f22fb48b197c4ef3b0a68ec87f27b48e2a244782b2bbc3ba0f4be
+  metadata.gz: 2abc1bdcb4a866d1b9f2a94ec4eea6ae726c13535273d95430080f79cd11231a680ca2b37feb0faefb198dd0e570689ea7c02dbe63050dbba57fc198b1e53f1b
+  data.tar.gz: 668457d44ea9a108b7400ae5f1372a6c6220f229ae29e530a6c16ca9bc6071f5b8d06e3ccff551e908762a00b54485fe7e94f6bb9d325b6b02967fefa132e87d

data/README.md

@@ -207,7 +207,7 @@ To set up your environment to develop this theme, run `bundle install`.
 
 Your theme is setup just like a normal Jekyll site! To test your theme, run `bundle exec jekyll serve` and open your browser at `http://localhost:4000`. This starts a Jekyll server using your theme. Add pages, documents, data, etc. like normal to test your theme's contents. As you make modifications to your theme and to your content, your site will regenerate and you should see the changes in the browser after a refresh, just like normal.
 
-When your theme is released, only the files in `_layouts`, `_includes`, `_sass` and `assets` tracked with Git will be bundled.
+When your theme is released, only the files in `_layouts`, `_includes`, and `assets` tracked with Git will be bundled.
 To add a custom directory to your theme-gem, please edit the regexp in `owasp-td-jekyll.gemspec` accordingly.
 
 ## License

data/_config.yaml

@@ -0,0 +1,44 @@
+title: OWASP Threat Dragon
+
+brand: OWASP Threat Dragon
+faviconUrl: /assets/images/favicon.ico
+
+header_links:
+  - text: Try the web app
+    fa_class: fa fa-flask
+    url: https://www.threatdragon.com/#/
+
+  - text: Download the desktop app
+    fa_class: fa fa-cloud-download-alt
+    target: _blank
+    url: https://github.com/OWASP/threat-dragon/releases
+
+  - text: Visit us on GitHub
+    fa_class: fab fa-github
+    target: _blank
+    url: https://github.com/OWASP/threat-dragon
+
+
+nav:
+  categories:
+    - name: Development
+      groups:
+        - name: Environment
+          fa_class: fas fa-layer-group
+        - name: Contributing
+          fa_class: fas fa-user-ninja
+    - name: Threat Modeling
+      groups:
+        - name: Modeling
+          fa_class: fas fa-project-diagram
+        - name: Icons
+          fa_class: fas fa-icons
+
+logo_src: assets/images/threatdragon_logo_image.svg
+homeLinks:
+  - relative_url: something
+    description: This is my description.  There are many like it, but this one is mine.
+    fa_class: fas fa-project-diagram
+  - relative_url: something_else
+    description: This is my description.  There are many like it, but this one is mine.
+    fa_class: fas fa-user-ninja

data/_includes/head.html

@@ -8,5 +8,4 @@
     <link rel="stylesheet" href="{{ '/assets/css/bootstrap.css' | relative_url }}">
     <link rel="stylesheet" href="{{ '/assets/css/style.css' | relative_url }}">
     <link rel="stylesheet" href="{{ '/assets/css/fontawesome.min.css' | relative_url }}">
-    <link rel="stylesheet" href="{{ '/assets/css/jquery.dataTables.min.css' | relative_url }}">
 </head>

data/_includes/navbar.html

@@ -1,12 +1,12 @@
 <nav class="navbar navbar-expand-md navbar-dark bg-primary">
-    <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
+    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
     </button>
     <a class="navbar-brand" href="{{ '/' | relative_url }}">
         {{ site.brand }}
     </a>
     <div class="collapse navbar-collapse" id="navbarNavDropdown">
-        <ul class="navbar-nav ml-auto">
+        <ul class="navbar-nav ms-auto">
             {%- for navlink in site.header_links -%}
             <li class="nav-item">
                 <a href="{{ navlink.url }}"
@@ -21,7 +21,7 @@
             
             <!-- Sidebars do not work well on smaller devices.  We want to fall back to a more traditional expanding button navigation -->
             <li class="nav-item dropdown d-sm-block d-md-none">
-                <a class="nav-link dropdown-toggle" href="#" id="smallerscreenmenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Menu </a>
+                <a class="nav-link dropdown-toggle" href="#" id="smallerscreenmenu" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Menu </a>
                 <div class="dropdown-menu" aria-labelledby="smallerscreenmenu">
                     {%- for navPage in site.pages | where: "path" -%}
                         <a class="dropdown-item" href="{{ navPage.url || relative_url }}">{{ navPage.title }}</a>

data/_includes/scripts.html

@@ -1,5 +1,2 @@
-<script src="{{ '/assets/js/jquery.min.js' | relative_url }}"></script>
 <script src="{{ '/assets/js/bootstrap.bundle.min.js' | relative_url }}"></script>
-<script src="{{ '/assets/js/jquery.dataTables.min.js' | relative_url }}"></script>
 <script src="{{ '/assets/js/sidebar.js' | relative_url }}"></script>
-<script src="{{ '/assets/js/datatable.js' | relative_url }}"></script>

data/_includes/sidebar.html

@@ -17,20 +17,20 @@
                     <a href="{{ pages | map: 'url' | first | relative_url }}"
                     class="bg-dark list-group-item list-group-item-action {% if activeCount > 0 %} active{%- endif -%}">
                         <div class="d-flex w-100 justify-content-start align-items-center">
-                            <span class="{{ group.fa_class }} fa-fw mr-3"></span>
+                            <span class="{{ group.fa_class }} fa-fw me-3"></span>
                             <span class="menu-collapsed">{{ group.name }}</span>
                         </div>
                     </a>
                 {%- else -%}
                     <a href="#{{ submenuId }}"
-                        data-toggle="collapse"
+                        data-bs-toggle="collapse"
                         aria-expanded="{%- if activeCount > 0 -%}true{%- else -%}false{%- endif -%}"
                         class="bg-dark list-group-item list-group-item-action grou-nav flex-column align-items-start {% if activeCount > 0 %} active{%- endif -%}">
                         <div class="d-flex w-100 justify-content-start align-items-center">
-                            <span class="{{ group.fa_class }} fa-fw mr-3"></span>
+                            <span class="{{ group.fa_class }} fa-fw me-3"></span>
                             <span class="menu-collapsed">{{ group.name }}</span>
-                            <span class="submenu-icon ml-auto submenu-expand fa fa-caret-down"></span>
-                            <span class="submenu-icon ml-auto submenu-collapse fa fa-caret-up"></span>
+                            <span class="submenu-icon ms-auto submenu-expand fa fa-caret-down"></span>
+                            <span class="submenu-icon ms-auto submenu-collapse fa fa-caret-up"></span>
                         </div>
                     </a>
                     <div id='{{ submenuId }}' class="{%- if activeCount == 0 -%}collapse{%- endif %} sidebar-submenu">
@@ -45,9 +45,9 @@
             {%- endfor -%}
         {%- endfor -%}
         
-            <a href="#top" data-toggle="sidebar-colapse" class="bg-dark list-group-item list-group-item-action d-flex align-items-center">
+            <a href="#top" data-sidebar-toggle="collapse" class="bg-dark list-group-item list-group-item-action d-flex align-items-center">
                 <div class="d-flex w-100 justify-content-start align-items-center">
-                    <span id="collapse-icon" class="fa fa-angle-left fa-2x mr-3"></span>
+                    <span id="collapse-icon" class="fa fa-angle-left fa-2x me-3"></span>
                     <span id="collapse-text" class="menu-collapsed">Collapse</span>
                 </div>
             </a>

data/_layouts/home.html

@@ -6,11 +6,11 @@ layout: default
         <div class="jumbotron">
             <div class="row">
                 {%- if site.logo_src -%}
-                    <div class="col col-md-3 text-right">
+                    <div class="col col-md-3 text-end">
                         <img src="{{ site.logo_src }}" style="width:100%" />
                     </div>
                 {%- endif -%}
-                <div class="col col-md-9 text-left">
+                <div class="col col-md-9 text-start">
                     {{ content }}
                 </div>
             </div>