update chapters

Author: hblankenship

Diff for: _drafts/2022-01-04-Ubiq-Memberbenefit.docx

@@ -94,11 +94,12 @@ Jump to
 ---
 
 <section id='last-update'></section>
-
-### All Chapters and Most Recent Update
+<!-- update this to only be active chapters per DA -->
+### Last Updated and By Number of Meetings
 <ul>
 {% assign chapters = site.data.chapters | sort: 'meetings' | reverse %}
 {% for chapter in chapters %}
+  {% if chapter.build !=  'no pages' %}
     {% assign custr = chapter.updated | date: "%Y-%m-%d" %}
     {% assign status_color = 'black' %}
     {% assign meeting_color = 'black' %}
@@ -112,6 +113,7 @@ Jump to
       <div style='float:left;padding-right:24px;'>Last Updated: {{ custr }}</div>
       <div style='display:block;'><span style='color:{{status_color}};'>Build Status: {{ chapter.build }} </span></div>
       <div style='display:block;'><span style='color:{{meeting_color}};'>Meetings last 365 days: {{chapter.meetings}}</span></div></li>
+  {% endif %}
 {% endfor %}
 </ul>
 

Diff for: pages/chapters/chapter_status.md

@@ -8,6 +8,23 @@ tags: chapters
 
 <!-- rebuild 1 -->
 
+<style>
+  .chapterli {
+   -webkit-box-sizing: border-box;
+   -moz-box-sizing: border-box;
+   box-sizing: border-box;
+   display: inline-block;
+   width   : 24%;
+   padding : 15px; /* this will be applied internally, due to 
+                      box-sizing property */
+   vertical-align: text-top;
+}
+
+.chapter-panel {
+  background-color: lightgray;
+  margin-bottom: 6px;
+}
+</style>
 <img src="/assets/images/web/chaper-wide.jpg" alt="Bay Area Chapter Meeting">
 
 OWASP Local Chapters build community for application security professionals around the world. Our Local Chapter Meetings are **free and open** to anyone to attend so both members and non-members are always welcomed. Local meetings include:
@@ -19,39 +36,77 @@ OWASP Local Chapters build community for application security professionals arou
 Chapter pages on this site have general information and leader contact info. Local meeting RSVPs are handled through [https://meetup.com/pro/owasp](https://meetup.com/pro/owasp).
 
 
-## Local Chapters by Region
-{% assign regions = site.data.supported_regions %}
-<ul>
-    {% for region in regions %}
-    <li><a href='#{{ region.region | remove: " " }}'>{{ region.region }}</a></li>
-    {% endfor %}
-</ul>
-
 <a href="https://meetup.com/pro/owasp" target="_blank" rel="noopener"><button class="cta-button grey">Search using Map</button></a>
 
+<!--
 <div>
 <label for='chapters-filter'>Filter List:</label>
 <input type='text' id='chapters-filter'>
 </div>
+-->
+
 
 ## Chapter Listing
+{% assign countries = site.data.chapters | map: "country" | uniq | sort %}
+{% assign chapter_regions = site.data.chapters | map: "region" | uniq | sort%}
+{% assign countries_by_region = "" | split: "," %}
+{% for region in chapter_regions %}
+  {% assign ch_regions = "" | split: "," %}
+  {% for chapter in site.data.chapters %}
+    {% if region == chapter.region %}
+      {% assign ch_regions = ch_regions | push: chapter %}      
+    {% endif %}
+  {% endfor %}
+  {% assign countries_by_region = countries_by_region | push: ch_regions %}
+{% endfor %}
 
-<div class='chapters-list' id='chapters-list'>
-    {% assign regions = site.data.supported_regions %}
-    {% for region in regions %}
-        {% assign rcount = 0 %}
-        <div class="region">
-            <h4><a name="{{ region.region | remove: ' ' }}"></a>{{ region.region }}</h4>
-            <ul>
-            {% for chapter in site.data.chapters %}
-                {% if chapter.region == region.region and chapter.build != 'no pages'%}
-                {% assign rcount = rcount | plus: 1 %}
-                    <li><a href='{{ chapter.url }}'>{{ chapter.title }}</a></li>
-                {% endif %}
-            {% endfor %}
-            </ul>
-            Total: {{rcount}}
+{% comment %}
+{% assign old_region = "" %}
+{% for region in countries_by_region %}
+  {%- for ch in region -%}
+    <div>{{ch.name}}</div>
+  {% endfor %}
+{% endfor %}
+{% endcomment %}
+{% assign supported_regions = site.data.supported_regions | map: "region" %}
+{% assign country_header = false %} 
+<div class='chapters-list corp_member_div' id='chapters-list'>
+    {% for region in chapter_regions %}
+      {%- if supported_regions contains region -%}
+        {% assign rcount = 0 %}       
+        {% for chapter in site.data.chapters %}
+          {% if chapter.region == region and chapter.build != 'no pages' %}
+            {% assign rcount = rcount | plus: 1 %}
+          {% endif %}
+        {% endfor %}  
+        <button class='accordion' style="margin-bottom: 3px;font-weight: bold; font-size: larger;"> {{ region }} ({{rcount}})</button>
+        <div class='panel chapter-panel'>
+              {% for country in countries %}
+                {% for rchs in countries_by_region %}
+                  {% for chapter in rchs %}
+                    
+                      {% if chapter.region == region and chapter.build != 'no pages' and chapter.country == country%}
+                        {% if country_header == false %}
+                          {% assign country_header = true %}
+                          {% assign country_title = chapter.country %}
+                          {% if country_title == "" %}
+                          {% assign country_title = "Unknown" %}
+                          {% endif %}                          
+                          <ul>
+                          <h5><a name="{{country_title}}"></a>{{country_title}}</h5>                        
+                          <hr>
+                        {% endif %}
+                          <li class="chapterli">&bull;<a href='{{ chapter.url }}'>{{ chapter.name }}</a></li>
+                      {% endif %}                                                                                               
+                  {%endfor%}
+                {% endfor %}                                 
+                {% if country_header == true %}
+                  </ul>
+                {% endif %}                  
+                {% assign country_header = false %}                                              
+              {%endfor%}
         </div>
+      {%endif%}
     {% endfor %}
 </div>
 
@@ -137,6 +192,17 @@ Chapter pages on this site have general information and leader contact info. Loc
 
             html += "</ul>";
             $('#chapters-list').html(html);
-          }
-      });
+          }          
+      });    
+      
+    $(".accordion").click(function () {
+                  $(this).toggleClass("active");
+                  if($(this).next('.panel').css('display') != 'none'){
+                    $(this).next('.panel').css('display', 'none');
+                  }
+                  else {
+                    $(this).next('.panel').css('display', 'block');
+                  }
+                });
+}
 </script>