Skip to content

Тимофей Семененко / shold.dev5.ashmanov.com

Go to a project
Commit ddfe454d by Semenenko Timofey
Options

filter part3

1 parent 39db5ad6
Pipeline #2862 for ddfe454d skipped in 0 seconds
Expand all
Inline Side-by-side
Showing 12 changed files with 136 additions and 171 deletions
contacts/index.php
......@@ -12,4 +12,4 @@ $APPLICATION->SetTitle("Контакты");
Array(
)
);?>
<?require($_SERVER["DOCUMENT_ROOT"]."/bitrix/footer.php");?>
css/easy-responsive-tabs.css
body {
margin: 0px;
padding: 0px;
background: #f5f5f5;
font-family: 'Segoe UI';
}
ul.resp-tabs-list, p {
margin: 0px;
......@@ -39,12 +34,12 @@ h2.resp-accordion {
}
.resp-tab-active {
border: 1px solid #fff !important;
border-bottom: none;
margin-bottom: -1px !important;
padding: 12px 14px 14px 14px !important;
border-top: 4px solid #fff !important;
border-bottom: 0px #fff solid !important;
border: 1px solid #fff !important;
border-bottom: none;
margin-bottom: -1px !important;
padding: 12px 14px 14px 14px !important;
border-top: 4px solid #fff !important;
border-bottom: 0px #fff solid !important;
}
.resp-tab-active {
......@@ -58,7 +53,7 @@ h2.resp-accordion {
.resp-tab-content {
border: 1px solid #c1c1c1;
border-top-color: #fff;
border-top-color: #fff;
}
h2.resp-accordion {
......@@ -112,15 +107,15 @@ h2.resp-tab-title:last-child {
}
.resp-vtabs li.resp-tab-active {
position: relative;
z-index: 1;
margin-right: -1px !important;
padding: 14px 15px 15px 14px !important;
border-top: 1px solid;
border: 1px solid #fff !important;
border-left: 4px solid #fff !important;
margin-bottom: 4px !important;
border-right: 1px #FFF solid !important;
position: relative;
z-index: 1;
margin-right: -1px !important;
padding: 14px 15px 15px 14px !important;
border-top: 1px solid;
border: 1px solid #fff !important;
border-left: 4px solid #fff !important;
margin-bottom: 4px !important;
border-right: 1px #FFF solid !important;
}
.resp-arrow {
......@@ -130,14 +125,14 @@ border-right: 1px #FFF solid !important;
margin-top: 3px;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
border-top: 12px solid #c1c1c1;
border-top: 12px solid #ffffff;
}
h2.resp-tab-active span.resp-arrow {
border: none;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
border-bottom: 12px solid #9B9797;
border-bottom: 12px solid #ffffff;
}
/*-----------Accordion styles-----------*/
......
css/main.css
This diff could not be displayed because it is too large.
js/compiled.js
......@@ -2830,30 +2830,6 @@ $.fn.isOnScreen = function(){
/*! carousel transition plugin for Cycle2; version: 20130528 */
(function($) {
"use strict";
......@@ -15854,7 +15830,7 @@ $.validator.addMethod(
var v = App.height() ;
if($('.container').hasClass('_top') && (screen.width < 764)) {
v = 320;
v = App.height();
}else{
v = App.height();
......@@ -15867,6 +15843,27 @@ $.validator.addMethod(
})(jQuery);
(function ($) {
"use strict";
var blocks = $('.js-fulli'), header = $('.header'), min = 250;
function blocksHeightProj() {
var v = App.height() ;
if($('.container').hasClass('_top') && (screen.width < 764)) {
v = 320;
}else{
v = App.height();
}
blocks.height(v < min ? min : v);
}
$(window).on('resize', blocksHeightProj).trigger('resize');
})(jQuery);
(function ($) {
var galleries = $('.js-gallery');
if (!galleries.length) return ;
......
js/index.js
......@@ -66,15 +66,29 @@ $(function(){
$('body').toggleClass('noscroll-body');
});
$('.mobile_menu_wrap_phone').click(function(){
$(this).find('.main-menu').toggleClass('opened-xs-menu');
//Hawks 13.01.2017 swipe под меню
$(".mobile_menu_wrap").swipe( {
swipe:function(event, direction, distance, duration, fingerCount, fingerData) {
$('header.header').toggleClass('opened-menu-header');
$(this).find('.main-menu').toggleClass('opened-xs-menu');
$('body').toggleClass('noscroll-body');
$('header.header').toggleClass('opened-menu-header');
});
$('body').toggleClass('noscroll-body');
},
allowPageScroll:"auto",
});
// $('.mobile_menu_wrap_phone').click(function(){
//
// $(this).find('.main-menu').toggleClass('opened-xs-menu');
//
// $('header.header').toggleClass('opened-menu-header');
//
// $('body').toggleClass('noscroll-body');
//
// });
//слайд тоггл ссылок мобильного меню на мобильных устройствах
$('.main-menu-item a').click(function(){
......@@ -573,6 +587,18 @@ $(".hor_1").on('click' , function(){
});
$(document).on('click', ".mobile_menu_phones",function() {
var x = document.getElementById('myDIV');
x.classList.toggle("mystyle");
$( ".project" ).toggle( "slow" );
// $(this).find(".phone-call").show();
});
local/components/cpeople/contacts/templates/.default/template.php
<?
//22.06.2017 Hawks
CModule::IncludeModule('nurgush.mobiledetect');
$detect = new Nurgush\MobileDetect\Main();
// Для мобыльных и планшетов
if($detect->isMobile() || $detect->isTablet()){?>
<?require($_SERVER["DOCUMENT_ROOT"]."/bitrix/header.php");?>
<div class="contacts">
<div class="contacts-wr">
<div class="contacts-map" data-default-center="50,42">
<!-- <?= getBreadCrumbsHtml() ?> -->
<!-- <?= getBreadCrumbsHtml() ?> -->
<a href="#!" class="contacts-map-zoom _in js-zoom-in"></a>
<a href="#!" class="contacts-map-zoom _out js-zoom-out"></a>
<div class="contacts-map-container" id="map"></div>
......@@ -18,88 +11,33 @@ if($detect->isMobile() || $detect->isTablet()){?>
<div class="contacts-content-wr">
<div class="contacts-tabs-head">
<a href="#!" class="contacts-tabs-head-item _active js-tab-toggle" data-id="1">Офисы</a>
<? foreach($arResult['CONTACT_SECTIONS'] as $section) { ?>
<a href="#!" class="contacts-tabs-head-item js-tab-toggle" data-id="<?= $section->ID ?>"><?= $section->NAME ?></a>
<? } ?>
<div class="phone">
<div class="project js-project">
<a href="#feedback" class='phone-call js-order-project'>Обратная связь</a>
</div>
<?$APPLICATION->IncludeComponent('cpeople:form', 'feedback')?>
</div>
</div>
<div class="contacts-tabs-body">
<? require 'tab-office.php' ?>
<? require 'tab-contacts.php' ?>
<? foreach($arResult['CONTACT_SECTIONS'] as $section) { ?>
<a href="#!" class="contacts-tabs-head-item js-tab-toggle" data-id="<?= $section->ID ?>"><?= $section->NAME ?></a>
<? } ?>
<div class="phone">
<div class="project js-project">
<a href="#feedback" class='phone-call js-order-project'>Обратная связь</a>
</div>
<?$APPLICATION->IncludeComponent('cpeople:form', 'feedback')?>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
var mapMarkers = {
<? foreach($arResult['OFFICES'] as $item) { if(!$item->getCoordinates()) continue; ?>
"<?= $item->ID ?>":{"title": "<?= $item->getName() ?>","lat": <?= $item->getLatitude() ?>,"lon": <?= $item->getLongtitude() ?>,"zoom": 15},
<? } ?>
};
</script>
<?require($_SERVER["DOCUMENT_ROOT"]."/bitrix/footer.php");?>
<?}else{?>
<div class="page-head" style="background-image: url(/upload/iblock/eb1/page_head.jpg)">
<div class="phone">
<div class="project js-project">
<? include INCLUDE_PATH . 'header-phone.php' ?>
<a href="#order_price" class='phone-call js-order-project'>Заказать звонок</a>
</div>
<?$APPLICATION->IncludeComponent('cpeople:form', 'callback')?>
</div>
<?= getBreadCrumbsHtml() ?>
<div class="contacts-tabs-body">
<? require 'tab-office.php' ?>
<?=$APPLICATION->GetProperty('PAGE_HEAD_EXTRA_CONTENT')?>
</div>
<div class="contacts">
<div class="contacts-wr">
<div class="contacts-map" data-default-center="50,42">
<!-- <?= getBreadCrumbsHtml() ?> -->
<a href="#!" class="contacts-map-zoom _in js-zoom-in"></a>
<a href="#!" class="contacts-map-zoom _out js-zoom-out"></a>
<div class="contacts-map-container" id="map"></div>
</div>
<div class="contacts-content">
<div class="contacts-content-wr">
<div class="contacts-tabs-head">
<a href="#!" class="contacts-tabs-head-item _active js-tab-toggle" data-id="1">Офисы</a>
<? foreach($arResult['CONTACT_SECTIONS'] as $section) { ?>
<a href="#!" class="contacts-tabs-head-item js-tab-toggle" data-id="<?= $section->ID ?>"><?= $section->NAME ?></a>
<? } ?>
<div class="phone">
<div class="project js-project">
<a href="#feedback" class='phone-call js-order-project'>Обратная связь</a>
</div>
<?$APPLICATION->IncludeComponent('cpeople:form', 'feedback')?>
</div>
</div>
<div class="contacts-tabs-body">
<? require 'tab-office.php' ?>
<? require 'tab-contacts.php' ?>
<? require 'tab-contacts.php' ?>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
var mapMarkers = {
<? foreach($arResult['OFFICES'] as $item) { if(!$item->getCoordinates()) continue; ?>
"<?= $item->ID ?>":{"title": "<?= $item->getName() ?>","lat": <?= $item->getLatitude() ?>,"lon": <?= $item->getLongtitude() ?>,"zoom": 15},
<? } ?>
<? foreach($arResult['OFFICES'] as $item) { if(!$item->getCoordinates()) continue; ?>
"<?= $item->ID ?>":{"title": "<?= $item->getName() ?>","lat": <?= $item->getLatitude() ?>,"lon": <?= $item->getLongtitude() ?>,"zoom": 15},
<? } ?>
};
</script>
<?}?>
<?require($_SERVER["DOCUMENT_ROOT"]."/bitrix/footer.php");?>
local/components/cpeople/project/templates/.default/detail.php
......@@ -9,7 +9,7 @@ $gallery = $item->getPreviewGallery();
?>
<div class="page-head _project js-full" data-id="<?= $item->ID ?>" style="height: 300px">
<div class="page-head _project js-fulli" data-id="<?= $item->ID ?>" style="height: 300px">
<div class="phone" itemscope itemtype="http://schema.org/Organization">
<span itemprop="name" style="display:none">Stroy House</span>
......
local/include/filter_params.php
......@@ -67,6 +67,7 @@
<?if($APPLICATION->GetCurPage() != '/') {?> </div>
<? if ($_SERVER['REQUEST_URI'] == '/projects/') { ?>
<style>
.text-content H1 {
margin: 0;
padding: 0;
......@@ -87,11 +88,12 @@
<? if ($_SERVER['REQUEST_URI'] == '/projects/doma-iz-kleenogo-brusa/'){ ?>
<style>
.page-content {
/*padding: 100px 0 30px 0;*/
padding: 23px 0 30px 0;
}
.projects-list {
margin-top: 75px;
margin-top: 93px;
}
.text-content H1 {
margin: 0;
......@@ -99,7 +101,7 @@
}
.static-content {
padding-bottom: 0;
margin-top: 90px;
/*margin-top: 90px;*/
}
@media (max-width: 1000px) {
......@@ -118,11 +120,12 @@
<?}if ($_SERVER['REQUEST_URI'] == '/projects/bani-iz-kleenogo-brusa/'){?>
<style>
.page-content {
/*padding: 100px 0 30px 0;*/
padding: 23px 0 30px 0;
}
.projects-list {
margin-top: 45px;
margin-top: 60px;
}
.text-content H1 {
margin: 0;
......@@ -130,7 +133,7 @@
}
.static-content {
padding-bottom: 0;
margin-top: 60px;
/*margin-top: 80px;*/
}
@media (max-width: 1000px) {
......@@ -152,11 +155,12 @@
<?}if ($_SERVER['REQUEST_URI'] == '/projects/raznye-proekty/'){?>
<style>
.page-content {
/*padding: 100px 0 30px 0;*/
padding: 10px 0 30px 0;
}
.projects-list {
margin-top: 60px;
margin-top: 73px;
}
.text-content H1 {
margin: 0;
......@@ -164,7 +168,7 @@
}
.static-content {
padding-bottom: 0;
margin-top: 60px;
/*margin-top: 60px;*/
}
@media (max-width: 1000px) {
......
local/include/filter_params_mobile.php
<? $projectFilter = \SH\ProjectFilter::getInstance(); ?>
<? if ($_SERVER['REQUEST_URI'] == '/projects/') { ?>
<style>
.page-content {
padding: 85px 0 30px 0;
}
......@@ -24,7 +25,6 @@
}
</style>
<br>
<form class="js-filter form-filter<? if ($arParams['IS_AJAX_FILTER']) { ?> ajax-filter<? } ?>" method="get"
action="/projects/<? if (!empty($arParams['IS_FAVE'])) { ?>fave/<? } ?>" id='search_form_main'>
......@@ -100,6 +100,7 @@
<? if ($_SERVER['REQUEST_URI'] == '/projects/doma-iz-kleenogo-brusa/') { ?>
<style>
.page-content {
padding: 205px 0 30px 0;
}
......@@ -122,7 +123,6 @@
}
</style>
<br>
<form class="js-filter form-filter<? if ($arParams['IS_AJAX_FILTER']) { ?> ajax-filter<? } ?>" method="get"
action="/projects/<? if (!empty($arParams['IS_FAVE'])) { ?>fave/<? } ?>" id='search_form_main'>
......@@ -206,7 +206,6 @@
<li class="filter-element _house _inactive" data-type="house">
Площадь<? if ($APPLICATION->GetCurPage() == '/') { ?><a href="#!"
class="filter-select-title">площадь</a> <? } ?>
1
</li>
<li class="filter-element _house _inactive" data-type="house">
Этажи<? if ($APPLICATION->GetCurPage() == '/') { ?><a href="#!"
......
local/templates/main/footer.php
......@@ -23,14 +23,14 @@ global $APPLICATION;
$detect = new Nurgush\MobileDetect\Main();
// Для мобыльных и планшетов
if($detect->isMobile() || $detect->isTablet()){?>
if($detect->isMobile() && !$detect->isTablet()){?>
<span><a class="menu" href="/company/" >Наша компания</a><a class="menu" href="/projects/">Список проектов</a></span>
<span><a class="menu" href="/services/">Услуги</a><a class="menu" href="/info/lumber/">Полезная информация</a></span>
<span><a class="menu" href="price/design-cost/" ">Цены</a><a class="menu" href="/contacts/">Контакты</a></span>
<? if (isset($_COOKIE['mobile'])) { ?><meta name=viewport content="width=1024, initial-scale=0.1"><? } else { ?><meta name=viewport content="width=device-width, initial-scale=1"><? } ?>
<? if (isset($_COOKIE['mobile']) and $_COOKIE['mobile']=="no") { ?><a class="author" href="" onclick="SetCookie('mobile=yes', 0);">На мобильную версию</a><? }else{ ?> <a class="author" href="" onclick="SetCookie('mobile=no', 30);">На обычную версию</a><? } ?>
<? if (isset($_COOKIE['mobile']) and $_COOKIE['mobile']=="no") { ?><a class="author" href="" onclick="SetCookie('mobile=yes', 0);">На мобильную версию</a><? }else{ ?> <a class="author" href="" onclick="SetCookie('mobile=no', 30);">На полную версию</a><? } ?>
<a class="author">Stroy House</a>
<a class="author">info@s-h.ru</a>
<!-- <a class="author">Россия, Московская область, Истринский район, Веледниково, улица Живописная, дом 25.</a>-->
......@@ -58,7 +58,7 @@ if($detect->isMobile() || $detect->isTablet()){?>
<!--/noindex-->
<div class="author">Сайт срубили — <a href="http://cpeople.ru/">CreativePeople</a></div>
</footer>
<?}else{?>
<?}else if ($detect->isMobile() && !$detect->isTablet()) {?>
<ul class="social-links">
<?/*<li class="social-links-item"><a href="http://twitter.com/stroyhouse" class="social-links-link _tw" target="_blank" rel="nofollow"></a></li>*/?>
<li class="social-links-item"><a href="//www.facebook.com/pages/Derevannye-doma-ot-Stroj-Hauz/161048223937817" class="social-links-link _fb" target="_blank" rel="nofollow"></a></li>
......@@ -71,7 +71,18 @@ if($detect->isMobile() || $detect->isTablet()){?>
<div class="author">Сайт срубили — <a href="http://cpeople.ru/">CreativePeople</a></div>
<div class="copy">© <?= date('Y') ?> ООО «Строй Хауз»</div>
</footer>
<?}?>
<?}else{?>
<ul class="social-links">
<?/*<li class="social-links-item"><a href="http://twitter.com/stroyhouse" class="social-links-link _tw" target="_blank" rel="nofollow"></a></li>*/?>
<li class="social-links-item"><a href="//www.facebook.com/pages/Derevannye-doma-ot-Stroj-Hauz/161048223937817" class="social-links-link _fb" target="_blank" rel="nofollow"></a></li>
<li class="social-links-item"><a href="//vkontakte.ru/club21826597" class="social-links-link _vk" target="_blank" rel="nofollow"></a></li>
<?/*<li class="social-links-item"><a href="//www.odnoklassniki.ru/group/55514216595503" class="social-links-link _ok" target="_blank" rel="nofollow"></a></li>*/?>
<li class="social-links-item"><a href="//www.youtube.com/user/StroyHouse" class="social-links-link _yt" target="_blank" rel="nofollow"></a></li>
<li class="social-links-item"><a href="//instagram.com/stroyhouse/" class="social-links-link _inst"></a></li>
</ul>
<div class="copy">© <?= date('Y') ?> ООО «Строй Хауз»</div>
<?}?>
<?}?>
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,400italic,600,600italic,700,700italic,800,800italic,300italic,300&subset=latin,cyrillic-ext' rel='stylesheet' type='text/css'>
......@@ -81,6 +92,7 @@ if($detect->isMobile() || $detect->isTablet()){?>
<link rel="stylesheet" type="text/css" href="/css/easy-responsive-tabs.css " />
<!-- Add mousewheel plugin (this is optional) -->
</script>
<script src="/js/jquery-1.9.1.min.js?<?=filemtime(BASE_PATH . '/js/jquery-1.9.1.min.js')?>"></script>
<script src="//maps.googleapis.com/maps/api/js?v=3.exp"></script>
<script src="/js/compiled.js?<?=filemtime(BASE_PATH . '/js/compiled.js')?>" type="text/javascript"></script>
......
local/templates/main/header.php
......@@ -137,23 +137,17 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots"
$detect = new Nurgush\MobileDetect\Main();
// Для мобыльных
if($detect->isMobile() && !$detect->isTablet()){?>
<span class='mobile_menu_wrap_phone'>
<?$APPLICATION->IncludeComponent(
"bitrix:menu",
"top_callback_phone",
Array(
"ROOT_MENU_TYPE" => "top",
"MAX_LEVEL" => "2",
"CHILD_MENU_TYPE" => "sub",
"USE_EXT" => "N",
"MENU_CACHE_TYPE" => "Y",
"MENU_CACHE_TIME" => "3600",
"MENU_CACHE_USE_GROUPS" => "N",
"MENU_CACHE_GET_VARS" => Array()
)
);?>
</span>
<?}else{?>
<div class="mobile_menu_phones"></div>
<div id="myDIV">
<div style="display: none" class="project js-project">
<? include INCLUDE_PATH . 'header-phone.php' ?>
<a href="#order_price" class='phone-call js-order-project'>Заказать звонок</a>
</div>
<?$APPLICATION->IncludeComponent('cpeople:form', 'callback')?>
</div>
<?}else{?>
<?}?>
<?
......@@ -229,6 +223,6 @@ if ($APPLICATION->GetCurPage() == '/projects/online/') echo '<meta name="robots"
global $APPLICATION;
$result = '';
if(!$APPLICATION->GetProperty('HIDE_PAGE_CONTENT')) $result .= '<div class="page-content">';
if(!$APPLICATION->GetProperty('HIDE_CENTRING_WRAP')) $result .= '<div class="centering">';
if(!$APPLICATION->GetProperty('HIDE_CENTRING_WRAP') && (!$_SERVER['REQUEST_URI'] == '/contacts/')) $result .= '<div class="centering">';
return $result;
})?>
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!