diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index 66279a4..abda259 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -73,14 +73,20 @@ img{ } #logo{ + position:relative; + z-index:2; height:70px; } #menu_top{ + position:relative; + z-index:2; float:right; text-align:right; margin-top:20px; +color:white; + ul{ list-style:none; diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 6288272..48a6979 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -114,9 +114,21 @@ =flash[:alert] #header.with_ratio{:style => "position:relative;background-image:url('#{@img_url}');", :data => {:ratio => 0.30}} - + %div{:style => "position:absolute;top:0;right:0;left:0;bottom:0;"} + %h1.vertical_center=@title + + #menu_top %ul + %li + =ic :tel + +33 (0)4 65 84 48 38 + ="-" + =link_to "mailto:contact@pollen-concepts.fr" do + =ic :mail + contact@pollen-concepts.fr + + -MenuItem.where(:parent_id => nil, :menu_id => 1).order(:position).each do |menu_item| -if menu_item_link(menu_item) and menu_item_link(menu_item) != "" %li @@ -127,8 +139,7 @@ .clear - %div{:style => "position:absolute;top:0;right:0;left:0;bottom:0;"} - %h1.vertical_center=@title + #main=yield diff --git a/app/views/public/menu_items/show.html.haml b/app/views/public/menu_items/show.html.haml index 787f3ee..e64d4a3 100644 --- a/app/views/public/menu_items/show.html.haml +++ b/app/views/public/menu_items/show.html.haml @@ -15,10 +15,7 @@ -@sidebar = false --if @menu_item_lang.permalink == "index" - .render_block.home_render_block - =render :partial => "public/blocks/block", :locals => {:block => @menu_item.menu_content.blocks.find_by_lang_site_id(@lang.id)} --else +-if true -if @menu_item.title_image -if @menu_item.menu_item_langs.find_by_lang_site_id(@lang.id).image_file -@img_url = @menu_item.menu_item_langs.find_by_lang_site_id(@lang.id).image_file.file.large.url diff --git a/config/routes.rb b/config/routes.rb index ed1b475..aa77bc7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -911,7 +911,7 @@ Rails.application.routes.draw do get ':slug.html', to: 'public/m_odrs#show', :as => :public_m_odr - root "public/menu_items#index" + root redirect('/fr/index.html')