From aafed2d898c61f1ee955833aae4e5bc14fb4d1ff Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Mon, 20 Mar 2017 23:42:23 +0100 Subject: [PATCH] url news --- app/views/portlets/render_public/_imagecontent.html.haml | 6 +++--- config/environments/development.rb | 2 +- config/environments/production.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/portlets/render_public/_imagecontent.html.haml b/app/views/portlets/render_public/_imagecontent.html.haml index c047cf5..81bb40a 100644 --- a/app/views/portlets/render_public/_imagecontent.html.haml +++ b/app/views/portlets/render_public/_imagecontent.html.haml @@ -23,7 +23,7 @@ -else -url ="" --url = "http://"+request.host_with_port+url +-url = "http://"+HOSTNAME+url -style = "" -style = "text-align:center;" if input.alignement == "center" @@ -60,12 +60,12 @@ -elsif input.expandable - =link_to image_tag(url, :alt => input.alt.to_s, :style => styleimg ), (input.image_file ? input.image_file.file.large.url : ""), :title => input.alt.to_s, :class => "expandable_image" + =link_to image_tag(url, :alt => input.alt.to_s, :style => styleimg ), "http://"+HOSTNAME+(input.image_file ? input.image_file.file.large.path : ""), :title => input.alt.to_s, :class => "expandable_image" -else =image_tag(url, :alt => input.alt.to_s, :style => styleimg ) =raw '' if style --if input.image_file and input.image_file.photograph +-if input.image_file and input.image_file.photograph and @page_images_credits -@page_images_credits << input.image_file.photograph \ No newline at end of file diff --git a/config/environments/development.rb b/config/environments/development.rb index 943f4b3..c1b63f2 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -39,7 +39,7 @@ Rails.application.configure do # Raises error for missing translations # config.action_view.raise_on_missing_translations = true - HOSTNAME="78.245.74.12" + HOSTNAME="localhost:3000" config.action_mailer.delivery_method = :smtp config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 } diff --git a/config/environments/production.rb b/config/environments/production.rb index aa078bf..05f69b8 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -78,7 +78,7 @@ Rails.application.configure do config.active_record.dump_schema_after_migration = false HOSTNAME="ballalama.com" - UAL_API_HOST = "une-autre-laverie.com" + #config.action_mailer.delivery_method = :file config.action_mailer.default_url_options = { :host => HOSTNAME }