Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding fab academy links to homepage #630

Merged
merged 3 commits into from
Sep 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/controllers/static_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
4 changes: 4 additions & 0 deletions app/views/application/_header.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
7 changes: 0 additions & 7 deletions app/views/static/alt.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions app/views/static/alt/_corona.html.haml

This file was deleted.

2 changes: 1 addition & 1 deletion app/views/static/alt/_hero.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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. <br><br><a href='https://fabfoundation.org/getting-started/#fab-lab-questions'>Learn More</a></p>", 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 <a href='https://fabacademy.org/'>Fab Academy</a> Alternatively, the Fab Foundation offers turnkey solutions for establishing new Fablabs around the globe. <br><br><a href='https://fabfoundation.org/getting-started/#fab-lab-questions'>Learn More</a></p>", 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
Expand Down
19 changes: 0 additions & 19 deletions app/views/static/alt/_projects.html.haml

This file was deleted.

Loading