bug fix agenda + salles

This commit is contained in:
Kevin Tessier 2019-06-09 15:17:49 +02:00
parent 5c8f37419f
commit 2571b59324
9 changed files with 229 additions and 36 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="30"
height="30"
viewBox="0 0 7.9374998 7.9375002"
version="1.1"
id="svg2346"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
sodipodi:docname="arrow-gal-next.svg">
<defs
id="defs2340" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.2"
inkscape:cx="7.9559499"
inkscape:cy="15.740667"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1920"
inkscape:window-height="1029"
inkscape:window-x="0"
inkscape:window-y="22"
inkscape:window-maximized="1" />
<metadata
id="metadata2343">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-289.06249)">
<circle
style="opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.60444033;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path820"
cx="3.96875"
cy="293.03125"
r="3.96875" />
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.38952681;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 2.6027268,290.7069 2.6396778,2.25348 -2.6396778,2.25349"
id="path731-2"
inkscape:connector-curvature="0"
inkscape:export-filename="/home/maud/Documents/LE CAMPUS BIOVALLEE/3_SITE_WEB/TAF/GABARITS/export4/0_accueil.png"
inkscape:export-xdpi="150"
inkscape:export-ydpi="150"
sodipodi:nodetypes="ccc"
inkscape:transform-center-x="-0.16642708"
inkscape:transform-center-y="-0.047242975" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="30"
height="30"
viewBox="0 0 7.9374998 7.9375002"
version="1.1"
id="svg2346"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
sodipodi:docname="arrow-gal.svg">
<defs
id="defs2340" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.2"
inkscape:cx="7.9559499"
inkscape:cy="15.740667"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1920"
inkscape:window-height="1029"
inkscape:window-x="0"
inkscape:window-y="22"
inkscape:window-maximized="1" />
<metadata
id="metadata2343">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-289.06249)">
<circle
style="opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.60444033;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path820"
cx="3.96875"
cy="293.03125"
r="3.96875" />
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.38952681;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 4.83868,295.28474 2.1990022,293.03126 4.83868,290.77777"
id="path731-2"
inkscape:connector-curvature="0"
inkscape:export-filename="/home/maud/Documents/LE CAMPUS BIOVALLEE/3_SITE_WEB/TAF/GABARITS/export4/0_accueil.png"
inkscape:export-xdpi="150"
inkscape:export-ydpi="150"
sodipodi:nodetypes="ccc"
inkscape:transform-center-x="0.21367406"
inkscape:transform-center-y="0.07087054" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -79,7 +79,6 @@ function slide() {
responsive: true,
mode: 'fade',
captions: true,
pagerSelector: '',
});
}
@ -146,6 +145,7 @@ function mapsalles() {
$salles.on('click', function() {
var idsalle = this.id;
arrayid.push(idsalle);
$salles.css("fill", "white");
$(this).css("fill", "#0093a3");
@ -156,8 +156,8 @@ function mapsalles() {
var $close = $('.content_salle .header-salles img');
$close.on('click', function () {
console.log('close');
$(this).parents('.content_salle').css("visibility", "hidden");
$salles.css("fill", "white");
})
};

View File

@ -1 +1 @@
function map(){if($("#carte").length){var e=L.map("carte").setView([44.7365818,4.9776488],13),t=L.icon({iconUrl:"/user/themes/lecampus/images/mappoint.svg",iconSize:[38,95],iconAnchor:[22,94],popupAnchor:[-3,-76]});L.tileLayer("https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw",{maxZoom:18,id:"mapbox.streets"}).addTo(e),L.marker([44.7365818,4.9776488],{icon:t}).addTo(e),e.on("click",function(t){popup.setLatLng(t.latlng).setContent("You clicked the map at "+t.latlng.toString()).openOn(e)})}}function filteritem(){$(".body-wrapper > .card"),$(".cat a"),$(".body-wrapper .img");$(".filters .btn").click(function(e){e.preventDefault();var t=$(this).attr("data-filter");$(".body-wrapper").masonryFilter({filter:function(){return!t||$(this).attr("data-filter")==t}})});var e=$("#archive .body-wrapper, #calendrier .body-wrapper").masonry({itemSelector:".card",gutter:10,transitionDuration:"0.2s"});e.imagesLoaded().progress(function(){e.masonry()})}function slide(){$(".gal").bxSlider({responsive:!0,infiniteLoop:!0,preloadImages:"visible",pager:!1,auto:!0}),$(".gal-salles").bxSlider({pagerType:"full",responsive:!0,mode:"fade",captions:!0,pagerSelector:""})}function links(){var e=$('li a[href="/organisez-vos-evenements"],li a[href="/qui-sommes-nous"] '),t=$("a#carte");e.on("click",function(e){e.preventDefault()}),t.on("click",function(e){e.preventDefault()})}function clickbutton(){$("#ajax-test-form .radio label").on("click",function(){$(this).parents(".form-data").find(".check").removeClass("check"),$(this).parent(".radio").addClass("check")})}function clicksenddevis(){var e=$(".ok");$("#send-valide");e.on("click",function(){$(this).parent("#send-valide").remove()})}function addclass(){$("a#carte").parents(".content_s").addClass("map");var e=$("#reco .title"),t=$("#reco .txt");e.on("click",function(){t.toggleClass("open"),$(this).toggleClass("open")}),$(".opt-out .txt").on("click",function(){$(this).parent(".opt-out").toggleClass("open")})}function mapsalles(){var e=$(".fond svg path");$(".content .content_salle");arrayid=[],$(".content .content_salle#salle_trois_becs").css("visibility","visible"),$(".fond svg path#salle_trois_becs").css("fill","#0093a3"),e.on("click",function(){var t=this.id;arrayid.push(t),e.css("fill","white"),$(this).css("fill","#0093a3"),$(".content .content_salle").css("visibility","hidden"),$(".content .content_salle#"+arrayid).css("visibility","visible"),arrayid.length=0}),$(".content_salle .header-salles img").on("click",function(){console.log("close"),$(this).parents(".content_salle").css("visibility","hidden")})}function burger(){$(".navTrigger").click(function(){$(this).toggleClass("active"),$(".dropmenu").toggleClass("active")})}jQuery(document).ready(function(){addclass(),mapsalles(),clickbutton(),links(),slide(),filteritem(),map(),burger()});
function map(){if($("#carte").length){var e=L.map("carte").setView([44.7365818,4.9776488],13),t=L.icon({iconUrl:"/user/themes/lecampus/images/mappoint.svg",iconSize:[38,95],iconAnchor:[22,94],popupAnchor:[-3,-76]});L.tileLayer("https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw",{maxZoom:18,id:"mapbox.streets"}).addTo(e),L.marker([44.7365818,4.9776488],{icon:t}).addTo(e),e.on("click",function(t){popup.setLatLng(t.latlng).setContent("You clicked the map at "+t.latlng.toString()).openOn(e)})}}function filteritem(){$(".body-wrapper > .card"),$(".cat a"),$(".body-wrapper .img");$(".filters .btn").click(function(e){e.preventDefault();var t=$(this).attr("data-filter");$(".body-wrapper").masonryFilter({filter:function(){return!t||$(this).attr("data-filter")==t}})});var e=$("#archive .body-wrapper, #calendrier .body-wrapper").masonry({itemSelector:".card",gutter:10,transitionDuration:"0.2s"});e.imagesLoaded().progress(function(){e.masonry()})}function slide(){$(".gal").bxSlider({responsive:!0,infiniteLoop:!0,preloadImages:"visible",pager:!1,auto:!0}),$(".gal-salles").bxSlider({pagerType:"full",responsive:!0,mode:"fade",captions:!0})}function links(){var e=$('li a[href="/organisez-vos-evenements"],li a[href="/qui-sommes-nous"] '),t=$("a#carte");e.on("click",function(e){e.preventDefault()}),t.on("click",function(e){e.preventDefault()})}function clickbutton(){$("#ajax-test-form .radio label").on("click",function(){$(this).parents(".form-data").find(".check").removeClass("check"),$(this).parent(".radio").addClass("check")})}function clicksenddevis(){var e=$(".ok");$("#send-valide");e.on("click",function(){$(this).parent("#send-valide").remove()})}function addclass(){$("a#carte").parents(".content_s").addClass("map");var e=$("#reco .title"),t=$("#reco .txt");e.on("click",function(){t.toggleClass("open"),$(this).toggleClass("open")}),$(".opt-out .txt").on("click",function(){$(this).parent(".opt-out").toggleClass("open")})}function mapsalles(){var e=$(".fond svg path");$(".content .content_salle");arrayid=[],$(".content .content_salle#salle_trois_becs").css("visibility","visible"),$(".fond svg path#salle_trois_becs").css("fill","#0093a3"),e.on("click",function(){var t=this.id;arrayid.push(t),e.css("fill","white"),$(this).css("fill","#0093a3"),$(".content .content_salle").css("visibility","hidden"),$(".content .content_salle#"+arrayid).css("visibility","visible"),arrayid.length=0}),$(".content_salle .header-salles img").on("click",function(){$(this).parents(".content_salle").css("visibility","hidden"),e.css("fill","white")})}function burger(){$(".navTrigger").click(function(){$(this).toggleClass("active"),$(".dropmenu").toggleClass("active")})}function ajaxformulaire(){$(".ok").on("click",function(){$(this).parent("#send-valide").remove(),location.reload()});var e=$("#ajax-test-form");e.submit(function(t){t.preventDefault(),$.ajax({url:e.attr("action"),type:e.attr("method"),dataType:"html",data:e.serialize(),success:function(e){$("#form-result").html(e)}})})}jQuery(document).ready(function(){addclass(),mapsalles(),clickbutton(),clicksenddevis(),links(),slide(),filteritem(),map(),burger()});

View File

@ -860,18 +860,23 @@
.body-wrapper{
background-image: url('../images/Trame-gris.svg');
background-repeat: no-repeat;
}
.content{
@include inlineflex;
width: 90%;
flex-direction: row-reverse;
justify-content: space-between;
.txt{
width: 50%;
.content_txt{
width: 50%;
}
& > p{
font-size: 1.2rem;
font-family: $Bold;
}
}
}
svg{
pointer-events: none;
}
@ -907,9 +912,7 @@
}
}
}
.txt{
width: 30%;
}
.content_salle{
// display: none;
visibility: hidden;
@ -946,7 +949,19 @@
bottom: 10px!important;
}
.bx-controls-direction{
display: none;
a{
background-size: cover;
background-repeat: no-repeat;
}
.bx-prev{
background-image: url('/user/themes/lecampus/images/arrow-gal.svg');
}
.bx-next{
background-image: url('/user/themes/lecampus/images/arrow-gal-next.svg');
&:hover, &:focus{
background-position: center!important;
}
}
}
.bx-pager-link {
background: white!important;

View File

@ -232,6 +232,16 @@
width: 2%!important;
}
}
.bandeau{
.img{
width: 100%!important;
}
.title_gal{
top:25vw!important;
right: 5%!important;
max-width: 70%!important;
}
}
.entete .entete_c{
width: 95%!important;
margin: 30px auto!important;
@ -253,7 +263,7 @@
border-radius: 0px!important;
h4{
font-size: 1.3rem!important;
margin: 15px auto!important;
margin: 15px auto 0 auto!important;
-webkit-transform: translateY(0%)!important;
transform: translateY(0%)!important;
}
@ -287,16 +297,32 @@
#sublog{
.txt{
width:100%!important;
.content_txt{
width: 100%!important;
}
p{
padding: 0!important;
}
}
.content_salle{
width: 70%!important;
z-index: 2;
left: 60%!important;
left: 50%!important;
transform: translateX(-50%);
.header-salles{
display: inline-flex;
justify-content: space-between;
img{
display: block!important;
margin: auto;
width: 20px;
height: 20px;
cursor: pointer;
}
}
}
.mapsalles{
width: 60%!important;
width: 100%!important;
}
}
#item .demander-votre-devis, #sublog .demander-votre-devis{
@ -502,18 +528,7 @@
}
.content_salle{
width: 90%!important;
left: 5%!important;
top: 200px!important;
.header-salles{
display: inline-flex;
justify-content: space-between;
img{
display: block!important;
margin: auto;
width: 20px;
height: 20px;
}
}
p{
padding: 0px 10px!important;
}

View File

@ -14,8 +14,10 @@
<section class="body-wrapper">
<div class="content">
<div class="txt">
<div class="content_txt">
{{content}}
</div>
</div>
<div class="mapsalles">
<div class="contour">
<svg