Resolves #61

config/_default/config.toml

@@ -49,91 +49,102 @@ paginate = 10
     url  = "/model/"
     weight = 2
 
+[[menu.main]]
+    name = "Resources"
+    url  = "/resources/"
+    weight = 3
+
 [[menu.main]]
     name = "Community"
     identifier = "community"
     url  = ""
-    weight = 4
+    weight = 5
 
 [[menu.main]]
     name = "Blog"
     parent = "community"
     url  = "/blog/"
-    weight = 41
+    weight = 51
+
+[[menu.main]]
+    name = "User Day"
+    parent = "community"
+    url  = "/blog/"
+    weight = 52
 
 [[menu.main]]
     name = "Events"
     identifier = "events"
     parent = "community"
     url  = "/events/"
-    weight = 42
+    weight = 53
 
 [[menu.main]]
     name = "Sponsors"
     identifier = "sponsors"
     parent = "community"
     url  = "/sponsors/"
-    weight = 43
-
-[[menu.main]]
-    name = "FAQ"
-    parent = "community"
-    url  = "/faq/"
-    weight = 44
+    weight = 54
 
 [[menu.main]]
     name = "References"
     parent = "community"
     url  = "/references/"
-    weight = 45
+    weight = 55
 
 [[menu.main]]
     name = "Practitioners"
     parent = "community"
     url  = "/practitioners/"
-    weight = 46
+    weight = 56
+
+[[menu.main]]
+    name = "FAQ"
+    parent = "community"
+    url  = "/faq/"
+    weight = 57
 
 [[menu.main]]
     name = "Contributing"
     parent = "community"
     url  = "/contributing/"
-    weight = 47
+    weight = 48
 
 [[menu.main]]
     name = "Guidance"
     identifier = "guidance"
     url  = ""
-    weight = 3
+    weight = 4
 
 [[menu.main]]
     name = "Getting started"
     parent = "guidance"
     url  = "/guidance/quick-start-guide/"
-    weight = 30
+    weight = 40
 
 [[menu.main]]
-    name = "Agile"
+    name = "Assessment"
     parent = "guidance"
-    url  = "/guidance/agile/"
-    weight = 32
+    url  = "/assessment/"
+    weight = 41
 
 [[menu.main]]
-    name = "Assessment"
+    name = "Agile"
     parent = "guidance"
-    url  = "/assessment/"
-    weight = 31
+    url  = "/guidance/agile/"
+    weight = 42
 
 [[menu.main]]
     name = "Benchmarking"
     parent = "guidance"
     url  = "/benchmarking/"
-    weight = 33
+    weight = 43
 
 [[menu.main]]
     name = "Stream guidance"
     parent = "guidance"
     url  = "/stream-guidance/"
-    weight = 33
+    weight = 44
 
 
 #[[menu.main]]
@@ -152,10 +163,10 @@ paginate = 10
     url  = "/user-day/"
     weight = 5
 
-[[menu.main]]
-    name = "Contact"
-    url  = "/contact/"
-    weight = 6
+#[[menu.main]]
+#    name = "Contact"
+#    url  = "/contact/"
+#    weight = 6
 
 # Top bar social links menu
 

content/en/resources/assessment-tools.md → content/en/resources/01-assessment-tools.md

@@ -3,7 +3,7 @@ title = "SAMM assessment tools"
 date = ""
 resource_tags = ["model", "assessment", "toolkit"]
 resource_categories = ["assessment tools"]
-banner = ""
+banner = "img/resources/tools.png"
 author = ""
 +++
 

content/en/resources/pdf.md → content/en/resources/02-pdf.md

@@ -3,7 +3,7 @@ title = "SAMM PDF"
 date = ""
 resource_tags = ["SAMM", "model", "print"]
 resource_categories = ["pdf"]
-banner = ""
+banner = "img/resources/pdf.png"
 author = ""
 +++
 

content/en/resources/youtube-channel.md → content/en/resources/03-youtube-channel.md

@@ -1,14 +1,18 @@
 +++
-title = "SAMM YouTube Channel"
+title = "SAMM YouTube channel"
 date = ""
 resource_tags = ["youtube", "training"]
 resource_categories = ["video"]
-banner = ""
+banner = "img/resources/video.png"
 author = ""
 +++
 
 {{< responsive-image-small-left  "/img/resources/youtube_icon.png" "YouTube icon">}}
 
+## Watch SAMM videos
+
+
+
 ## Watch SAMM videos
 
 From model deep-dive sessions to presentations and project updates, our {{< external-link "https://www.youtube.com/channel/UCEZDbvQrj5APg5cEET49A_g" "YouTube channel">}} is a source of information on the project you don't want to miss.

content/en/resources/04-community.md

