diff --git a/app/assets/javascripts/popover.coffee b/app/assets/javascripts/popover.coffee index 067e6ed..e69de29 100644 --- a/app/assets/javascripts/popover.coffee +++ b/app/assets/javascripts/popover.coffee @@ -1,265 +0,0 @@ -bottom = 0 -prev_link = "" - -$("document").ready -> - - position_img_now = -> - - - - # alert $("#large .large-img").outerHeight(false) - - imgheight = $("#large .large-img").outerHeight(false) + $("#large h3").outerHeight(false) - - - margintop = (( $(window).height() - imgheight) / 2 ) - - $("#large .large-img").css - "margin-top" :(margintop+"px") - #"width" : "100px" - - - - position_img = -> - $("#large .large-img").one "load", -> - - position_img_now() - - - - $(".video_expand").click -> - maxwidth = 1000 - maxheight = 900 - - - - - prev_link = $(this) - $("body").append "
" - title = false - - - $("#large").append "
" - $("#large").append "" - $(".img_container.first").append '
' - - $(".img_container.first").append "
"+$(this).data("twitter-link")+$(this).data("facebook-link")+"
" - $(".img_container.first").append "

"+$(this).data("video-title")+"

" - - - - $("#large").fadeIn(500) - position_img(); - if $(window).height() > (maxheight+100) - $("#large .large-img").css - "max-height" : maxheight - else - $("#large .large-img").css - "max-height" : "85%" - - if $(window).width() > (maxwidth+100) - $("#large .large-img").css - "max-width" : maxwidth - else - $("#large .large-img").css - "max-width" : "85%" - popover_resize(); - - $("#large .img_container.first").css - "padding-top": (($(window).height()- $("#large .img_container.first iframe").height()-50)/ 2)+"px" - #position_img(); - - - false - - - $(".expandable_image").click -> - maxwidth = 1000 - maxheight = 900 - - - - - prev_link = $(this) - $("body").append "
" - title = false - - - - $("#large").append "
" - $("#large").append "" - $(".img_container.first").append "" - - if $(this).attr "title" - title = $(this).attr "title" - $(".img_container.first").append "

"+title+"

" - - $("#large .large-img").one "load", -> - $("#large").fadeIn(500) - position_img(); - if $(window).height() > (maxheight+100) - $("#large .large-img").css - "max-height" : maxheight - else - $("#large .large-img").css - "max-height" : "85%" - - if $(window).width() > (maxwidth+100) - $("#large .large-img").css - "max-width" : maxwidth - else - $("#large .large-img").css - "max-width" : "85%" - - position_img(); - - - false - - - $(".rea-gal a").click -> - maxwidth = 1000 - maxheight = 900 - - - prev_link = $(this) - $("body").append "
" - title = false - - - $("#large").append "" - $("#large").append "" - $("#large").append "" - - $("#large").append "
" - $(".img_container.first").append "" - - if $(this).attr "title" - title = $(this).attr "title" - $(".img_container.first").append "

"+title+"

" - - $("#large .large-img").one "load", -> - $("#large").fadeIn(500) - position_img(); - if $(window).height() > (maxheight+100) - $("#large .large-img").css - "max-height" : maxheight - else - $("#large .large-img").css - "max-height" : "85%" - - if $(window).width() > (maxwidth+100) - $("#large .large-img").css - "max-width" : maxwidth - else - $("#large .large-img").css - "max-width" : "85%" - - position_img(); - - - false - - - - $("body").on "click", "#large", -> - $(this).fadeOut 300, -> - $(this).remove() - - - $("body").on "click" ,"#large .prev",-> - - if prev_link.prev("a").length > 0 - link = prev_link.closest("a").prev("a") - - - - else - link = prev_link.closest("div").children("a:last") - - - #titre = photo.find("h3") - $(".img_container.first").fadeOut 300, -> - $("#large h3").remove() - if link.attr "title" - title = link.attr "title" - $(".img_container.first").append "

"+title+"

" - - - $('#large .large-img').attr("src", link.attr("href")) - $("#large .large-img").one "load", -> - $(".img_container.first").fadeIn() - position_img(); - prev_link = link - - false - - - $("body").on "click" ,"#large .next",-> - - if prev_link.next("a").length > 0 - link = prev_link.closest("a").next("a") - - - - else - link = prev_link.closest("div").children("a:first") - - - #titre = photo.find("h3") - - $(".img_container.first").fadeOut 300, -> - $("#large h3").remove() - if link.attr "title" - title = link.attr "title" - $(".img_container.first").append "

"+title+"

