diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index 8b1435b..28693db 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -1,7 +1,7 @@ @import "superslides"; - +@import "fontawesome/font-awesome"; .slider{ overflow:hidden; @@ -47,7 +47,7 @@ width:100%; } -#corps.index{ +#corps.dds{ color:#F2F2F2; background:rgba(40,40,40,1); } @@ -296,6 +296,7 @@ max-width:inherit; position:relative; z-index:3; box-shadow:0 0 15px rgba(0,0,0,0.8); + background-image:url("/fond-beton-5.jpg"); .contact{ position:absolute; top:60px; @@ -311,9 +312,10 @@ max-width:inherit; } .menu_background{ - background:#202020; - min-height:84px; + background:rgba(20,20,20,0.7); + padding-top:1px; + text-shadow:0 0 3px black; } #menu{ @@ -354,7 +356,7 @@ border-bottom:5px solid transparent; } } .top_background{ - background:#333333; + min-height:150px; ; @@ -413,12 +415,13 @@ text-transform:uppercase; .bottom{ position:relative; box-shadow:0 0 15px rgba(0,0,0,0.8); + background-image:url("/fond-beton-5.jpg"); color:#E6E6E6; margin-top:100px; } .infos{ position:relative; - background:#333333; + border-bottom:3px solid #f39200; .main{ position:static; diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 496f63a..c63ff7b 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -47,10 +47,11 @@ .menu_background .main#menu + =link_to raw("

"+ic(:home)+"

"), "/" -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("

#{menu_item.name}

#{description}"),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 raw("

#{menu_item.name}

"),menu_item_path(:url => menu_item.url), :class => ("active" if @menu_item and (@menu_item == menu_item or @menu_item.ancestors.include?(menu_item))) #corps{:class => (@menu_item.slug if @menu_item)} .main=yield @@ -77,7 +78,7 @@ =image_tag "/fax.png" 04 76 01 95 31 .clear - =image_tag "/bottom.png", :class => "bottom_image" + =link_to image_tag("/bottom.png", :class => "bottom_image"), "/cristal-protect.html" .legals Cris Graphic - SARL au capital de 7.622,00 € - RCS : Grenoble B 451 888 101 - APE : 1812Z - diff --git a/app/views/portlet/text_contents/_form.html.haml b/app/views/portlet/text_contents/_form.html.haml index 6d7f453..6186808 100644 --- a/app/views/portlet/text_contents/_form.html.haml +++ b/app/views/portlet/text_contents/_form.html.haml @@ -19,7 +19,7 @@ :javascript $("#element_form form").submit(function (e){ - $("textarea").val($('#portlet_'+$("#element_form form").data("portlet-id")+' .content').redactor('code.get')); + $("#element_form textarea").val($('#portlet_'+$("#element_form form").data("portlet-id")+' .content').redactor('code.get')); $("#toolbar-text").html(""); }); @@ -59,7 +59,7 @@ $("#element_form form").submit(function (e){ - $("textarea").val(content_element.html()); + $("#element_form textarea").val(content_element.redactor('code.get')); $("#toolbar-text").html(""); }); diff --git a/app/views/portlets/render_public/_gallerycontent.html.haml b/app/views/portlets/render_public/_gallerycontent.html.haml index 2b350ce..4e4d8b6 100644 --- a/app/views/portlets/render_public/_gallerycontent.html.haml +++ b/app/views/portlets/render_public/_gallerycontent.html.haml @@ -113,7 +113,7 @@ %ul.slides-container -input.gallery_images.each do |gallery_images| %li - =image_tag gallery_images.image_file.file.large.medium.url + =image_tag gallery_images.image_file.file.large.url .desc -if gallery_images.title? diff --git a/public/bottom - copie.png b/public/bottom - copie.png new file mode 100644 index 0000000..253e7db Binary files /dev/null and b/public/bottom - copie.png differ diff --git a/public/bottom.png b/public/bottom.png index 253e7db..5f1fa59 100644 Binary files a/public/bottom.png and b/public/bottom.png differ diff --git a/public/fond-beton-5.jpg b/public/fond-beton-5.jpg new file mode 100644 index 0000000..77c0fe9 Binary files /dev/null and b/public/fond-beton-5.jpg differ