diff --git a/_data/menus.yml b/_data/menus.yml index a575aaf..3e0cf3b 100644 --- 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 index 3f81ec1..e7bb021 100644 --- a/_includes/getinvolved.html +++ b/_includes/getinvolved.html @@ -19,7 +19,9 @@

Contactarnos!

O envíanos un correo electrónico:
Fccan Correo Electrónico: info@fccan.com
{% for member in site.staff %} - {{member.title}} - {{member.name}} {{member.email}}
+ {% if member.email %} + {{member.title-es}} - {{member.name}} {{member.email}}
+ {% endif %} {% endfor %} @@ -31,7 +33,9 @@

Contact Us!

Or Email Us:
Fccan Community Contact: info@fccan.com
{% for member in site.staff %} - {{member.title}} - {{member.name}} {{member.email}}
+ {% if member.email != '' %} + {{member.title-en}} - {{member.name}} {{member.email}}
+ {% endif %} {% endfor %} diff --git a/_includes/posts.html b/_includes/posts.html index cd712df..0a6362e 100644 --- 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" %} - - {% endif %} - {% elsif page.url contains "affiliate" %} - {{page.url}} - {% elsif page.url contains "programs" %} - {{page.url}} - {% endif %} -{% endfor %} \ No newline at end of file +
+
+
+
+

{% if page.lang == "es" %}Último Blog {% else %}Latest Blog{% endif %}

+ {% assign blog = site.blog | where:"associated-group","blog" | sort: 'date' | reverse %} + {% for post in blog limit:3 %} + + + + {% endfor %} +
+
+
+ +
+ +
+
+
+
+

{% if page.lang == "es" %}Blogs Archivados {% else %}Archived Blogs{% endif %}

+ {% assign blog = site.blog | where:"associated-group","blog" | sort: 'date' | reverse %} + {% for post in blog offset:4 %} + + + + + {% endfor %} +
+
+
+ +
diff --git a/_layouts/affiliates.html b/_layouts/affiliates.html index c548d9c..2d756d2 100644 --- a/_layouts/affiliates.html +++ b/_layouts/affiliates.html @@ -20,4 +20,23 @@

{% if page.lang == "es" %
{{ content }} -{% endif %} \ No newline at end of file +{% endif %} +
+
+
+
+{% assign blog = site.blog | sort: 'date' | reverse %} + {% for post in blog %} + {% if post.associated-group == page.associated-group %} + + + + {%endif%} +{% endfor %} +
+
+
+ +
\ No newline at end of file diff --git a/_site/about.html b/_site/about.html index 79266f3..acda416 100644 --- a/_site/about.html +++ b/_site/about.html @@ -38,7 +38,7 @@ +{"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"} diff --git a/_site/admin/config.yml b/_site/admin/config.yml index 5a6ab8d..d26aad8 100644 --- 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 index b83d814..5fc5d5c 100644 --- a/_site/affiliates.html +++ b/_site/affiliates.html @@ -38,7 +38,7 @@ +{"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"} diff --git a/_site/blog.html b/_site/blog.html index b323edf..6ddbc40 100644 --- a/_site/blog.html +++ b/_site/blog.html @@ -7,7 +7,7 @@ - Blog - FCCAN + TimePeace - FCCAN @@ -29,16 +29,16 @@ -Blog +TimePeace - + +{"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/blog","headline":"TimePeace","@context":"https://schema.org"} @@ -152,7 +152,7 @@
-

Blog

+

TimePeace


@@ -163,456 +163,475 @@

Blog

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+ + +
+
+
+
+

Archived Blogs

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ diff --git a/_site/es/about.html b/_site/es/about.html index 6527211..a7ee567 100644 --- a/_site/es/about.html +++ b/_site/es/about.html @@ -38,7 +38,7 @@ +{"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/es/about.html","headline":"Nuestra historia","@context":"https://schema.org"} @@ -65,9 +65,9 @@ Sobre Nosotros