" - - $('#large .large-img').attr("src", link.attr("href")) - $("#large .large-img").one "load", -> - $(".img_container.first").fadeIn() - position_img(); - prev_link = link - - false - - - - left =0 - - top = 0 - offset= 0 - - popover_resize = -> - - - - - - - - - - $("#large").css "min-height", ($(window).height()-30)+"px" - - $(".slider").each -> - $(this).css({"width": $(window).width()+"px"}) - - height = ($(window).height()) - optimal_height = Math.round($(this).width()/ 1.66) - if optimal_height < height - height = optimal_height - - $(this).css({"height": height+"px"}) - - - position_img_now(); - - - - - popover_resize() - - $(window).on "popover_resize", -> - popover_resize() - - \ No newline at end of file diff --git a/app/controllers/admin/registrants_controller.rb b/app/controllers/admin/registrants_controller.rb index 3327ab9..c7655b3 100644 --- a/app/controllers/admin/registrants_controller.rb +++ b/app/controllers/admin/registrants_controller.rb @@ -89,6 +89,6 @@ class Admin::RegistrantsController < ApplicationController end def find_registrants - @registrants = Registrant.all + @registrants = Registrant.order("email").all end end diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index 67b6877..b454418 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -52,6 +52,7 @@ %b.caret %ul.dropdown-menu %li= link_to "Images", admin_image_files_path + %li= link_to "Fichiers", admin_data_files_path %li= link_to "Sliders", admin_home_sliders_path diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index dc63d45..5ada20e 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -91,28 +91,30 @@ %ul -first_level_menu.children.order(:position).each do |menu_item| - - %li - -if @ancestor_1 - -if @ancestor_1 == menu_item - =menu_item_link(menu_item, true) + -menu_item_lang = menu_item.menu_item_langs.find_by_lang_site_id(@lang.id) + -if menu_item_lang.enabled == true and menu_item_lang.visible == true + %li + -if @ancestor_1 + -if @ancestor_1 == menu_item + =menu_item_link(menu_item, true) + -else + =menu_item_link(menu_item, false) -else - =menu_item_link(menu_item, false) - -else - =menu_item_link(menu_item) + =menu_item_link(menu_item) - -if menu_item.children.size > 0 - %ul - -menu_item.children.order(:position).each do |menu_item| - - %li - -if @ancestor_1 - -if @ancestor_1 == menu_item - =menu_item_link(menu_item, true) - -else - =menu_item_link(menu_item, false) - -else - =menu_item_link(menu_item) + -if menu_item.children.size > 0 + %ul + -menu_item.children.order(:position).each do |menu_item| + -menu_item_lang = menu_item.menu_item_langs.find_by_lang_site_id(@lang.id) + -if menu_item_lang.enabled == true and menu_item_lang.visible == true + %li + -if @ancestor_1 + -if @ancestor_1 == menu_item + =menu_item_link(menu_item, true) + -else + =menu_item_link(menu_item, false) + -else + =menu_item_link(menu_item) @@ -166,16 +168,15 @@ #bottom - .col{:style => "width:40%;"} + .col{:style => "width:30%;"} %h3 Visites sur réservation : de 9h à 12h et de 14h à 17h - %br - Ouvert tous les jours de l'année. + %br %br - Tel : 04 76 91 03 34 + Tél : 04 76 91 03 34 %br %br N° Siret : 430 323 113 00018 @@ -185,7 +186,7 @@ - .col{:style => "width:20%;text-align:center;"} + .col{:style => "width:40%;text-align:center;"} %h3 Ballalama 80 chemin du champ de l’Orme @@ -196,16 +197,18 @@ =link_to image_tag("/afla.png", :class => "afla"), "http://www.lamas-alpagas.org/", :target => "_blank"    =link_to image_tag("/ferme.png", :class => "ferme"), "http://www.bienvenue-a-la-ferme.com/", :target => "_blank" +    + =link_to image_tag("/pv.png", :class => "ferme"), "http://www.paysvoironnais.com", :target => "_blank" .clear %br - = link_to "Mentions légales","/mentions-legales" + = link_to "Mentions légales","/mentions-legales.html" - .col{:style => "width:40%;text-align:right;"} + .col{:style => "width:30%;text-align:right;"} - = link_to(image_tag( "/plan.png", :alt => "Ballalama élevage et promenades en lama à Réaumont", :style => "margin-right:10px"), "/pages/plan-dacces.html") + = link_to(image_tag( "/plan.png", :alt => "Ballalama élevage et promenades en lama à Réaumont", :style => "margin-right:10px"), "/plan-dacces.html") %br diff --git a/public/pv.png b/public/pv.png new file mode 100644 index 0000000..5157318 Binary files /dev/null and b/public/pv.png differ