Commit 9f5e5436 authored by Clément Damiens's avatar Clément Damiens

response app + hotfix +trad
parent 9f232747
......@@ -2710,7 +2710,7 @@ var directory = {
'</a>';
}
str = '<div class="pull-left col-md-12 text-left" id="footerDropdown" style="width:100%;">';
str += "<h3 style='margin-bottom:10px; margin-left:15px;border-left: 2px solid lightgray;' class='text-dark padding-20'><small>"+msg+"<br/>"+contributeMsg+"</h3></small><br/>";
str += "<h5 style='margin-bottom:10px; margin-left:15px;border-left: 2px solid lightgray;' class='text-dark padding-20'>"+msg+"<br/>"+contributeMsg+"</h5><br/>";
str += "</div>";
return str;
},
......
......@@ -77,6 +77,7 @@ function initSearchInterface(){
$("#menu-map-btn-start-search, #menu-btn-start-search, #main-search-bar-addon").off().click(function(){
$("#second-search-bar").val($("#input-search-map").val());
$("#main-search-bar").val($("#input-search-map").val());
search.value=$("#main-search-bar").val();
console.log("typeInit", typeInit);
if(typeInit == "all") initTypeSearch("allSig");
else initTypeSearch(typeInit);
......
......@@ -63,13 +63,52 @@
.container-result-search{
padding-top:30px;
}
.open-type-filter{
display:none;
}
@media (max-width: 768px) {
#col-btn-type-directory{
text-align: center!important;
.open-type-filter{
display: block;
position: absolute;
right: -33px;
height: 50px;
width: 50px;
border: 1px solid #dadada;
border-radius: 100%;
text-align: right;
padding-right: 8px;
z-index: -1;
font-size: 20px;
}
#col-btn-type-directory .btn-directory-type, #sub-menu-left .btn-select-type-anc{
background-color: white;
}
#col-btn-type-directory, #sub-menu-left{
position: absolute;
width: 56%;
left: -55.5%;
background-color: white;
top: 0px;
/* top: 214px; */
z-index: 300;
padding: 0px;
-webkit-box-shadow: 0px 2px 6px -1px rgba(0,0,0,.2);
box-shadow: 0px 2px 6px -1px rgba(0,0,0,.2);
}
#sub-menu-left.subsub .btn {
width: 100% !important;
background-color: white !important;
margin: 0px !important;
border-radius: 0px;
}
}
@media (min-width: 769px) {
#col-btn-type-directory, #sub-menu-left {
left:inherit !important;
}
}
/* ANNONCES MENU*/
<?php
......@@ -253,13 +292,14 @@
<?php if(Yii::app()->params["CO2DomainName"] != "terla"){ ?>
<div class="col-sm-3 col-md-2 col-xs-12 text-right no-padding" id="col-btn-type-directory">
<button class="open-type-filter tooltips" data-toggle="tooltip" data-placement="right" data-title="<?php echo Yii::t("common","Open filtering by type") ?>"><i class="fa fa-chevron-right"></i></button>
<!--<button class="btn text-white bg-dark btn-open-filliaire">
<i class="fa fa-th"></i>
<span class="hidden-xs"><?php echo Yii::t("common","Themes") ?></span>
</button><hr class="hidden-xs">-->
<button class="btn text-black bg-white btn-directory-type btn-all active" data-type="all">
<i class="fa fa-search"></i>
<span class="hidden-xs"><?php echo Yii::t("common","All") ?></span>
<span class=""><?php echo Yii::t("common","All") ?></span>
</button>
<!--<button class="btn border-dark btn-directory-type active padding-10" data-type="all">
<i class="fa fa-asterisk"></i>
......@@ -311,8 +351,8 @@
<span class="elipsis label-filter"><?php echo Yii::t("common","Projects") ?></span>
<span class="count-badge-filter" id="countprojects"></span>
</button>
<hr class="hidden-xs no-margin" data-type="projects">
<!--<button class="btn border-brown btn-directory-type padding-10" data-type="places">
<!--<hr class="hidden-xs no-margin" data-type="projects">
<button class="btn border-brown btn-directory-type padding-10" data-type="places">
<i class="fa fa-home"></i>
<span class="elipsis label-filter"><?php echo Yii::t("common","Places") ?></span>
<span class="count-badge-filter" id="countplaces"></span>
......@@ -360,9 +400,9 @@
<i class="fa fa-cubes"></i>
<span class="elipsis label-filter"><?php echo Yii::t("common","Ressources") ?></span>
<span class="count-badge-filter" id="countressources"></span>
</button><br class="hidden-xs">
</button>
<hr class="hidden-sm hidden-md hidden-lg" data-type="ressources">
<hr class="hidden-sm hidden-md hidden-lg no-margin" data-type="ressources">
</div>
<?php } ?>
<?php } else if ( $typeSelected == "vote" ){?>
......@@ -405,6 +445,7 @@
<i class="fa fa-search"></i>
<span class="hidden-xs"><?php echo Yii::t("common","All") ?></span>
</button><hr class="hidden-xs">-->
<button class="open-type-filter tooltips" data-toggle="tooltip" data-placement="right" data-title="<?php echo Yii::t("common","Open filtering by type") ?>"><i class="fa fa-chevron-right"></i></button>
<?php $categories = Event::$types;
foreach ($categories as $key => $cat) {
......@@ -617,7 +658,16 @@ jQuery(document).ready(function() {
slidupScopetagsMin();
});
$(".open-type-filter").click(function(){
if(!$(this).hasClass("show-dir")){
$(this).addClass("show-dir").data("title", "<?php echo Yii::t("common","Close") ?>").find("i").removeClass("fa-chevron-right").addClass("fa-times");
$("#col-btn-type-directory, #sub-menu-left").animate({ left : "0%" }, 400 );
}else{
$(this).removeClass("show-dir").data("title", "<?php echo Yii::t("common","Open filtering by type") ?>").find("i").removeClass("fa-times").addClass("fa-chevron-right");
$("#col-btn-type-directory, #sub-menu-left").animate({ left : "-55.5%" }, 400 );
}
});
searchType = (typeSelected == null) ? [ "persons" ] : [ typeSelected ];
//allSearchType = [ "persons", "organizations", "projects", "events", "events", "vote", "cities","poi","places","ressources" ];
topMenuActivated = true;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment