diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 6a265aa..1b2007c 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -56,11 +56,12 @@ Sauf mention contraire, textes & photos créés par =link_to "Nicolas Bally", "mailto:info@nicolasbally.com" sous - =link_to "license Creative Commons (BY-NC-SA)", "http://creativecommons.org/licenses/by-nc-nd/3.0/fr/", :target => "_blank" - =link_to image_tag("front/cc-licenses-terms.png"), "http://creativecommons.org/licenses/by-nc-nd/3.0/fr/", :target => "_blank" + =link_to "license Creative Commons (BY-NC-ND)", "http://creativecommons.org/licenses/by-nc-nd/3.0/fr/", :target => "_blank" + =#link_to image_tag("front/cc-licenses-terms.png"), "http://creativecommons.org/licenses/by-nc-nd/3.0/fr/", :target => "_blank" =" - " Merci de m' =link_to "envoyer un mail", "mailto:info@nicolasbally.com" - lors de toute utilisation de ce contenu. + lors de toute utilisation de ce contenu - + =link_to "Mentions légales" diff --git a/app/views/portlets/render_public/_imagecontent.html.haml b/app/views/portlets/render_public/_imagecontent.html.haml index 6c4d852..876fba8 100644 --- a/app/views/portlets/render_public/_imagecontent.html.haml +++ b/app/views/portlets/render_public/_imagecontent.html.haml @@ -12,6 +12,11 @@ -elsif input.style== "4" -url =input.image_file.file.large.medium.small.thumb.url + + -elsif input.style== "5" + -url =input.image_file.file.large.url + + -else -url ="" diff --git a/config/environments/production.rb b/config/environments/production.rb index ec39314..02e377f 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -58,5 +58,5 @@ Crossey2::Application.configure do # Send deprecation notices to registered listeners config.active_support.deprecation = :notify - HOSTNAME="laphotofaitsoncinema.net" + HOSTNAME="blog.nicolasbally.com" end