diff --git a/app/views/portlet/image_contents/_form.html.haml b/app/views/portlet/image_contents/_form.html.haml index b092150..ead222b 100644 --- a/app/views/portlet/image_contents/_form.html.haml +++ b/app/views/portlet/image_contents/_form.html.haml @@ -8,7 +8,7 @@ = form.input :alt, :label => "Texte alternatif :" =# form.input :with_legend,:as => :boolean , :label => "Afficher la légende ?" - = form.input :credits, :label => "Crédit photo" + = form.input :alignement, :label => "Alignement :", :as => :select, :collection => ImageContent::ALIGNS, :include_blank => false = form.input :style, :label => "Style :", :as => :select, :collection => ImageContent::STYLES, :include_blank => false = form.input :width, :label => "Largeur :" @@ -27,7 +27,7 @@ = form.input :cible, :label => "Cible :" , :as => :qi_cible_select = form.input :popup, :label => "Ouvrir dans une popup ?", :as => :boolean - + = form.input :credits, :label => "Crédit photo", :as => :text = form.input :margin_top, :label => "Marge haut :" = form.input :margin_bottom, :label => "Marge bas :" = form.input :margin_left, :label => "Marge gauche :" diff --git a/app/views/portlets/render_public/_imagecontent.html.haml b/app/views/portlets/render_public/_imagecontent.html.haml index 1a66495..d8b4318 100644 --- a/app/views/portlets/render_public/_imagecontent.html.haml +++ b/app/views/portlets/render_public/_imagecontent.html.haml @@ -64,5 +64,5 @@ =image_tag(url, :alt => input.alt.to_s, :style => styleimg ) -if input.credits? .credits - =input.credits + =simple_format(input.credits, {}, wrapper_tag: "div") =raw '' if style \ No newline at end of file