nicolas/payre3p_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of quartz.snlab.fr:nicolas/payre3p_app

Browse Source
This commit is contained in:
Nicolas Bally 2019-01-26 18:48:30 +01:00
commit 746f1c4456
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mailers/question_mailer.rb
View File

@ -1,5 +1,5 @@
class QuestionMailer < ActionMailer::Base
default from: "contact@payre.co"
default from: "contact@ets-payre.fr"
# Subject can be set in your I18n file at config/locales/en.yml
# with the following lookup:

14
app/views/layouts/public.html.haml
View File

@ -218,16 +218,16 @@
#sub_footer
#logos
=link_to "http://payreagri.quartz.xyz", :target => "_blank" do
=link_to "https://payreagriculture.fr", :target => "_blank" do
=image_tag "/payre-agriculture.png"
=link_to "http://payre3p.quartz.xyz", :target => "_blank" do
=link_to "https://payreenergies.fr", :target => "_blank" do
=image_tag "/payre-energies.png"
=link_to "http://payrepmc.quartz.xyz", :target => "_blank" do
=link_to "https://payremaintenance.fr", :target => "_blank" do
=image_tag "/payre-maintenance.png"
=link_to "http://payrejardi.quartz.xyz", :target => "_blank" do
=link_to "http://payrejardinerie.fr/", :target => "_blank" do
=image_tag "/payre-jardinerie.png"
#place
@ -244,11 +244,11 @@
04 76 35 31 69
%br
=ic :fax
04 76 35 37 36
04 76 35 67 36
%br
=link_to "mailto:contact@payre.co" do
=link_to "mailto:contact@ets-payre.fr" do
=ic :"envelope-o"
contact@payre.co
contact@ets-payre.fr
.clear

2
config/nginx.conf
View File

@ -33,7 +33,7 @@ server {
server {
listen [::]:80;
server_name payre3p.quartz.xyz payreenergies.fr *.payreenergies.fr groupepayre.fr *.groupepayre.fr payreenergie.fr *.payreenergie.fr;
server_name payre3p.quartz.xyz payreenergies.fr *.payreenergies.fr payreenergie.fr *.payreenergie.fr;
return 301 https://payreenergies.fr$request_uri;