more polish

rjacqu · Sep 23, 2022 · 6f22edb · 6f22edb
1 parent bebc736
commit 6f22edb
Show file tree

Hide file tree

Showing 26 changed files with 1,129 additions and 1,002 deletions.
diff --git a/_data/menus.yml b/_data/menus.yml
@@ -7,16 +7,16 @@ header:
   title-es: Sobre Nosotros
   sub-menu:
     - title: Our Story
-      title-es: Our Story
+      title-es: Nuestra Historia
       url: about
     - title: Guilding Values
-      title-es: Guilding Values
+      title-es: Valores Que Nos Guían
       url: guiding-values
     - title: Our Staff
       title-es: Nuestro Personal
       url: our-staff
 - title: Affiliates
-  title-es: Affiliates
+  title-es: Nuestros Afiliados
   url: affiliates
 - title: Programs
   title-es: Programas

diff --git a/_includes/getinvolved.html b/_includes/getinvolved.html
@@ -19,7 +19,9 @@ <h2 class="text-black mt-0 text-center">Contactarnos!</h2>
           O envíanos un correo electrónico:<br>
           <b class="text-black">Fccan Correo Electrónico: </b> <a href = "mailto: [email protected]">[email protected]</a> <br>
           {% for member in site.staff %}
-          <b class="text-black">{{member.title}} - {{member.name}}</b> <a href = "mailto: {{member.email}}">{{member.email}}</a>  <br>
+          {% if member.email %}
+          <b class="text-black">{{member.title-es}} - {{member.name}}</b> <a href = "mailto: {{member.email}}">{{member.email}}</a>  <br>
+          {% endif %}
           {% endfor %}
 
         </div>
@@ -31,7 +33,9 @@ <h2 class="text-black mt-0 text-center">Contact Us!</h2>
           Or Email Us:<br>
           <b class="text-black">Fccan Community Contact: </b> <a href = "mailto: [email protected]">[email protected]</a> <br>
           {% for member in site.staff %}
-          <b class="text-black">{{member.title}} - {{member.name}}</b> <a href = "mailto: {{member.email}}">{{member.email}}</a>  <br>
+          {% if member.email != '' %}
+          <b class="text-black">{{member.title-en}} - {{member.name}}</b> <a href = "mailto: {{member.email}}">{{member.email}}</a>  <br>
+          {% endif %}
           {% endfor %}
 
         </div>

