diff --git a/app/views/application/_address.slim b/app/views/application/_address.slim
deleted file mode 100644
index 3780bff..0000000
--- a/app/views/application/_address.slim
+++ /dev/null
@@ -1,5 +0,0 @@
-address
- | Verein Legalize it!
- | Quellenstrasse 25
- | Postfach 2159
- | CH-8031 Zürich
\ No newline at end of file
diff --git a/app/views/application/_contact.de.slim b/app/views/application/_contact.de.slim
deleted file mode 100644
index d88cd71..0000000
--- a/app/views/application/_contact.de.slim
+++ /dev/null
@@ -1,7 +0,0 @@
-h2 Kontakt
-p
- | Nino Forrer (#{mail_to 'nino@hanflegal.ch'})
- em Strategie / Presse
- br
- | Markus Graf (#{mail_to 'markus@hanflegal.ch'})
- em Inhalt / Technik
\ No newline at end of file
diff --git a/app/views/application/_contact.it.slim b/app/views/application/_contact.it.slim
deleted file mode 100644
index 7fdc312..0000000
--- a/app/views/application/_contact.it.slim
+++ /dev/null
@@ -1,7 +0,0 @@
-h2 Contatti
-p
- | Nino Forrer (#{mail_to 'nino@hanflegal.ch'})
- em Strategie / Presse
- br
- | Markus Graf (#{mail_to 'markus@hanflegal.ch'})
- em Inhalt / Technik
\ No newline at end of file
diff --git a/app/views/application/_donation_button.slim b/app/views/application/_donation_button.slim
deleted file mode 100644
index 2285b55..0000000
--- a/app/views/application/_donation_button.slim
+++ /dev/null
@@ -1,2 +0,0 @@
-.donation_button
- =link_to t('donation'), donation_path
\ No newline at end of file
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index 2a5b897..f4f984b 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -1,7 +1,7 @@
-doctype html
+doctype html
html lang="#{I18n.locale}"
head
- title
+ title
- flash.each do |type, message|
= message
| #CH420 - #{content_for(:title)}
@@ -31,7 +31,7 @@ html lang="#{I18n.locale}"
meta content="#ffffff" name="theme-color" /
meta property="og:title" content="#{content_for(:title)}"
- meta property="og:description" content="#{t('shared.description')}"
+ meta property="og:description" content="#{t('shared.description')}"
meta property="og:image" content="#{image_url('ch420_logo.png')}"
meta name="twitter:title" content="#{content_for(:title)}"
@@ -41,7 +41,6 @@ html lang="#{I18n.locale}"
meta name="twitter:image:alt" content="#{t('shared.header.logo')}"
body class="#{'admin' if controller.admin_area}"
- = render 'donation_button'
javascript:
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -52,9 +51,9 @@ html lang="#{I18n.locale}"
ga('send', 'pageview');
.container.anouncement
/.text-center.lead.alert.alert-success
- a href="https://wemakeit.com/projects/cannabislegalisierungs-crowd" class="text-success"
+ a href="https://wemakeit.com/projects/cannabislegalisierungs-crowd" class="text-success"
= t('shared.crowdfunding')
-
+
nav.languages.pull-right
h2.sr-only =t('shared.lang')
a href='/' lang='de'
@@ -65,7 +64,7 @@ html lang="#{I18n.locale}"
| |
a href='/fr' lang='fr'
| Français
-
+
.container.content
= render 'shared/flashes'
= render 'shared/header'
@@ -78,11 +77,7 @@ html lang="#{I18n.locale}"
footer.row
.col-xs-12.col-sm-6
= render 'core_statements'
- .col-xs-12.col-sm-4
- = render 'contact'
- .col-xs-12.col-sm-2
- = render 'address'
-
+
javascript:
I18n.defaultLocale = "#{I18n.default_locale}";
- I18n.locale = "#{I18n.locale}";
\ No newline at end of file
+ I18n.locale = "#{I18n.locale}";
diff --git a/config/navigation.rb b/config/navigation.rb
index 31f8dc3..54d5330 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -71,8 +71,6 @@ SimpleNavigation::Configuration.run do |navigation|
statements.item :new_statement, I18n.t('.supporters.publicity.renew'), new_publicity_path
statements.item :new_statement, 'Statement Administration', admin_publicities_path if supporter_signed_in? && current_supporter.admin?
end
- primary.item :donation, I18n.t('donation'), donation_path
- primary.item :blog, 'Blog', 'http://blog.cannabis-initiative.ch/', link_html: { target: '_blank'}
if supporter_signed_in?
primary.item :home, I18n.t('.shared.topnavigation.my_account'), "/#{I18n.locale}" do |my_account|
my_account.item :edit_account, I18n.t('.supporters.new.edit'), edit_supporter_registration_path()
diff --git a/config/routes.rb b/config/routes.rb
index cb6b73d..dde066a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,8 +16,6 @@ Rails.application.routes.draw do
get '/arguments', to: 'pages#show', as: :arguments, page: 'arguments'
get '/faq', to: 'pages#show', as: :faq, page: 'faq'
get '/terms_and_conditions', to: 'pages#show', as: :terms_and_conditions, page: 'terms_and_conditions'
- get '/sponsoring', to: 'pages#show', as: :sponsoring, page: 'sponsoring'
- get '/donation', to: 'pages#show', as: :donation, page: 'donation'
get '/numbers', to: 'pages#show', as: :numbers, page: 'numbers'
get '/statements', to: 'pages#show', as: :statements, page: 'statements'
end