subfooter

app/views/layouts/public.html.haml

@@ -221,19 +221,23 @@
     #sub_footer
 
       #logos
+<<<<<<< HEAD
         =link_to "https://groupe-payre.fr", :target => "_blank" do
           =image_tag "/logo.png"
 
         =link_to "http://payreagri.quartz.xyz", :target => "_blank" do
+=======
+        =link_to "https://payreagriculture.fr/", :target => "_blank" do
+>>>>>>> a40f1bdf02595a6e4157ee5e35d4195487792f3c
           =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://payrejardinerie.fr/", :target => "_blank" do
+        =link_to "https://payrejardinerie.fr/", :target => "_blank" do
           =image_tag "/payre-jardinerie.png"
 
 

app/views/portlets/render_public/_imagecontent.html.haml

@@ -25,7 +25,7 @@
 -else
   -url =""
 
--url = "https#{("" if Rails.env.production?)}://"+HOSTNAME+url
+-url = "http#{("s" if Rails.env.production?)}://"+HOSTNAME+url
 -style = ""
 -style = "text-align:center;width:100%;" if input.alignement == "center"
 

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="payrepmc.quartz.xyz"
+  HOSTNAME="payremaintenance.fr"
   
   #config.action_mailer.delivery_method = :file
   config.action_mailer.default_url_options = { :host => HOSTNAME }
@@ -91,7 +91,7 @@ Rails.application.configure do
   
   Rails.application.routes.default_url_options = config.action_mailer.default_url_options = { :host => HOSTNAME, :protocol => 'http' }
   
-  ANGORA_HOSTNAME = "stop-angora.fr"
+ 
   
   
 end