From 1810d38bd6e296e9121ce9b7a92437537677ffdf Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Tue, 7 Aug 2018 11:49:17 +0200 Subject: [PATCH] url --- .../javascripts/vendor/jquery.cookiebar.js | 2 +- app/controllers/public/home_controller.rb | 2 +- app/mailers/admin_mailer.rb | 2 +- app/views/admin/tiny_urls/index.html.haml | 2 +- .../admin_mailer/notify_comments.html.haml | 2 +- .../render_public/_downloadcontent.html.haml | 2 +- .../render_public/_sharecontent.html.haml | 6 +-- app/views/public/articles/_article.html.haml | 2 +- .../public/articles/_article_img.html.haml | 4 +- .../public/articles/_article_search.html.haml | 4 +- .../public/articles/_article_x2.html.haml | 4 +- .../public/articles/_article_x2_2.html.haml | 4 +- app/views/public/home/angora.html.haml | 42 +++++++++---------- app/views/public/home/angora_e1.html.haml | 12 +++--- app/views/public/home/assurance.html.haml | 2 +- app/views/public/home/assurance2.html.haml | 4 +- app/views/public/home/fourrure.html.haml | 34 +++++++-------- app/views/public/home/fourrure.old.html.haml | 38 ++++++++--------- .../public/seo/_sitemap_localhost.builder | 38 ++++++++--------- app/views/public/seo/robots.erb | 2 +- app/views/public/seo/sitemap.builder | 2 +- app/views/public/shared/_home.html.haml | 12 +++--- app/views/public/specific_maps/show.html.haml | 2 +- config/environments/production.rb | 2 +- 24 files changed, 113 insertions(+), 113 deletions(-) diff --git a/app/assets/javascripts/vendor/jquery.cookiebar.js b/app/assets/javascripts/vendor/jquery.cookiebar.js index bfdd553..6813a99 100755 --- a/app/assets/javascripts/vendor/jquery.cookiebar.js +++ b/app/assets/javascripts/vendor/jquery.cookiebar.js @@ -32,7 +32,7 @@ declineFunction: function(cookieValue){if(cookieValue=='enabled' || cookieValue=='accepted') window.location = window.location.href;}, //Function to run after decline policyButton: true, //Set to true to show Privacy Policy button policyText: 'En savoir plus.', //Text on Privacy Policy button - policyURL: 'https://karim.quartz.xyz/fr/mentions-legales.html', //URL of Privacy Policy + policyURL: 'https://peractus.quartz.xyz/fr/mentions-legales.html', //URL of Privacy Policy autoEnable: true, //Set to true for cookies to be accepted automatically. Banner still shows acceptOnContinue: false, //Set to true to accept cookies when visitor moves to another page acceptOnScroll: false, //Set to true to accept cookies when visitor scrolls X pixels up or down diff --git a/app/controllers/public/home_controller.rb b/app/controllers/public/home_controller.rb index 1b4d134..9e978b3 100644 --- a/app/controllers/public/home_controller.rb +++ b/app/controllers/public/home_controller.rb @@ -37,7 +37,7 @@ class Public::HomeController < ApplicationController def angora if !params[:force] - redirect_to "https://karim.quartz.xyz/fr/petitions/stop-angora.html" + redirect_to "https://peractus.quartz.xyz/fr/petitions/stop-angora.html" else render :layout => false diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb index 70acdc4..7bba882 100644 --- a/app/mailers/admin_mailer.rb +++ b/app/mailers/admin_mailer.rb @@ -5,6 +5,6 @@ class AdminMailer < ActionMailer::Base end def notify_comments - mail :to => "info@karim.quartz.xyz,perrotmathilde@orange.fr", :subject => "Nouveaux commentaires à modérer sur le blog", :from => "info@karim.quartz.xyz" + mail :to => "info@peractus.quartz.xyz,perrotmathilde@orange.fr", :subject => "Nouveaux commentaires à modérer sur le blog", :from => "info@peractus.quartz.xyz" end end \ No newline at end of file diff --git a/app/views/admin/tiny_urls/index.html.haml b/app/views/admin/tiny_urls/index.html.haml index 046bf2e..f7770ae 100644 --- a/app/views/admin/tiny_urls/index.html.haml +++ b/app/views/admin/tiny_urls/index.html.haml @@ -19,7 +19,7 @@ - @tiny_urls.each do |tiny_url| %tr - %td= link_to "https://karim.quartz.xyz"+tiny_url_path(tiny_url.slug),"https://karim.quartz.xyz"+tiny_url_path(tiny_url.slug) + %td= link_to "https://peractus.quartz.xyz"+tiny_url_path(tiny_url.slug),"https://peractus.quartz.xyz"+tiny_url_path(tiny_url.slug) %td= tiny_url.url %td= tiny_url.nbr_views %td.actions diff --git a/app/views/admin_mailer/notify_comments.html.haml b/app/views/admin_mailer/notify_comments.html.haml index 697fed1..4e9f695 100644 --- a/app/views/admin_mailer/notify_comments.html.haml +++ b/app/views/admin_mailer/notify_comments.html.haml @@ -6,7 +6,7 @@ %p Voici le lien direct pour le faire : - =link_to "https://karim.quartz.xyz/admin/comments?lang=fr", "https://karim.quartz.xyz/admin/comments?lang=fr" + =link_to "https://peractus.quartz.xyz/admin/comments?lang=fr", "https://peractus.quartz.xyz/admin/comments?lang=fr" %p Bonne journée ! \ No newline at end of file diff --git a/app/views/portlets/render_public/_downloadcontent.html.haml b/app/views/portlets/render_public/_downloadcontent.html.haml index 36a7cb5..36d9656 100644 --- a/app/views/portlets/render_public/_downloadcontent.html.haml +++ b/app/views/portlets/render_public/_downloadcontent.html.haml @@ -22,7 +22,7 @@ =link_to "Lire", read_data_file_path(input.data_file.token), :target => "_blank" -if input.boutique? - =#link_to "Commander", "mailto:info@karim.quartz.xyz?subject=commande de document&body=Fichier : https://karim.quartz.xyz#{input.data_file.file.url} " + =#link_to "Commander", "mailto:info@peractus.quartz.xyz?subject=commande de document&body=Fichier : https://peractus.quartz.xyz#{input.data_file.file.url} " =link_to "Commander", new_public_document_order_path(:token => input.data_file.token), :remote => true .clear diff --git a/app/views/portlets/render_public/_sharecontent.html.haml b/app/views/portlets/render_public/_sharecontent.html.haml index 78f6b1b..fe67c86 100644 --- a/app/views/portlets/render_public/_sharecontent.html.haml +++ b/app/views/portlets/render_public/_sharecontent.html.haml @@ -4,19 +4,19 @@ .socials_links{:style => "text-align:center;margin:20px 0;"} -if input.facebook =link_to "https://www.facebook.com/sharer/sharer.php?u=#{input.url}", :target => "_blank", :class => "round_social facebook" do - =image_tag("https://karim.quartz.xyz/share_contents/facebook.png", :style => "height:40px;margin:5px 5px;") + =image_tag("https://peractus.quartz.xyz/share_contents/facebook.png", :style => "height:40px;margin:5px 5px;") =#"https://www.facebook.com/sharer/sharer.php?u=#{request.url}" -if input.twitter =link_to "https://twitter.com/intent/tweet?url=#{input.url}&via=onevoiceanimal&text="+CGI::escape(input.twitter_title.to_s), :target => "_blank", :class => "round_social twitter" do - =image_tag("https://karim.quartz.xyz/share_contents/twitter.png", :style => "height:40px;margin:5px 5px;") + =image_tag("https://peractus.quartz.xyz/share_contents/twitter.png", :style => "height:40px;margin:5px 5px;") =#"https://twitter.com/intent/tweet?url=#{request.url}&via=onevoiceanimal&text="+CGI::escape(@twitter_title.to_s) -if input.mail =link_to "mailto:?cc=&bcc=&subject="+URI.encode(input.mail_subject)+"&body="+URI.encode(input.mail_content), :class => "round_social twitter" do - =image_tag("https://karim.quartz.xyz/share_contents/mail.png", :style => "height:40px;margin:5px 5px;") + =image_tag("https://peractus.quartz.xyz/share_contents/mail.png", :style => "height:40px;margin:5px 5px;") =#"https://twitter.com/intent/tweet?url=#{request.url}&via=onevoiceanimal&text="+CGI::escape(@twitter_title.to_s) diff --git a/app/views/public/articles/_article.html.haml b/app/views/public/articles/_article.html.haml index 7eb0aec..2f67eec 100644 --- a/app/views/public/articles/_article.html.haml +++ b/app/views/public/articles/_article.html.haml @@ -1,7 +1,7 @@ -lang_article = article.lang_articles.find_by_lang_site_id(@lang.id) -#if article.without_text_image_file --#img_url = "https://karim.quartz.xyz"+article.without_text_image_file.file.large.url +-#img_url = "https://peractus.quartz.xyz"+article.without_text_image_file.file.large.url -if article.image_file -img_url = ""+article.image_file.file.large.medium.url diff --git a/app/views/public/articles/_article_img.html.haml b/app/views/public/articles/_article_img.html.haml index 8f4b7ef..a62a216 100644 --- a/app/views/public/articles/_article_img.html.haml +++ b/app/views/public/articles/_article_img.html.haml @@ -1,7 +1,7 @@ -if article.without_text_image_file - -img_url = "https://karim.quartz.xyz"+article.without_text_image_file.file.large.url + -img_url = "https://peractus.quartz.xyz"+article.without_text_image_file.file.large.url -elsif article.image_file - -img_url = "https://karim.quartz.xyz"+article.image_file.file.large.url + -img_url = "https://peractus.quartz.xyz"+article.image_file.file.large.url -else -img_url = "" diff --git a/app/views/public/articles/_article_search.html.haml b/app/views/public/articles/_article_search.html.haml index 4bb3bab..9e9a944 100644 --- a/app/views/public/articles/_article_search.html.haml +++ b/app/views/public/articles/_article_search.html.haml @@ -1,9 +1,9 @@ -lang_article = article.lang_articles.find_by_lang_site_id(@lang.id) -if article.without_text_image_file - -img_url = "https://karim.quartz.xyz"+article.without_text_image_file.file.large.url + -img_url = "https://peractus.quartz.xyz"+article.without_text_image_file.file.large.url -elsif article.image_file - -img_url = "https://karim.quartz.xyz"+article.image_file.file.large.url + -img_url = "https://peractus.quartz.xyz"+article.image_file.file.large.url -if article_valid_to_show(article, @lang, Time.now) -@count = @count + 1 diff --git a/app/views/public/articles/_article_x2.html.haml b/app/views/public/articles/_article_x2.html.haml index cf48b93..615cf6d 100644 --- a/app/views/public/articles/_article_x2.html.haml +++ b/app/views/public/articles/_article_x2.html.haml @@ -1,9 +1,9 @@ -lang_article = article.lang_articles.find_by_lang_site_id(@lang.id) -if article.without_text_image_file - -img_url = "https://karim.quartz.xyz"+article.without_text_image_file.file.large.medium.small.url + -img_url = "https://peractus.quartz.xyz"+article.without_text_image_file.file.large.medium.small.url -elsif article.image_file - -img_url = "https://karim.quartz.xyz"+article.image_file.file.large.medium.small.url + -img_url = "https://peractus.quartz.xyz"+article.image_file.file.large.medium.small.url =link_to article_path(:slug => lang_article.slug, :lang => @lang.slug), :class => "article-2x " do diff --git a/app/views/public/articles/_article_x2_2.html.haml b/app/views/public/articles/_article_x2_2.html.haml index 60c660f..43cea9d 100644 --- a/app/views/public/articles/_article_x2_2.html.haml +++ b/app/views/public/articles/_article_x2_2.html.haml @@ -1,9 +1,9 @@ -lang_article = article.lang_articles.find_by_lang_site_id(@lang.id) -if article.without_text_image_file - -img_url = "https://karim.quartz.xyz"+article.without_text_image_file.file.large.url + -img_url = "https://peractus.quartz.xyz"+article.without_text_image_file.file.large.url -elsif article.image_file - -img_url = "https://karim.quartz.xyz"+article.image_file.file.large.url + -img_url = "https://peractus.quartz.xyz"+article.image_file.file.large.url =link_to article_path(:slug => lang_article.slug, :lang => @lang.slug), :class => "article-2x-2", :data => {:ratio => "0.62"} do diff --git a/app/views/public/home/angora.html.haml b/app/views/public/home/angora.html.haml index da97958..1c310f8 100644 --- a/app/views/public/home/angora.html.haml +++ b/app/views/public/home/angora.html.haml @@ -1,7 +1,7 @@ -@partenaire = true - @social_url = "https://stop-angora.fr/#{@lang.slug}" --@one_voice_host = "https://karim.quartz.xyz" +-@one_voice_host = "https://peractus.quartz.xyz" -@menu_shadow=true -@lang = @lang || LangSite.first -if !@facebook_img or @facebook_img == "" @@ -54,20 +54,20 @@ -if @facebook_img - =raw '' - =raw '' + =raw '' + =raw '' =raw '' - =raw '' + =raw '' - -@img_size = FastImage.size('https://karim.quartz.xyz'+@facebook_img.to_s) + -@img_size = FastImage.size('https://peractus.quartz.xyz'+@facebook_img.to_s) -if @img_size and @img_size.size > 0 =raw '' @@ -137,12 +137,12 @@ =image_tag("/angora/icon-#{link[1]}.png") =link[0] - =link_to qit("angora-soutenez","Soutenez !"), "https://karim.quartz.xyz/faire-un-don", :target => "_blank", :class => "donate" + =link_to qit("angora-soutenez","Soutenez !"), "https://peractus.quartz.xyz/faire-un-don", :target => "_blank", :class => "donate" =#link_to qit("angora-soutenez","Soutenez !"), "#ov", :target => "_blank", :onclick => "$('html,body').animate({scrollTop: ($('#ov').offset().top -40)},'slow');return false;", :class => "donate" - =link_to image_tag( "/logo-ow.png", :id => "logo"), "https://karim.quartz.xyz" + =link_to image_tag( "/logo-ow.png", :id => "logo"), "https://peractus.quartz.xyz" #top_block .inner @@ -174,10 +174,10 @@ ou en vous connectant au hashtag =link_to( "#StopAngoraFrance", "https://twitter.com/search?f=tweets&q=%23StopAngoraFrance&src=typd", :target => "_blank" )+"." Vous pouvez aussi vous exprimer sur le - =link_to "forum", "https://karim.quartz.xyz/forum", :target => "_blank" + =link_to "forum", "https://peractus.quartz.xyz/forum", :target => "_blank" disponible sur notre site - =link_to "One-Voice.fr", "https://karim.quartz.xyz" + =link_to "One-Voice.fr", "https://peractus.quartz.xyz" -else %h3 NEWS @@ -187,10 +187,10 @@ or by connecting with the hashtag =link_to( "#StopAngoraFrance", "https://twitter.com/search?f=tweets&q=%23StopAngoraFrance&src=typd", :target => "_blank" )+"." You can also comment on our - =link_to "forum", "https://karim.quartz.xyz/forum", :target => "_blank" + =link_to "forum", "https://peractus.quartz.xyz/forum", :target => "_blank" on our website: - =link_to "One-Voice.fr", "https://karim.quartz.xyz" + =link_to "One-Voice.fr", "https://peractus.quartz.xyz" #images %a{:anchor => "images"} @@ -275,7 +275,7 @@   =link_to qit("angora-signer-la-petition","Signer la pétition"), "#petition", :class => "petition_link" %p - =link_to qit("angora-faire-un-don","Faire un don"), "https://karim.quartz.xyz/fr/faire-un-don", :class => "donate_link", :target => "_blank" + =link_to qit("angora-faire-un-don","Faire un don"), "https://peractus.quartz.xyz/fr/faire-un-don", :class => "donate_link", :target => "_blank" .clear @@ -583,7 +583,7 @@ 3P entend mener ce combat jusqu’à son terme, c’est-à-dire obtenir une législation nationale proscrivant l’élevage de lapins angoras sur notre sol et, si possible, l’interdiction de ce produit en France. Nous avons obtenu gain de cause sur la circulation de fourrures de chiens et de chats dans l’UE. Le combat pour les lapins angoras sera tout aussi ardu, semé d’actions en justice et, si nécessaire, de réunions avec les pouvoirs publics afin de poser des solutions de reconversion à cette filière. %br 3P a besoin de votre soutien dans ces démarches. - =link_to "Soutenez-nous par vos dons.", "https://karim.quartz.xyz/fr/faire-un-don", :target => "_blank" + =link_to "Soutenez-nous par vos dons.", "https://peractus.quartz.xyz/fr/faire-un-don", :target => "_blank" .clear @@ -753,7 +753,7 @@ %br Merci du fond du cœur de votre soutien. %p.donate_p{:style => "padding-bottom:100px;"} - =link_to qit("angora-faire-un-don","Faire un don"), "https://karim.quartz.xyz/fr/faire-un-don?c=52", :class => "donate_link", :target => "_blank" + =link_to qit("angora-faire-un-don","Faire un don"), "https://peractus.quartz.xyz/fr/faire-un-don?c=52", :class => "donate_link", :target => "_blank" .photo_credits{:style => "margin:0"} @@ -846,7 +846,7 @@ -title =petition_lang.short_title -else -title=petition_lang.title - %li=link_to title, "https://karim.quartz.xyz"+petition_path(:slug => petition_lang.slug, :lang => I18n.locale.to_s) + %li=link_to title, "https://peractus.quartz.xyz"+petition_path(:slug => petition_lang.slug, :lang => I18n.locale.to_s) .columns.span_2 @@ -879,11 +879,11 @@ %h4 =link_to qit("bas Je fais un don","Je fais un don"), new_public_donator_transaction_path %ul - %li=link_to qit("bas Don en ligne", "Don en ligne"), "https://karim.quartz.xyz"+new_public_donator_transaction_path - %li=link_to qit("bas Adhérer", "Adhérer"), "https://karim.quartz.xyz"+new_public_transaction_join_path - %li=link_to qit("bas Parrainer", "Parrainer"), "https://karim.quartz.xyz"+public_sponsorship_animals_path - %li=link_to "S'abonner à Noé", "https://karim.quartz.xyz"+new_public_transaction_abo_path if I18n.locale == :fr - %li=link_to qit("bas Assurance vie", "Assurance vie"), "https://karim.quartz.xyz"+"/fr/assurance-vie.html" if I18n.locale == :fr + %li=link_to qit("bas Don en ligne", "Don en ligne"), "https://peractus.quartz.xyz"+new_public_donator_transaction_path + %li=link_to qit("bas Adhérer", "Adhérer"), "https://peractus.quartz.xyz"+new_public_transaction_join_path + %li=link_to qit("bas Parrainer", "Parrainer"), "https://peractus.quartz.xyz"+public_sponsorship_animals_path + %li=link_to "S'abonner à Noé", "https://peractus.quartz.xyz"+new_public_transaction_abo_path if I18n.locale == :fr + %li=link_to qit("bas Assurance vie", "Assurance vie"), "https://peractus.quartz.xyz"+"/fr/assurance-vie.html" if I18n.locale == :fr .clear @@ -900,7 +900,7 @@ ="-" =ic(:"envelope-o") - =link_to "info@karim.quartz.xyz", "mailto:info@karim.quartz.xyz" + =link_to "info@peractus.quartz.xyz", "mailto:info@peractus.quartz.xyz" = "Association" if @lang.id != 2 diff --git a/app/views/public/home/angora_e1.html.haml b/app/views/public/home/angora_e1.html.haml index 49ecd39..0e6533d 100644 --- a/app/views/public/home/angora_e1.html.haml +++ b/app/views/public/home/angora_e1.html.haml @@ -1,5 +1,5 @@ - @social_url = "https://stop-angora.fr/#{@lang.slug}" --@one_voice_host = "https://karim.quartz.xyz" +-@one_voice_host = "https://peractus.quartz.xyz" -@menu_shadow=true -@lang = @lang || LangSite.first -if !@facebook_img or @facebook_img == "" @@ -52,20 +52,20 @@ -if @facebook_img - =raw '' - =raw '' + =raw '' + =raw '' =raw '' - =raw '' + =raw '' - -@img_size = FastImage.size('https://karim.quartz.xyz'+@facebook_img.to_s) + -@img_size = FastImage.size('https://peractus.quartz.xyz'+@facebook_img.to_s) -if @img_size and @img_size.size > 0 =raw '' @@ -104,7 +104,7 @@ #main_block .inner{:style => "padding:20px;background:white;max-width:1000px"} - =image_tag "https://karim.quartz.xyz/logo_w.png", :style => "display:block;margin:auto;width:100px;margin-top:20px;" + =image_tag "https://peractus.quartz.xyz/logo_w.png", :style => "display:block;margin:auto;width:100px;margin-top:20px;" %h1{:style => "font-size:26px;text-align:center;margin-top:30px;margin-bottom:5px;padding:0;"}=link_to "3P en campagne !", "https://stop-angora.fr" %h2{:style => "font-size:24px;text-align:center;margin-top:0px;margin-bottom:60px;color:black;text-transform:none;padding:0"}=link_to "#StopAngoraFrance", "https://stop-angora.fr", :style => "color:black;" diff --git a/app/views/public/home/assurance.html.haml b/app/views/public/home/assurance.html.haml index 0f86234..ef0a40d 100644 --- a/app/views/public/home/assurance.html.haml +++ b/app/views/public/home/assurance.html.haml @@ -61,7 +61,7 @@ %br %br %p - =link_to raw("Je souhaite recevoir une brochure d'information ou être recontacté par Michèle "+ic(:"arrow-right")), "https://karim.quartz.xyz/"+donation_contact_path(), :target => "_blank", :style => "display:inline-block;padding:5px 10px;border: 1px solid orange" + =link_to raw("Je souhaite recevoir une brochure d'information ou être recontacté par Michèle "+ic(:"arrow-right")), "https://peractus.quartz.xyz/"+donation_contact_path(), :target => "_blank", :style => "display:inline-block;padding:5px 10px;border: 1px solid orange" %br %br diff --git a/app/views/public/home/assurance2.html.haml b/app/views/public/home/assurance2.html.haml index 3cf17ca..9f54456 100644 --- a/app/views/public/home/assurance2.html.haml +++ b/app/views/public/home/assurance2.html.haml @@ -1,6 +1,6 @@ =raw "" --@social_url = "https://karim.quartz.xyz/fr/legs-assurance-vie.html" +-@social_url = "https://peractus.quartz.xyz/fr/legs-assurance-vie.html" -@twitter_title = "Aidez-nous à pérenniser nos #combats pour les #animaux" -@title = "Aidez-nous à pérenniser nos combats pour les animaux" -@description = "Continuons à écrire ensemble le Grand Livre des animaux." @@ -126,7 +126,7 @@ %br .email %span=ic :envelope - =link_to "muriel@karim.quartz.xyz", "mailto:muriel@karim.quartz.xyz" + =link_to "muriel@peractus.quartz.xyz", "mailto:muriel@peractus.quartz.xyz" .clear diff --git a/app/views/public/home/fourrure.html.haml b/app/views/public/home/fourrure.html.haml index 23ea7fd..9e715b4 100644 --- a/app/views/public/home/fourrure.html.haml +++ b/app/views/public/home/fourrure.html.haml @@ -1,7 +1,7 @@ -@partenaire = true - @social_url = "https://visonslerespect.fr/#{@lang.slug}" --@one_voice_host = "https://karim.quartz.xyz" +-@one_voice_host = "https://peractus.quartz.xyz" -@menu_shadow=true -@lang = @lang || LangSite.first -if !@facebook_img or @facebook_img == "" @@ -58,20 +58,20 @@ -if @facebook_img - =raw '' - =raw '' + =raw '' + =raw '' =raw '' - =raw '' + =raw '' - -@img_size = FastImage.size('https://karim.quartz.xyz'+@facebook_img.to_s) + -@img_size = FastImage.size('https://peractus.quartz.xyz'+@facebook_img.to_s) -if @img_size and @img_size.size > 0 =raw '' @@ -131,14 +131,14 @@ =image_tag("/fourrure/icon-#{link[1]}.png") =link[0] - =link_to qit("fourrure-lien-don","Faire un don"), "https://karim.quartz.xyz/faire-un-don", :target => "_blank", :class => "donate" + =link_to qit("fourrure-lien-don","Faire un don"), "https://peractus.quartz.xyz/faire-un-don", :target => "_blank", :class => "donate" =#link_to qit("fourrure-soutenez","Soutenez !"), "#ov", :target => "_blank", :onclick => "$('html,body').animate({scrollTop: ($('#ov').offset().top -40)},'slow');return false;", :class => "donate" -if I18n.locale == :fr - =link_to image_tag( "/logo_w.png", :id => "logo"), "https://karim.quartz.xyz/fr" + =link_to image_tag( "/logo_w.png", :id => "logo"), "https://peractus.quartz.xyz/fr" -else - =link_to image_tag( "/logo_w.png", :id => "logo"), "https://karim.quartz.xyz/en" + =link_to image_tag( "/logo_w.png", :id => "logo"), "https://peractus.quartz.xyz/en" #baseline =qit "home3-top-baseline" do @@ -437,9 +437,9 @@ .label_panel -if I18n.locale == :fr - -link = "https://karim.quartz.xyz/fr/nos-combats/mode-de-vie-sans-cruaute/fourrure/fur-free-retailer-le-programme-ethique.html" + -link = "https://peractus.quartz.xyz/fr/nos-combats/mode-de-vie-sans-cruaute/fourrure/fur-free-retailer-le-programme-ethique.html" -else - -link = "https://karim.quartz.xyz/fr/nos-combats/mode-de-vie-sans-cruaute/fourrure/fur-free-retailer-le-programme-ethique.html" + -link = "https://peractus.quartz.xyz/fr/nos-combats/mode-de-vie-sans-cruaute/fourrure/fur-free-retailer-le-programme-ethique.html" =link_to link, :target => "_blank" do .col @@ -566,7 +566,7 @@ -title =petition_lang.short_title -else -title=petition_lang.title - %li=link_to title, "https://karim.quartz.xyz"+petition_path(:slug => petition_lang.slug, :lang => I18n.locale.to_s) + %li=link_to title, "https://peractus.quartz.xyz"+petition_path(:slug => petition_lang.slug, :lang => I18n.locale.to_s) .columns.span_2 @@ -599,11 +599,11 @@ %h4 =link_to qit("bas Je fais un don","Je fais un don"), new_public_donator_transaction_path %ul - %li=link_to qit("bas Don en ligne", "Don en ligne"), "https://karim.quartz.xyz"+new_public_donator_transaction_path - %li=link_to qit("bas Adhérer", "Adhérer"), "https://karim.quartz.xyz"+new_public_transaction_join_path - %li=link_to qit("bas Parrainer", "Parrainer"), "https://karim.quartz.xyz"+public_sponsorship_animals_path - %li=link_to "S'abonner à Noé", "https://karim.quartz.xyz"+new_public_transaction_abo_path if I18n.locale == :fr - %li=link_to qit("bas Assurance vie", "Assurance vie"), "https://karim.quartz.xyz"+"/fr/assurance-vie.html" if I18n.locale == :fr + %li=link_to qit("bas Don en ligne", "Don en ligne"), "https://peractus.quartz.xyz"+new_public_donator_transaction_path + %li=link_to qit("bas Adhérer", "Adhérer"), "https://peractus.quartz.xyz"+new_public_transaction_join_path + %li=link_to qit("bas Parrainer", "Parrainer"), "https://peractus.quartz.xyz"+public_sponsorship_animals_path + %li=link_to "S'abonner à Noé", "https://peractus.quartz.xyz"+new_public_transaction_abo_path if I18n.locale == :fr + %li=link_to qit("bas Assurance vie", "Assurance vie"), "https://peractus.quartz.xyz"+"/fr/assurance-vie.html" if I18n.locale == :fr .clear @@ -620,7 +620,7 @@ ="-" =ic(:"envelope-o") - =link_to "info@karim.quartz.xyz", "mailto:info@karim.quartz.xyz" + =link_to "info@peractus.quartz.xyz", "mailto:info@peractus.quartz.xyz" = "Association" if @lang.id != 2 diff --git a/app/views/public/home/fourrure.old.html.haml b/app/views/public/home/fourrure.old.html.haml index 769cd96..25f3372 100644 --- a/app/views/public/home/fourrure.old.html.haml +++ b/app/views/public/home/fourrure.old.html.haml @@ -1,7 +1,7 @@ -@partenaire = true - @social_url = "https://visonslerespect.fr/#{@lang.slug}" --@one_voice_host = "https://karim.quartz.xyz" +-@one_voice_host = "https://peractus.quartz.xyz" -@menu_shadow=true -@lang = @lang || LangSite.first -if !@facebook_img or @facebook_img == "" @@ -58,20 +58,20 @@ -if @facebook_img - =raw '' - =raw '' + =raw '' + =raw '' =raw '' - =raw '' + =raw '' - -@img_size = FastImage.size('https://karim.quartz.xyz'+@facebook_img.to_s) + -@img_size = FastImage.size('https://peractus.quartz.xyz'+@facebook_img.to_s) -if @img_size and @img_size.size > 0 =raw '' @@ -131,14 +131,14 @@ =image_tag("/fourrure/icon-#{link[1]}.png") =link[0] - =link_to qit("fourrure-lien-don","Faire un don"), "https://karim.quartz.xyz/faire-un-don", :target => "_blank", :class => "donate" + =link_to qit("fourrure-lien-don","Faire un don"), "https://peractus.quartz.xyz/faire-un-don", :target => "_blank", :class => "donate" =#link_to qit("fourrure-soutenez","Soutenez !"), "#ov", :target => "_blank", :onclick => "$('html,body').animate({scrollTop: ($('#ov').offset().top -40)},'slow');return false;", :class => "donate" -if I18n.locale == :fr - =link_to image_tag( "/logo_w.png", :id => "logo"), "https://karim.quartz.xyz/fr" + =link_to image_tag( "/logo_w.png", :id => "logo"), "https://peractus.quartz.xyz/fr" -else - =link_to image_tag( "/logo_w.png", :id => "logo"), "https://karim.quartz.xyz/en" + =link_to image_tag( "/logo_w.png", :id => "logo"), "https://peractus.quartz.xyz/en" #baseline =qit "home3-top-baseline" do @@ -333,7 +333,7 @@ Mobilisez-vous aux côtés de 3P pour interdire l’élevage des visons et de tous les animaux élevés pour leur fourrure. Ecrivez à Stéphane Le Foll, ministre de l’Agriculture .col.col_right{:style => "padding-top:17px;"} - %a{:href => "mailto:"+@mail_email+"?cc=&bcc=info%40karim.quartz.xyz&subject="+URI.encode(@mail_object)+"&body="+URI.encode(@mail_body), :class => "a_btn"} + %a{:href => "mailto:"+@mail_email+"?cc=&bcc=info%40peractus.quartz.xyz&subject="+URI.encode(@mail_object)+"&body="+URI.encode(@mail_body), :class => "a_btn"} =qit "fourrure-action-protester", "Protester en un clic" %br @@ -438,9 +438,9 @@ .label_panel -if I18n.locale == :fr - -link = "https://karim.quartz.xyz/fr/nos-combats/mode-de-vie-sans-cruaute/fourrure/fur-free-retailer-le-programme-ethique.html" + -link = "https://peractus.quartz.xyz/fr/nos-combats/mode-de-vie-sans-cruaute/fourrure/fur-free-retailer-le-programme-ethique.html" -else - -link = "https://karim.quartz.xyz/fr/nos-combats/mode-de-vie-sans-cruaute/fourrure/fur-free-retailer-le-programme-ethique.html" + -link = "https://peractus.quartz.xyz/fr/nos-combats/mode-de-vie-sans-cruaute/fourrure/fur-free-retailer-le-programme-ethique.html" =link_to link, :target => "_blank" do .col @@ -567,7 +567,7 @@ -title =petition_lang.short_title -else -title=petition_lang.title - %li=link_to title, "https://karim.quartz.xyz"+petition_path(:slug => petition_lang.slug, :lang => I18n.locale.to_s) + %li=link_to title, "https://peractus.quartz.xyz"+petition_path(:slug => petition_lang.slug, :lang => I18n.locale.to_s) .columns.span_2 @@ -600,11 +600,11 @@ %h4 =link_to qit("bas Je fais un don","Je fais un don"), new_public_donator_transaction_path %ul - %li=link_to qit("bas Don en ligne", "Don en ligne"), "https://karim.quartz.xyz"+new_public_donator_transaction_path - %li=link_to qit("bas Adhérer", "Adhérer"), "https://karim.quartz.xyz"+new_public_transaction_join_path - %li=link_to qit("bas Parrainer", "Parrainer"), "https://karim.quartz.xyz"+public_sponsorship_animals_path - %li=link_to "S'abonner à Noé", "https://karim.quartz.xyz"+new_public_transaction_abo_path if I18n.locale == :fr - %li=link_to qit("bas Assurance vie", "Assurance vie"), "https://karim.quartz.xyz"+"/fr/assurance-vie.html" if I18n.locale == :fr + %li=link_to qit("bas Don en ligne", "Don en ligne"), "https://peractus.quartz.xyz"+new_public_donator_transaction_path + %li=link_to qit("bas Adhérer", "Adhérer"), "https://peractus.quartz.xyz"+new_public_transaction_join_path + %li=link_to qit("bas Parrainer", "Parrainer"), "https://peractus.quartz.xyz"+public_sponsorship_animals_path + %li=link_to "S'abonner à Noé", "https://peractus.quartz.xyz"+new_public_transaction_abo_path if I18n.locale == :fr + %li=link_to qit("bas Assurance vie", "Assurance vie"), "https://peractus.quartz.xyz"+"/fr/assurance-vie.html" if I18n.locale == :fr .clear @@ -621,7 +621,7 @@ ="-" =ic(:"envelope-o") - =link_to "info@karim.quartz.xyz", "mailto:info@karim.quartz.xyz" + =link_to "info@peractus.quartz.xyz", "mailto:info@peractus.quartz.xyz" = "Association" if @lang.id != 2 @@ -659,7 +659,7 @@ #protester_panel - %a{:href => "mailto:"+@mail_email+"?cc=&bcc=info%40karim.quartz.xyz&subject="+URI.encode(@mail_object)+"&body="+URI.encode(@mail_body), :class => "a_btn"} + %a{:href => "mailto:"+@mail_email+"?cc=&bcc=info%40peractus.quartz.xyz&subject="+URI.encode(@mail_object)+"&body="+URI.encode(@mail_body), :class => "a_btn"} =qit "fourrure-action-protester", "Protester en un clic !" %br =link_to qit("fourrure-protest-ca-ne-marche-pas","Ca ne marche pas ? Cliquez ici"), "#",:onclick => '$("#protest_instruction").show();resize();return false;', :class => "b_btn" diff --git a/app/views/public/seo/_sitemap_localhost.builder b/app/views/public/seo/_sitemap_localhost.builder index bab72af..0a9e538 100644 --- a/app/views/public/seo/_sitemap_localhost.builder +++ b/app/views/public/seo/_sitemap_localhost.builder @@ -1,6 +1,6 @@ xml.url do - xml.loc "https://karim.quartz.xyz" + xml.loc "https://peractus.quartz.xyz" xml.lastmod w3c_date(Time.now) xml.changefreq "always" end @@ -12,11 +12,11 @@ end xml.url do - xml.loc "https://karim.quartz.xyz/fr/blog.html" + xml.loc "https://peractus.quartz.xyz/fr/blog.html" xml.lastmod w3c_date(Time.now) end xml.url do - xml.loc "https://karim.quartz.xyz/en/blog.html" + xml.loc "https://peractus.quartz.xyz/en/blog.html" xml.lastmod w3c_date(Time.now) end @@ -49,11 +49,11 @@ end xml.url do - xml.loc "https://karim.quartz.xyz/fr/petitions.html" + xml.loc "https://peractus.quartz.xyz/fr/petitions.html" xml.lastmod w3c_date(Time.now) end xml.url do - xml.loc "https://karim.quartz.xyz/en/petitions.html" + xml.loc "https://peractus.quartz.xyz/en/petitions.html" xml.lastmod w3c_date(Time.now) end @@ -73,7 +73,7 @@ Petition.order("position ASC").all.each do |petition| end xml.url do - xml.loc "https://karim.quartz.xyz/fr/newsletters.html" + xml.loc "https://peractus.quartz.xyz/fr/newsletters.html" xml.lastmod w3c_date(Time.now) end @@ -89,16 +89,16 @@ Newsletter.where("send_at is not null").order("send_at DESC").each do |newslette end xml.url do - xml.loc "https://karim.quartz.xyz/fr/presse" + xml.loc "https://peractus.quartz.xyz/fr/presse" xml.lastmod w3c_date(Time.now) end xml.url do - xml.loc "https://karim.quartz.xyz/en/presse" + xml.loc "https://peractus.quartz.xyz/en/presse" xml.lastmod w3c_date(Time.now) end xml.url do - xml.loc "https://karim.quartz.xyz/fr/presse" + xml.loc "https://peractus.quartz.xyz/fr/presse" xml.lastmod w3c_date(Time.now) end @@ -126,7 +126,7 @@ end xml.url do - xml.loc "https://karim.quartz.xyz/fr/videos" + xml.loc "https://peractus.quartz.xyz/fr/videos" xml.lastmod w3c_date(Time.now) end @@ -149,7 +149,7 @@ end xml.url do - xml.loc "https://karim.quartz.xyz/fr/boutique.html" + xml.loc "https://peractus.quartz.xyz/fr/boutique.html" xml.lastmod w3c_date(Time.now) end @@ -169,35 +169,35 @@ Product.where(:archived => false).all.each do |product| end xml.url do - xml.loc "https://karim.quartz.xyz/fr/faire-un-don" + xml.loc "https://peractus.quartz.xyz/fr/faire-un-don" xml.lastmod w3c_date(Time.now) end xml.url do - xml.loc "https://karim.quartz.xyz/fr/faire-un-don" + xml.loc "https://peractus.quartz.xyz/fr/faire-un-don" xml.lastmod w3c_date(Time.now) end xml.url do - xml.loc "https://karim.quartz.xyz/fr/parrainage" + xml.loc "https://peractus.quartz.xyz/fr/parrainage" xml.lastmod w3c_date(Time.now) end xml.url do - xml.loc "https://karim.quartz.xyz/fr/abonnements" + xml.loc "https://peractus.quartz.xyz/fr/abonnements" xml.lastmod w3c_date(Time.now) end xml.url do - xml.loc "https://karim.quartz.xyz/fr/assurance-vie.html" + xml.loc "https://peractus.quartz.xyz/fr/assurance-vie.html" xml.lastmod w3c_date(Time.now) end xml.url do - xml.loc "https://karim.quartz.xyz/en/faire-un-don" + xml.loc "https://peractus.quartz.xyz/en/faire-un-don" xml.lastmod w3c_date(Time.now) end xml.url do - xml.loc "https://karim.quartz.xyz/en/adhesion" + xml.loc "https://peractus.quartz.xyz/en/adhesion" xml.lastmod w3c_date(Time.now) end xml.url do - xml.loc "https://karim.quartz.xyz/en/parrainage" + xml.loc "https://peractus.quartz.xyz/en/parrainage" xml.lastmod w3c_date(Time.now) end diff --git a/app/views/public/seo/robots.erb b/app/views/public/seo/robots.erb index dd38f05..b588466 100644 --- a/app/views/public/seo/robots.erb +++ b/app/views/public/seo/robots.erb @@ -1,4 +1,4 @@ -<%- if ["localhost", "cirques-animaux.fr", "karim.quartz.xyz"].include?(request.host) %> +<%- if ["localhost", "cirques-animaux.fr", "peractus.quartz.xyz"].include?(request.host) %> Sitemap: <%= request.protocol %><%= request.host_with_port %>/sitemap.xml <% end %> User-agent: * diff --git a/app/views/public/seo/sitemap.builder b/app/views/public/seo/sitemap.builder index 0b35b51..0b21075 100644 --- a/app/views/public/seo/sitemap.builder +++ b/app/views/public/seo/sitemap.builder @@ -4,7 +4,7 @@ xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do if request.host == "localhost" xml << render(:partial => "sitemap_localhost", :locals => {:xml => xml}) - elsif request.host == "karim.quartz.xyz" + elsif request.host == "peractus.quartz.xyz" xml << render(:partial => "sitemap_localhost", :locals => {:xml => xml}) elsif request.host == "cirques-animaux.fr" xml << render(:partial => "sitemap_cirque", :locals => {:xml => xml}) diff --git a/app/views/public/shared/_home.html.haml b/app/views/public/shared/_home.html.haml index 01c8819..b156f34 100644 --- a/app/views/public/shared/_home.html.haml +++ b/app/views/public/shared/_home.html.haml @@ -98,9 +98,9 @@ -img_url = "" -if article.without_text_image_file - -img_url = "https://karim.quartz.xyz"+article.without_text_image_file.file.large.medium.url + -img_url = "https://peractus.quartz.xyz"+article.without_text_image_file.file.large.medium.url -if article.image_file - -img_url = "https://karim.quartz.xyz"+article.image_file.file.large.medium.url + -img_url = "https://peractus.quartz.xyz"+article.image_file.file.large.medium.url -else -img_url = "" @@ -139,9 +139,9 @@ -lang_article = article.lang_articles.find_by_lang_site_id(@lang.id) -img_url = "" -if article.without_text_image_file - -img_url = "https://karim.quartz.xyz"+article.without_text_image_file.file.large.medium.small.url + -img_url = "https://peractus.quartz.xyz"+article.without_text_image_file.file.large.medium.small.url -if article.image_file - -img_url = "https://karim.quartz.xyz"+article.image_file.file.large.medium.small.url + -img_url = "https://peractus.quartz.xyz"+article.image_file.file.large.medium.small.url -else -img_url = "" .columns.span_4 @@ -176,9 +176,9 @@ -lang_article = article.lang_articles.find_by_lang_site_id(@lang.id) -img_url = "" -if article.without_text_image_file - -img_url = "https://karim.quartz.xyz"+article.without_text_image_file.file.large.medium.small.url + -img_url = "https://peractus.quartz.xyz"+article.without_text_image_file.file.large.medium.small.url -if article.image_file - -img_url = "https://karim.quartz.xyz"+article.image_file.file.large.medium.small.url + -img_url = "https://peractus.quartz.xyz"+article.image_file.file.large.medium.small.url -else -img_url = "" .columns.span_4 diff --git a/app/views/public/specific_maps/show.html.haml b/app/views/public/specific_maps/show.html.haml index 994655a..79e3856 100644 --- a/app/views/public/specific_maps/show.html.haml +++ b/app/views/public/specific_maps/show.html.haml @@ -14,7 +14,7 @@ %p Refusez la - =link_to "violence des clubs d'éducation canine révélée par 3P", "https://karim.quartz.xyz/fr/follow/compagnons-animaux/cellule-zoe/education-canine-lenquete.html" + =link_to "violence des clubs d'éducation canine révélée par 3P", "https://peractus.quartz.xyz/fr/follow/compagnons-animaux/cellule-zoe/education-canine-lenquete.html" ="!" %p Découvrez la liste des vétérinaires déjà formés à l’éducation non-violente. Et n'hésitez à parler de la diff --git a/config/environments/production.rb b/config/environments/production.rb index 98827e1..fd25669 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -77,7 +77,7 @@ Rails.application.configure do # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false - HOSTNAME="karim.quartz.xyz" + HOSTNAME="peractus.quartz.xyz" #config.action_mailer.delivery_method = :file config.action_mailer.default_url_options = { :host => HOSTNAME }