Skip to content

Commit

Permalink
Merge pull request #372 from sozialhelden/change-links-from-community…
Browse files Browse the repository at this point in the history
…-to-news

Change links from `community` to `news`
  • Loading branch information
Andrew Hobden authored Sep 2, 2016
2 parents 7f4fef1 + 72f3a90 commit ef7253b
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions app/assets/javascripts/views/node-popup.view.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Wheelmap.NodePopupView = Ember.View.extend
classNames: ['node-popup-view']

aboutFaqLink: (()->
if I18n.locale == 'de' then '//community.wheelmap.org/about/faqs/' else '//community.wheelmap.org/en/faqs/'
if I18n.locale == 'de' then '//news.wheelmap.org/faq' else '//news.wheelmap.org/en/faq/'
).property()

linkTarget: (()->
Expand All @@ -29,4 +29,4 @@ Wheelmap.NodePopupStatusDropdownView = Ember.View.extend

click: (event)->
if Ember.$(event.target).closest('.dropdown-menu').length > 0
event.stopPropagation()
event.stopPropagation()
32 changes: 16 additions & 16 deletions app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ def render_twitter_metadata(options = {})

def link_to_participate
if I18n.locale == :de
link_to( t('how?'), "//community.wheelmap.org/mitmachen", :target => '_blank')
link_to( t('how?'), "//news.wheelmap.org/botschafter-werden/", :target => '_blank')
else
link_to( t('how?'), "//community.wheelmap.org/en/participate", :target => '_blank')
link_to( t('how?'), "//news.wheelmap.org/en/become-a-wheelmap-ambassador/", :target => '_blank')
end
end

Expand Down Expand Up @@ -97,57 +97,57 @@ def show_flash

def community_blog_url
if I18n.locale == :de
"//community.wheelmap.org/blog/"
"//news.wheelmap.org/news/"
else
"//community.wheelmap.org/en/blog/"
"//news.wheelmap.org/en/news/"
end
end

def community_press_url
if I18n.locale == :de
"//community.wheelmap.org/about/presse/"
"//news.wheelmap.org/presse/"
else
"//community.wheelmap.org/en/about/press/"
"//news.wheelmap.org/en/press/"
end
end

def community_contact_url
if I18n.locale == :de
"//community.wheelmap.org/kontakt/"
"//news.wheelmap.org/kontakt/"
else
"//community.wheelmap.org/en/contact/"
"//news.wheelmap.org/en/contact/"
end
end

def community_projects_url
if I18n.locale == :de
"//community.wheelmap.org/projekte/"
"//news.wheelmap.org/wheelmap-botschafter-werden/"
else
"//community.wheelmap.org/en/get-engaged/"
"//news.wheelmap.org/en/become-a-wheelmap-ambassador/"
end
end

def community_imprint_url
if I18n.locale == :de
"//community.wheelmap.org/impressum/"
"//news.wheelmap.org/impressum/"
else
"//community.wheelmap.org/en/imprint/"
"//news.wheelmap.org/en/imprint/"
end
end

def community_about_url
if I18n.locale == :de
"//community.wheelmap.org/about/"
"//news.wheelmap.org/faq"
else
"//community.wheelmap.org/en/about/"
"//news.wheelmap.org/en/faq"
end
end

def community_newsletter_url
if I18n.locale == :de
"//community.wheelmap.org/newsletter/"
"//news.wheelmap.org/kontakt/"
else
"//community.wheelmap.org/newsletter-2/"
"//news.wheelmap.org/contact/"
end
end

Expand Down
2 changes: 1 addition & 1 deletion app/views/nodes/_node_faq.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.node-report-accordion.dropdown-accordion
%header
.pull-right
= link_to('FAQ', I18n.locale == :de ? '//community.wheelmap.org/about/faqs/' : '//community.wheelmap.org/en/faqs/', class: 'btn btn-mini', target: '_blank')
= link_to('FAQ', I18n.locale == :de ? '//news.wheelmap.org/faq/' : '//news.wheelmap.org/en/faq/', class: 'btn btn-mini', target: '_blank')
= mail_to('[email protected]', content_tag(:i, '', class: 'icon-envelope-alt'), class: 'btn btn-mini', encode: :hex, subject: I18n.t('models.node.mail.subject', headline: @node.headline), body: I18n.t('models.node.mail.body', url: node_url(@node)))
= t('faq.headline')
- t('faq.questions').size.times do |i|
Expand Down
6 changes: 3 additions & 3 deletions app/views/relaunch/_footer.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
%ul.credits
%li
%span{:style => 'display:inline-block'}= t('wheelmap.footer.main_supporter')
= link_to "//community.wheelmap.org/about/partner/immobilienscout24/", id: 'immobilienscout24' do
= link_to "http://foerderung.sozialhelden.de/forderhelden/", id: 'immobilienscout24' do
= image_tag('[email protected]', :size => '42x20', :alt => 'ImmobilienScout24', :title => 'ImmobilienScout24', :style => "margin-top: -3px;height:20px")
= link_to "//community.wheelmap.org/about/partner/allianz/", style: "display:none", id: 'allianz' do
= link_to "http://foerderung.sozialhelden.de/forderhelden/", style: "display:none", id: 'allianz' do
= image_tag('[email protected]', :size => '45x20', :alt => 'Allianz Logo', :title => 'Allianz', :style => "margin-top: -3px;height:20px")
%li
= link_to t('header.navigation.imprint'), community_imprint_url, :target => '_blank'
Expand All @@ -29,4 +29,4 @@
= link_to 'http://sozialhelden.de', :id => 'sozialhelden', :title => 'Sozialhelden' do
= image_tag('[email protected]', :class => 'sozialhelden_logo', :alt => t('layouts.application.banner.alt'), :size => '120x24', :style => "margin-top: -4px;height:24px;")

/ footer end
/ footer end
2 changes: 1 addition & 1 deletion app/views/shared/_footer.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
= image_tag('[email protected]', :size => '42x20', :alt => 'ImmobilienScout24', :title => 'ImmobilienScout24', :style => "margin-top: -3px;height:20px")
%span>
|
= link_to t('header.navigation.imprint'), "//community.wheelmap.org/kontakt", :target => '_blank'
= link_to t('header.navigation.imprint'), "//news.wheelmap.org/kontakt", :target => '_blank'
%span>
|
= t('wheelmap.footer.a_project_of')
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/_splash.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
%p
= link_to t('splash.start'), '#', :class => 'unblock-splash button splash-start'
%p
= link_to t('splash.what_is_wheelmap'), '//community.wheelmap.org/', :class => 'whatis'
= link_to t('splash.what_is_wheelmap'), '//news.wheelmap.org/', :class => 'whatis'
4 changes: 2 additions & 2 deletions app/views/terms/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
.content
= semantic_form_for current_user, :url => terms_profile_path do |form|

- terms_blog_url = I18n.locale == :de ? '//community.wheelmap.org/impressum/nutzungsbedingungen/' : '//community.wheelmap.org/en/imprint/terms-of-use/'
- terms_blog_url = I18n.locale == :de ? '//news.wheelmap.org/nutzungsbedingungen/' : '//news.wheelmap.org/en/terms-of-use/'
%iframe{:align => 'center', :src => terms_blog_url, :width => '100%', :height => '300', :frameborder => '0', :seamless => 'seamless'}

.row-fluid
.span11.offset1.mt10
= form.input :terms

.mt30
- privacy_blog_url = I18n.locale == :de ? '//community.wheelmap.org/impressum/datenschutzerklarung/' : '//community.wheelmap.org/en/imprint/privacy/'
- privacy_blog_url = I18n.locale == :de ? '//news.wheelmap.org/datenschutz/' : '//news.wheelmap.org/en/privacy/'
%iframe{:align => 'center', :src => privacy_blog_url, :width => '100%', :height => '300', :frameborder => '0', :seamless => 'seamless'}

.row-fluid
Expand Down

0 comments on commit ef7253b

Please sign in to comment.