@@ -0,0 +1,47 @@
++++
+title = "SAMM Community"
+date = ""
+resource_tags = ["meeting", "chat"]
+resource_categories = ["community"]
+banner = "img/resources/community.png"
+author = ""
++++
+
+## External and internal SAMM resources
+
+Here you'll find links to places outside this website where you can interact with the SAMM team and with other SAMM users. Also, a reminder of the community-related content here on this website.
+
+{{< responsive-image-small-left  "/img/resources/meetup.png" "Meetup icon">}}
+## Community calls
+
+We host community calls on the second Wednesday of every month. Here, we provide project updates, do model deep-dive sessions and interact with the community of SAMM users. This goes from helping out people who are getting started with SAMM to discussing tools and ways to go about the different SAMM activities.
+
+You can join us on Meetups for reminders: {{< external-link "https://www.youtube.com/channel/UCEZDbvQrj5APg5cEET49A_g" "SAMM Meetup">}}
+
+{{< responsive-image-small-left  "/img/resources/slack.png" "Slack icon">}}
+## Slack
+
+Slack is a line of communication that's always open. You can exchange ideas and experiences with other members of the community. SAMM team members are also available to answer questions or provide information.
+
+You can try with the direct link to our [Slack channel](https://owasp.slack.com/messages/C0VF1EJGH). If that doesn't work, you need and invitation. Click {{< external-link "https://owasp.org/slack/invite" "here">}} to get it.
+
+{{< responsive-image-small-left  "/img/resources/octocat_small.png" "GitHub logo">}}
+## GitHub Discussions
+
+Apart from Slack, we've added {{< external-link "https://github.com/orgs/owaspsamm/discussions/" "GitHub Discussions">}}, where you can pitch your ideas, ask questions, and provide feedback.
+
+</br>
+</br>
+
+## Other community resources
+
+From the Community menu item on this website you can find information on
+
+* Blog articles
+* User Days
+* Events
+* Sponsors
+* References
+* Practitioners
+* Frequently asked questions
+* Contributing to SAMM

content/en/resources/github.md → content/en/resources/05-github.md

@@ -3,7 +3,7 @@ title = "SAMM GitHub repositories"
 date = ""
 resource_tags = ["model", "website", "assessment", "toolkit", "samm suite"]
 resource_categories = ["github"]
-banner = ""
+banner = "img/resources/github_resource.png"
 author = ""
 +++
 
@@ -22,4 +22,4 @@ Some of the repos you can find there are:
 
 <br/>
 
-Also, don't miss the {{< external-link "https://github.com/orgs/owaspsamm/discussions/" "Discussions">}}  section, where you can pitch your ideas, ask questions, and provide feedback.
+Also, don't miss the {{< external-link "https://github.com/orgs/owaspsamm/discussions/" "Discussions">}} section, where you can pitch your ideas, ask questions, and provide feedback.

content/en/resources/06-news.md

@@ -0,0 +1,24 @@
++++
+title = "SAMM Newsletter"
+date = ""
+resource_tags = ["newsletter", "subscribe"]
+resource_categories = ["news"]
+banner = "img/resources/news.png"
+author = ""
++++
+
+{{< responsive-image-small-left  "/img/resources/mailchimp.png" "Mailchimp icon">}}
+
+## SAMM Newsletter
+
+If you haven't already, {{< external-link "https://owaspsamm.us9.list-manage.com/subscribe?u=b83ce65c91239cb5e623ea83e&id=cbd0520923" "subscribe to our newsletter">}} to have the latest SAMM news delivered to you.
+
+<br/><br/>
+
+## Issues
+
+This year's issues
+* {{< external-link "https://mailchi.mp/cafc17315aff/owasp-samm-newsletter-1-6120125?e=%5BUNIQID%5D" "February 2023">}}
+
+
+For the full list, including issues since 2015, check out {{< external-link "https://docs.google.com/spreadsheets/d/1OLogWjvteoilaMbWAVeaa6BaKypEMyfyXCEoM6gPiHE/edit?usp=sharing" "this spreadsheet">}}.

data/practitioners/toreon copy.yaml

@@ -0,0 +1,8 @@
+weight: 1
+company: "Toreon"
+country: "Belgium"
+url: "https://www.toreon.com/our-services/secure-development/"
+image: "/img/events/AppSecNZ21.png"
+contributors: "Seba Deleersnyder"
+sponsor: true
+enabled: true

layouts/partials/sidebar_resources.html

@@ -1,5 +1,3 @@
-{{ partial "widgets/search.html" . }}
-
 {{ partial "widgets/resource_categories.html" . }}
 
 {{ partial "widgets/resource_tags.html" . }}

layouts/resource_categories/list.html

@@ -47,26 +47,13 @@ <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
                                         </p>
                                     </div>
                                     <p class="intro">{{ .Summary }}</p>
-                                    <p class="read-more"><a href="{{ .Permalink }}" class="btn btn-template-main">{{ i18n "continueReading" }}</a>
+                                    <p class="read-more"><a href="{{ .Permalink }}" class="btn btn-template-main">{{ i18n "readMore" }}</a>
                                     </p>
                                 </div>
                             </div>
                         </section>
                         {{ end }}
 
-                        <ul class="pager">
-                            {{ if .Paginator.HasPrev }}
-                            <li class="previous"><a href="{{ .Site.BaseURL }}{{ .Paginator.Prev.URL }}">&larr; {{ i18n "newer" }}</a></li>
-                            {{ else }}
-                            <li class="previous disabled"><a href="#">&larr; {{ i18n "newer" }}</a></li>
-                            {{ end }}
-
-                            {{ if .Paginator.HasNext }}
-                            <li class="next"><a href="{{ .Site.BaseURL }}{{ .Paginator.Next.URL }}">{{ i18n "older" }} &rarr;</a></li>
-                            {{ else }}
-                            <li class="next disabled"><a href="#">{{ i18n "older" }} &rarr;</a></li>
-                            {{ end }}
-                        </ul>
                     </div>
                     <!-- /.col-md-9 -->
 

layouts/resource_tags/list.html

@@ -47,26 +47,13 @@ <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
                                         </p>
                                     </div>
                                     <p class="intro">{{ .Summary }}</p>
-                                    <p class="read-more"><a href="{{ .Permalink }}" class="btn btn-template-main">{{ i18n "continueReading" }}</a>
+                                    <p class="read-more"><a href="{{ .Permalink }}" class="btn btn-template-main">{{ i18n "readMore" }}</a>
                                     </p>
                                 </div>
                             </div>
                         </section>
                         {{ end }}
 
-                        <ul class="pager">
-                            {{ if .Paginator.HasPrev }}
-                            <li class="previous"><a href="{{ .Site.BaseURL }}{{ .Paginator.Prev.URL }}">&larr; {{ i18n "newer" }}</a></li>
-                            {{ else }}
-                            <li class="previous disabled"><a href="#">&larr; {{ i18n "newer" }}</a></li>
-                            {{ end }}
-
-                            {{ if .Paginator.HasNext }}
-                            <li class="next"><a href="{{ .Site.BaseURL }}{{ .Paginator.Next.URL }}">{{ i18n "older" }} &rarr;</a></li>
-                            {{ else }}
-                            <li class="next disabled"><a href="#">{{ i18n "older" }} &rarr;</a></li>
-                            {{ end }}
-                        </ul>
                     </div>
                     <!-- /.col-md-9 -->
 

layouts/resources/list.html

@@ -26,7 +26,18 @@
                         {{ range $paginator.Pages }}
                         <section class="post">
                             <div class="row">
-                                <div class="col-md-12">
+                                <div class="visible-lg col-lg-4">
+                                    <div class="image">
+                                        <a href="{{ .Permalink }}">
+                                            {{ if .Params.banner }}
+                                            <img src="{{ .Site.BaseURL}}{{ .Params.banner }}" class="img-responsive" alt="">
+                                            {{ else }}
+                                            <img src="{{ .Site.BaseURL}}img/placeholder.png" class="img-responsive" alt="">
+                                            {{ end }}
+                                        </a>
+                                    </div>
+                                  </div>
+                                <div class="col-md-12 col-lg-8">
                                     <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
                                     <div class="clearfix">
                                         <p class="author-category">
@@ -38,13 +49,14 @@ <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
                                         </p>
                                     </div>
                                     <p class="intro">{{ .Summary }}</p>
-                                    <p class="read-more"><a href="{{ .Permalink }}" class="btn btn-template-main">{{ i18n "continueReading" }}</a>
+                                    <p class="read-more"><a href="{{ .Permalink }}" class="btn btn-template-main">{{ i18n "readMore" }}</a>
                                     </p>
                                 </div>
                             </div>
                         </section>
                         {{ end }}
 
+                        <!-- *** NO OLDER AND NEWER BUTTONS
                         <ul class="pager">
                             {{ if .Paginator.HasPrev }}
                             <li class="previous"><a href="{{ .Site.BaseURL }}{{ .Paginator.Prev.URL }}">&larr; {{ i18n "newer" }}</a></li>
@@ -58,6 +70,7 @@ <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
                             <li class="next disabled"><a href="#">{{ i18n "older" }} &rarr;</a></li>
                             {{ end }}
                         </ul>
+                        *** -->
                     </div>
                     <!-- /.col-md-9 -->