diff --git a/_includes/posts.html b/_includes/posts.html
@@ -1,11 +1,37 @@
-{% for post in site.blog  reversed %}
-	{% if page.url contains "blog" %}
-		{% if post.associated-group contains "blog" %}
-		<a href="{{ post.url }}" class="nav-link js-scroll-trigger"><li class="dropdown-item nav-link">{{ post.title }}</li></a>
-		{% endif %}
-	{% elsif page.url contains "affiliate" %}
-		{{page.url}}
-	{% elsif page.url contains "programs" %}
-		{{page.url}}
-	{% endif %}
-{% endfor %}
+<section>
+  <div class="container">
+    <div class="row-fluid">
+			<div class="card-body">
+	            <h3> {% if page.lang == "es" %}Último Blog {% else %}Latest Blog{% endif %} </h3>
+	            {% assign blog = site.blog | where:"associated-group","blog" | sort: 'date' | reverse %}
+	            {% for post in blog  limit:3 %}
+				<a href="{{ post.url }}">
+				   <li class="nav-link"><h5>{{ post.title }} - {{post.date| date: "%-d %B %Y" }}</h5> 
+				   	<p>{{ post.content |strip_html |truncatewords:20}}</p>Read more...
+				   </li> 
+				</a>
+				{% endfor %}
+	          </div>
+	      </div>
+	    </div>
+    </div>
+</section>
+
+<section>
+  <div class="container">
+    <div class="row-fluid">
+			<div class="card-body">
+	            <h3> {% if page.lang == "es" %}Blogs Archivados {% else %}Archived Blogs{% endif %} </h3>
+	            {% assign blog = site.blog | where:"associated-group","blog" | sort: 'date' | reverse %}
+	            {% for post in blog  offset:4 %}
+
+				<a href="{{ post.url }}">
+				   <li class="nav-link"><h5>{{ post.title }} - {{post.date| date: "%-d %B %Y" }}</h5> 
+				   </li> 
+				</a>
+				{% endfor %}
+	          </div>
+	      </div>
+	    </div>
+    </div>
+</section>
diff --git a/_layouts/affiliates.html b/_layouts/affiliates.html
@@ -20,4 +20,23 @@ <h1 class="text-uppercase text-white font-weight-bold">{% if page.lang == "es" %
     <br>
     {{ content }}
   </div>
-{% endif %}
+{% endif %}
+<section>
+  <div class="container">
+    <div class="row-fluid">
+      <div class="card-body">
+{% assign blog = site.blog | sort: 'date' | reverse %}
+ {% for post in blog  %}
+ {% if post.associated-group == page.associated-group %}
+        <a href="{{ post.url }}">
+           <li class="nav-link"><h5>{{ post.title }} </h5> 
+            <p>{{ post.content |strip_html |truncatewords:100}}</p>Read more...
+           </li> 
+        </a>
+  {%endif%}
+{% endfor %}
+            </div>
+        </div>
+      </div>
+    </div>
+</section>
diff --git a/_site/about.html b/_site/about.html
@@ -38,7 +38,7 @@
 <link rel="canonical" href="http://0.0.0.0:4000/about" />
 <meta property="og:url" content="http://0.0.0.0:4000/about" />
 <script type="application/ld+json">
-{"@type":"WebPage","url":"http://0.0.0.0:4000/about","headline":"Our Story","description":"FCCAN’s mission is to create community based on furthering economic, social, and environmental justice, sustainability, human rights, and peace for all by building coalitions, developing strategies and actions, and supporting existing progressive organizations.","@context":"https://schema.org"}</script>
+{"description":"FCCAN’s mission is to create community based on furthering economic, social, and environmental justice, sustainability, human rights, and peace for all by building coalitions, developing strategies and actions, and supporting existing progressive organizations.","@type":"WebPage","url":"http://0.0.0.0:4000/about","headline":"Our Story","@context":"https://schema.org"}</script>
 <!-- End Jekyll SEO tag -->
 
 </head>

diff --git a/_site/admin/config.yml b/_site/admin/config.yml
@@ -53,6 +53,7 @@ collections:
       - { label: "Layout", name: "layout", widget: "hidden", default: "programs"}
       - { label: "Lang", name: "lang", widget: "hidden", default: "en"}
       - { label: "Ordering", name: "ordering", widget: "select", options: ["important", "first", "neutral", "last"],default: ["neutral"] }
+      - { label: "Associated Group", name: "associated-group", widget: "relation", collection: "groupings", search_fields: ["group"], value_field: "group", multiple: true }
   - label: "Programs Spanish"
     name: "programs-es"
     folder: "_programs-es"
@@ -82,6 +83,7 @@ collections:
       - { label: "Lang", name: "lang", widget: "hidden", default: "es"}
       - { label: "Ordering", name: "ordering", widget: "select", options: ["important", "first", "neutral", "last"],default: ["neutral"] }
       - { label: "Program in English", name: "en-program", widget: "relation", collection: "programs-en", search_fields: ["title"], value_field: "title"}
+      - { label: "Associated Group", name: "associated-group", widget: "relation", collection: "groupings", search_fields: ["group"], value_field: "group", multiple: true }
   - label: "Values"
     name: "values"
     folder: "_values"
@@ -114,6 +116,7 @@ collections:
             multiple: false
       - { label: "Org Name (English)", name: "title", widget: "string" }
       - { label: 'Layout', name: 'layout', widget: 'hidden', default: 'affiliates' }
+      - { label: "Associated Group", name: "associated-group", widget: "relation", collection: "groupings", search_fields: ["group"], value_field: "group", multiple: true }
       - { label: "About (English)", name: "body", widget: "markdown" }
   - label: "Affiliates Spanish"
     name: "affiliates-es"
@@ -134,6 +137,7 @@ collections:
       - { label: "Org Name (Spanish)", name: "title", widget: "string" }
       - { label: 'Layout', name: 'layout', widget: 'hidden', default: 'affiliates' }
       - { label: "About (Spanish)", name: "body", widget: "markdown" }
+      - { label: "Associated Group", name: "associated-group", widget: "relation", collection: "groupings", search_fields: ["group"], value_field: "group", multiple: true }
       - { label: "Affiliate in English", name: "en-affiliate", widget: "relation", collection: "affiliates-en", search_fields: ["title"], value_field: "title"}
   - label: "Resources"
     name: "resources"
@@ -253,11 +257,11 @@ collections:
           config:
             multiple: false
       - { label: "Name", name: "name", widget: "string", default: "", }
-      - { label: "Email", name: "email", widget: "string", default: "", }
+      - { label: "Email", name: "email", widget: "string", default: "", required: false }
       - { label: "Job Title (English)", name: "title-en", widget: "string", default: "", }
       - { label: "Job Title (Spanish)", name: "title-es", widget: "string", default: "", }
-      - { label: "About You (English)", name: "body-en", widget: "markdown" }
-      - { label: "About You (Spanish)", name: "body-es", widget: "markdown" }
+      - { label: "About You (English)", name: "body-en", widget: "markdown", required: false }
+      - { label: "About You (Spanish)", name: "body-es", widget: "markdown", required: false }
       - { label: "Ordering", name: "ordering", widget: "select", options: ["important", "first", "neutral", "last"],default: ["neutral"] }
   - label: "Spokescouncil"
     name: "spokescouncil"

diff --git a/_site/affiliates.html b/_site/affiliates.html
@@ -38,7 +38,7 @@
 <link rel="canonical" href="http://0.0.0.0:4000/affiliates" />
 <meta property="og:url" content="http://0.0.0.0:4000/affiliates" />
 <script type="application/ld+json">
-{"@type":"WebPage","url":"http://0.0.0.0:4000/affiliates","headline":"Affiliates","description":"FCCAN’s mission is to create community based on furthering economic, social, and environmental justice, sustainability, human rights, and peace for all by building coalitions, developing strategies and actions, and supporting existing progressive organizations.","@context":"https://schema.org"}</script>
+{"description":"FCCAN’s mission is to create community based on furthering economic, social, and environmental justice, sustainability, human rights, and peace for all by building coalitions, developing strategies and actions, and supporting existing progressive organizations.","@type":"WebPage","url":"http://0.0.0.0:4000/affiliates","headline":"Affiliates","@context":"https://schema.org"}</script>
 <!-- End Jekyll SEO tag -->
 
 </head>