diff --git a/app/assets/stylesheets/application.sass b/app/assets/stylesheets/application.sass index 7d37325..424b669 100644 --- a/app/assets/stylesheets/application.sass +++ b/app/assets/stylesheets/application.sass @@ -152,4 +152,7 @@ body a color: #FFF - \ No newline at end of file +.row.fix + display: flex + flex-wrap: wrap + width: 100% diff --git a/app/views/greendays/index.html.slim b/app/views/greendays/index.html.slim index 04b512b..bbe8917 100644 --- a/app/views/greendays/index.html.slim +++ b/app/views/greendays/index.html.slim @@ -1,14 +1,14 @@ h1.sr-only = title 'Gründonnerstag' #map -= link_to 'Neun Shop erfassen', new_greenday_path if admin? += link_to 'Neuen Shop erfassen', new_greenday_path if admin? -.row +.row.fix - @greendays.each do |greenday| .col-xs-12.col-sm-6.col-lg-4 .well h2 = greenday.title - - if greenday.logo + - if greenday.logo.url(:original) != '/logos/original/missing.png' = image_tag greenday.logo.url(:original), alt: '', class: 'img-responsive' address = simple_format(greenday.address) - if greenday.homepage diff --git a/config/locales/de.yml b/config/locales/de.yml index b904e92..46c2332 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -119,6 +119,7 @@ de: numbers: zahlen statementes: statements collection_concept: Sammelkonzept + greendays: gründonnerstag mongoid: models: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index b674559..00c3997 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -116,6 +116,7 @@ fr: numbers: chiffres statements: declarations collection_concept: plan_de_collecte + greendays: jeudi_vert mongoid: models: diff --git a/config/locales/it.yml b/config/locales/it.yml index 59f6cb4..071fce8 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -120,6 +120,7 @@ it: numbers: numeri statements: dichiarazioni collection_concept: sistema_di_raccolta + greendays: giovedi_verdi mongoid: attributes: diff --git a/config/routes.rb b/config/routes.rb index 1032f30..b1845b6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,4 @@ Rails.application.routes.draw do - resources :greendays devise_for :supporters root to: 'supporters#new' @@ -12,6 +11,7 @@ Rails.application.routes.draw do end localized do + resources :greendays get '/initiative_text', to: 'pages#show', as: :initiative_text, page: 'initiative_text' get '/arguments', to: 'pages#show', as: :arguments, page: 'arguments' get '/faq', to: 'pages#show', as: :faq, page: 'faq'