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

url news

Browse Source
This commit is contained in:
Nicolas Bally 2017-03-20 23:42:23 +01:00
parent d15f5da2a5
commit aafed2d898
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/portlets/render_public/_imagecontent.html.haml
View File

@ -23,7 +23,7 @@
-else -else
-url ="" -url =""
-url = "http://"+request.host_with_port+url -url = "http://"+HOSTNAME+url
-style = "" -style = ""
-style = "text-align:center;" if input.alignement == "center" -style = "text-align:center;" if input.alignement == "center"
@ -60,12 +60,12 @@
-elsif input.expandable -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 -else
=image_tag(url, :alt => input.alt.to_s, :style => styleimg ) =image_tag(url, :alt => input.alt.to_s, :style => styleimg )
=raw '</div>' if style =raw '</div>' 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 -@page_images_credits << input.image_file.photograph

2
config/environments/development.rb
View File

@ -39,7 +39,7 @@ Rails.application.configure do
# Raises error for missing translations # Raises error for missing translations
# config.action_view.raise_on_missing_translations = true # 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.delivery_method = :smtp
config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 } config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 }

2
config/environments/production.rb
View File

@ -78,7 +78,7 @@ Rails.application.configure do
config.active_record.dump_schema_after_migration = false config.active_record.dump_schema_after_migration = false
HOSTNAME="ballalama.com" HOSTNAME="ballalama.com"
UAL_API_HOST = "une-autre-laverie.com"
#config.action_mailer.delivery_method = :file #config.action_mailer.delivery_method = :file
config.action_mailer.default_url_options = { :host => HOSTNAME } config.action_mailer.default_url_options = { :host => HOSTNAME }