titres

app/assets/stylesheets/public.scss

@@ -349,7 +349,7 @@ h4{
   
 }
 line-height:1.7em;
-padding: 25px 10px;
+padding: 18px 10px;
 padding-bottom:20px;
 margin-right:5px;
 border-bottom:5px solid transparent;
@@ -424,7 +424,17 @@ h1{
   text-transform:uppercase;
 }
 
+.cristal-protect_menu h4{
+  text-transform:none !important;
   
+}
+.cristal-protect{
+  h1{
+    text-transform:none !important;
+    
+  }
+  
+}
 .bottom_image{
   position:absolute;
   bottom:-3px;

app/views/layouts/public.html.haml

@@ -66,7 +66,14 @@
                 %h3 Full Covering
                 ="/"
                 Agencement, Décoration
+            %li
+              =image_tag "/slide4.jpg"
         
+              .desc{:style => "text-transform:none;"}
+                %h3{:style => "text-transform:none;"}
+                  CristalProtect<sup>®</sup>
+                ="/"
+                Ligne d'impression & vernis
             %li
               =image_tag "/slide2.jpg"
         
@@ -88,7 +95,7 @@
           -MenuItem.where(:parent_id => nil, :enabled => true, :visible => true).order(:position).each do |menu_item|
             -description = ""
             -description = menu_item.menu_content.description if menu_item.menu_content and menu_item.menu_content_type == "Page"
-            =link_to raw("<h4>#{menu_item.name}</h4>"),menu_item_path(:url => menu_item.url), :class => ("active" if @menu_item and (@menu_item == menu_item or @menu_item.ancestors.include?(menu_item)))
+            =link_to sanitize("<h4>#{menu_item.name}</h4>"),menu_item_path(:url => menu_item.url), :class => menu_item.slug.to_s+"_menu"+(" active" if @menu_item and (@menu_item == menu_item or @menu_item.ancestors.include?(menu_item))).to_s
     #corps{:class => (@menu_item.slug if @menu_item)}
       .main.principal{:style => "position:relative;"}
         =yield

app/views/portlet/title_contents/_form.html.haml

@@ -1,6 +1,6 @@
-=semantic_form_for( [:portlet, @title_content], :remote => true) do |f|
+=semantic_form_for( [:portlet, @title_content], :remote => true, :html => {:"data-portlet-id" => (@title_content.portlet.id if @title_content.portlet)}) do |f|
   
-  =f.text_field :content, :style => "width:98%;", :class => "inputText" if !@title_content.id
+  =f.text_field :content, :style => "width:98%;", :class => "inputText", :style => "display:none;"
 
   Importance :
   = f.select :level, TitleContent::LEVELS
@@ -9,3 +9,26 @@
     = f.select :style, TitleContent::STYLES
   %br
 
+-if @title_content.id
+  
+  :javascript
+    
+    $("#element_form form").submit(function (e){
+    
+      $("#element_form #title_content_content").val($('#portlet_'+$("#element_form form").data("portlet-id")+' .title_content_inline').redactor('code.get'));
+      $("#toolbar-text").html("");
+    
+    });
+    
+    $('#portlet_'+$("#element_form form").data("portlet-id")+' .title_content_inline').redactor({
+      focus: true,
+      toolbarExternal: '#toolbar-text',
+      buttonSource: true,
+      plugins : [ 'fontcolor', 'scriptbuttons'],
+      buttons: [ 'bold', 'italic'],
+      allowedTags: ['sup', "strong", "em", "sub", "span", "br"],
+      linebreaks: true
+    
+    
+  
+    });

app/views/portlets/render_public/_titlecontent.html.haml

@@ -1,8 +1,8 @@
 -level = (input.level || "1").to_s
 
 -if admin 
-  =raw '<h'+level+" contenteditable='true' class='inline-contenteditable title_content_inline' data-title-id='"+input.id.to_s+"'>"
+  =raw '<h'+level+" class='title_content_inline' data-title-id='"+sanitize(input.id.to_s)+"'>"
 -else
   =raw '<h'+level+" >"
-=input.content
+=sanitize input.content
 =raw '</h'+level+"  >"