diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index c7554b9..c2c58a2 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -394,6 +394,9 @@ background:rgba(176,201,49,1); .rose_background{ background:rgba(230,0,125,1); } +.content_center{ +text-align:center; +} .beton{ diff --git a/app/models/block_content.rb b/app/models/block_content.rb index 8190508..65fe4e1 100644 --- a/app/models/block_content.rb +++ b/app/models/block_content.rb @@ -5,7 +5,7 @@ class BlockContent < ActiveRecord::Base validates :nbr_columns, :presence => true - STYLES = [["normal",1],["fond gris foncé",2],["fond gris clair",3],["fond bleu",4],["fond jaune",5],["fond vert",6],["fond béton",7]] + STYLES = [["normal",1],["fond gris foncé",2],["fond gris clair",3],["fond bleu",4],["fond jaune",5],["fond vert",6],["fond béton",7],["Contenu centré",8]] diff --git a/app/models/image_content.rb b/app/models/image_content.rb index c746f19..e38df16 100644 --- a/app/models/image_content.rb +++ b/app/models/image_content.rb @@ -3,8 +3,8 @@ class ImageContent < ActiveRecord::Base belongs_to :image_file has_one :portlet, :as => :content, :dependent => :destroy - STYLES = [["Grande","5"],["Taille moyenne","1"], ["Petite taille","2"], ["Petit carré","3"], ["Miniature","4"]] - ALIGNS = [["centré","center"], ["gauche","left"],["droite","right"]] + STYLES = [["Grande","5"],["Taille moyenne","1"], ["Petite taille","2"], ["Petit carré","3"], ["Miniature","4"],["Orginale","6"]] + ALIGNS = [["centré","center"], ["gauche","left"],["droite","right"],["Aucun","none"]] belongs_to :cible, :polymorphic => true accepts_nested_attributes_for :cible diff --git a/app/views/portlets/render_public/_blockcontent.html.haml b/app/views/portlets/render_public/_blockcontent.html.haml index 64e3caa..1c0509d 100644 --- a/app/views/portlets/render_public/_blockcontent.html.haml +++ b/app/views/portlets/render_public/_blockcontent.html.haml @@ -15,6 +15,7 @@ - css_class = "yellow_background" if input.style == 5 - css_class = "green_background" if input.style == 6 - css_class = "beton" if input.style == 7 + - css_class = "content_center" if input.style == 8 =raw "