From 625c6d3ea3b195e1ac0702a42ddd27b76158a6bd Mon Sep 17 00:00:00 2001 From: Jean-michel Molenaar Date: Fri, 15 Sep 2023 11:13:50 +0200 Subject: [PATCH 1/3] adding fab academy links to homepage --- app/views/application/_header.html.haml | 4 ++++ app/views/static/alt/_hero.html.haml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/application/_header.html.haml b/app/views/application/_header.html.haml index 54ba83ce6..add3518de 100644 --- a/app/views/application/_header.html.haml +++ b/app/views/application/_header.html.haml @@ -24,6 +24,10 @@ = link_to t("views.header.machines"), machines_path, class: 'nav-link' %li.nav-item{class: ("active" if current_page?(jobs_path)) } = link_to t("views.header.jobs"), jobs_path, class: 'nav-link' + %li.nav-item + = link_to 'https://fabacademy.org/', target: "_blank", class: 'nav-link' do + Fab Academy + = fa_icon 'external-link', class: 'ml-1' %li.nav-item{class: ("active" if current_page?(events_path)) } = link_to "https://fabevent.org/", target: "_blank", class: 'nav-link' do = t("views.header.events") diff --git a/app/views/static/alt/_hero.html.haml b/app/views/static/alt/_hero.html.haml index 1d1e76122..c3f0469c6 100644 --- a/app/views/static/alt/_hero.html.haml +++ b/app/views/static/alt/_hero.html.haml @@ -12,7 +12,7 @@ .text-large.text-primary = t("views.alt.how_to_start", default: "How to start a Fablab?") %h5 - = t("views.alt.how_to_start_description", default: "Join the Fablab Network, an international movement in personal fabrication. The cheapest and fastest method to get a Fablab is to buy and assemble it yourself. This approach does require some expertise on hand to help you set up, install, debug and train. Alternatively, the Fab Foundation offers turnkey solutions for establishing new Fablabs around the globe.

Learn More

", fab_foundation: (link_to "Fab Foundation", "http://www.fabfoundation.org") ).html_safe + = t("views.alt.how_to_start_description", default: "Join the Fablab Network, an international movement in personal fabrication. The cheapest and fastest method to get a Fablab is to buy and assemble it yourself. To gain the needed knowledge, you can participate in the Fab Academy Alternatively, the Fab Foundation offers turnkey solutions for establishing new Fablabs around the globe.

Learn More

", fab_foundation: (link_to "Fab Foundation", "http://www.fabfoundation.org") ).html_safe .col-md-6.col-xl-4.mb-5 .homepage-header-content.shadow.p-5.h-100 .text-large.text-primary From ada8cbc6b2f704b42d7716f4a5407c17b0001344 Mon Sep 17 00:00:00 2001 From: Jean-michel Molenaar Date: Fri, 15 Sep 2023 14:38:27 +0200 Subject: [PATCH 2/3] removing covid banner and project section from home page --- app/views/static/alt.html.haml | 7 ------- app/views/static/alt/_corona.html.haml | 9 --------- app/views/static/alt/_projects.html.haml | 19 ------------------- 3 files changed, 35 deletions(-) delete mode 100644 app/views/static/alt/_corona.html.haml delete mode 100644 app/views/static/alt/_projects.html.haml diff --git a/app/views/static/alt.html.haml b/app/views/static/alt.html.haml index ee27d02c2..e3138e65c 100644 --- a/app/views/static/alt.html.haml +++ b/app/views/static/alt.html.haml @@ -3,13 +3,6 @@ .bg-grey = render 'static/alt/hero' = render 'static/alt/features' -.p-5.bg-grey - .container - = render 'static/alt/corona' -.py-5.bg-primary - = render 'static/alt/banner' -.py-5.bg-grey - = render 'static/alt/projects', projects: @projects .py-5.bg-white = render 'static/alt/news' .py-5.bg-grey diff --git a/app/views/static/alt/_corona.html.haml b/app/views/static/alt/_corona.html.haml deleted file mode 100644 index 9fb7d588f..000000000 --- a/app/views/static/alt/_corona.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -%h1.my-5.text-center.text-red-3 Coronavirus Outbreak -%p.text-center Over the past few months, we have been so heartened to see your strength, innovation and willingness to act and collaborate in responding to the COVID-19 pandemic. We feel very fortunate to be a part of this global community of such passionate and dynamic change from fabbers worldwide. -%p.text-center.text-muted To further collaboration, you can search for labs that are open and/or working on Covid-19 efforts using "Filter by status" on our global map. - -%h4.text-primary.font-weight-bold.mt-4 Link to resources -.homepage-divider.ml-0 -%ul.homepage-features-list.list-unstyled - %li - = link_to "https://gitlab.fabcloud.org/pub/project/coronavirus/tracking", "https://gitlab.fabcloud.org/pub/project/coronavirus/tracking", target: '_blank' diff --git a/app/views/static/alt/_projects.html.haml b/app/views/static/alt/_projects.html.haml deleted file mode 100644 index c24d75c50..000000000 --- a/app/views/static/alt/_projects.html.haml +++ /dev/null @@ -1,19 +0,0 @@ -.container - .row - .col-12 - %h3.text-primary.font-weight-bold Recent Projects - .row - - @projects.each do |a| - .col-md-6.col-lg-4.mb-5 - .card.shadow.p-4.w-100.h-100 - %a{href: 'https://projects.fablabs.io/search?q=' + a['slug'], target: "_blank"}=image_tag (a['image_url']), class: "card-img-top mb-4" - %h5 - %a{href: 'https://projects.fablabs.io/search?q=' + a['slug'], target: "_blank"}= a["title"] - .text-small - = raw a["description"] - .row - .col-12 - %a{href: "https://projects.fablabs.io", target: "_blank"} - %h4 - %span See more projects - = image_tag ("icons/arrow-right.svg") From 317d62414e19b5e098662f0e14630f1e07693218 Mon Sep 17 00:00:00 2001 From: Jean-michel Molenaar Date: Fri, 15 Sep 2023 15:37:33 +0200 Subject: [PATCH 3/3] update events section home page bottom --- app/controllers/static_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb index 9606375a7..068c447c9 100644 --- a/app/controllers/static_controller.rb +++ b/app/controllers/static_controller.rb @@ -18,9 +18,9 @@ def alt end @recent_labs = recent_labs() @news = [ - { :image_url => "news/fab15.jpg", :title => "FAB 15 Highlights", :url => "https://www.flickr.com/photos/fabfoundation/collections/72157710335192311/", :description => "FAB15 Egypt was a GREAT success. You can view all of the official photos from the FABulous week here."}, - { :image_url => "news/fabacademy.jpg", :title => "Fab Academy 2020: Registrations open", :url => "https://fabacademy.org", :description => "We're happy to announce that Applications to become a Host Node for Fab Academy 2020 are Now Open." }, - { :image_url => "news/fabricademy-2019.png", :title => "Fabricademy 2019-2020 Started!", :url => "https://textile-academy.org" , :description => "The new Fabricademy courses focus on sustainable textiles, fashion and wearables."}, + { :image_url => "news/fab15.jpg", :title => "FAB Bhtuan Highlights", :url => "https://fab23.fabevent.org/media/fab23-bhutan-a-success-by-any-measure", :description => "FAB Bhutan was a GREAT success. Check out the latest here"}, + { :image_url => "news/fabacademy.jpg", :title => "Fab Academy 2024: Registrations open", :url => "https://fabacademy.org", :description => "We're happy to announce that Applications to become a Host Node for Fab Academy 2024 are Now Open." }, + { :image_url => "news/fabricademy-2019.png", :title => "Fabricademy 2024 Started!", :url => "https://textile-academy.org" , :description => "The new Fabricademy courses focus on sustainable textiles, fashion and wearables."}, ] render layout: 'welcome'