From d15f5da2a555c1d3edf0aff4e85a8d751eb4775b Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Fri, 17 Feb 2017 21:33:36 +0100 Subject: [PATCH] suite --- app/assets/javascripts/popover.coffee | 265 ------------------ .../admin/registrants_controller.rb | 2 +- app/views/layouts/admin.html.haml | 1 + app/views/layouts/public.html.haml | 59 ++-- public/pv.png | Bin 0 -> 3753 bytes 5 files changed, 33 insertions(+), 294 deletions(-) create mode 100644 public/pv.png 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 0000000000000000000000000000000000000000..515731806336be1e97bee41b23cd07b026f287cb GIT binary patch literal 3753 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