Skip to content

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

Go to a project
Commit abf07309 by Semenenko Timofey
Options

projects/first

1 parent fcbf0c87
Pipeline #2818 for abf07309 skipped in 0 seconds
Expand all
Inline Side-by-side
Showing 7 changed files with 92 additions and 45 deletions
css/main.css
...@@ -1232,7 +1232,7 @@ a[href^="tel:"] { ...@@ -1232,7 +1232,7 @@ a[href^="tel:"] {
} }
.filter._main-page .filter-submit-button { .filter._main-page .filter-submit-button {
display: inline-block; display: inline-block;
padding: 22px 0 21.5px; padding: 22px 0 21px;
} }
.filter._main-page .filter-element._select , .filter._main-page .filter-option{ .filter._main-page .filter-element._select , .filter._main-page .filter-option{
display: table-cell; display: table-cell;
...@@ -1254,6 +1254,7 @@ a[href^="tel:"] { ...@@ -1254,6 +1254,7 @@ a[href^="tel:"] {
bottom: 0 !important; bottom: 0 !important;
} }
.filter-inner-wrap { .filter-inner-wrap {
padding: 10px;
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
} }
......
css/media.css
...@@ -427,4 +427,11 @@ span.project-info-specs-item{text-shadow:1px 1px 4px #fff , -1px -1px 4px #fff , ...@@ -427,4 +427,11 @@ span.project-info-specs-item{text-shadow:1px 1px 4px #fff , -1px -1px 4px #fff ,
.main-page .container{padding-top:0;} .main-page .container{padding-top:0;}
.page-head._mp .phone{display:none;} .page-head._mp .phone{display:none;}
.page-head._mp .mp-head-text._bigger{margin-top:0;} .page-head._mp .mp-head-text._bigger{margin-top:0;}
}
@media (max-width: 764px) {
.owl-carousel, .owl-carousel {
height: 250px;
}
} }
\ No newline at end of file \ No newline at end of file
js/compiled.js
...@@ -15853,7 +15853,10 @@ $.validator.addMethod( ...@@ -15853,7 +15853,10 @@ $.validator.addMethod(
function blocksHeight() { function blocksHeight() {
var v = App.height() ; var v = App.height() ;
if($('.container').hasClass('_top')) { if($('.container').hasClass('_top') && (screen.width < 764)) {
v = 320;
}else{
v = App.height(); v = App.height();
} }
...@@ -16768,23 +16771,25 @@ function lazyCycle(container) { ...@@ -16768,23 +16771,25 @@ function lazyCycle(container) {
wrapper.height(pageHead.height()); wrapper.height(pageHead.height());
} }
function bindKeyboardsControls(event) { // function bindKeyboardsControls(event) {
//var activeGalleryControl = navItems.filter('._active'); // //var activeGalleryControl = navItems.filter('._active');
//var activeGallery = galleries.filter('[data-type="' + activeGalleryControl.data('type') + '"]'); // //var activeGallery = galleries.filter('[data-type="' + activeGalleryControl.data('type') + '"]');
//
//if (!activeGallery.length) return false; // //if (!activeGallery.length) return false;
//
var cycle = $('.js-project-images'); // var cycle = $('.js-project-images');
if (!cycle.length) return false; // //if (!cycle.length) return false;
//
if (event.keyCode === 37) { // if (event.keyCode === 37){
cycle.cycle('prev'); // alert('что-то')
} else if (event.keyCode === 39) { // cycle.cycle('prev');
cycle.cycle('next'); // } else if (event.keyCode === 39) {
} // alert('где-то')
// cycle.cycle('next');
// }
} //
//
// }
function init() { function init() {
galleries.each(function () { galleries.each(function () {
...@@ -16814,7 +16819,7 @@ function lazyCycle(container) { ...@@ -16814,7 +16819,7 @@ function lazyCycle(container) {
App.win.on('resize', debounce(adjustWrapperHeight, 40)).trigger('resize'); App.win.on('resize', debounce(adjustWrapperHeight, 40)).trigger('resize');
} }
App.win.on('keyup', bindKeyboardsControls); // App.win.on('keyup', bindKeyboardsControls);
$('.js-order-project').fancybox({ $('.js-order-project').fancybox({
autoSize : false, autoSize : false,
...@@ -17161,18 +17166,35 @@ jQuery.event.special.dblclick = { ...@@ -17161,18 +17166,35 @@ jQuery.event.special.dblclick = {
App.win.on('resize', updateHeight).trigger('resize'); App.win.on('resize', updateHeight).trigger('resize');
})(jQuery); })(jQuery);
jQuery(document.documentElement).keyup(function (event) {
var owl = jQuery(".project-gallery-items");
// handle cursor keys
if (event.keyCode == 37) {
// go left
imagesContainer.prevAll('.js-project-gallery-next');
} else if (event.keyCode == 39) {
// go right
imagesContainer.prevAll('.js-project-gallery-next');
}
});
\ No newline at end of file \ No newline at end of file
//
// jQuery(document.documentElement).keyup(function (event) {
//
// var owl = jQuery(".project-gallery-items");
//
// // handle cursor keys
// if (event.keyCode == 37) {
// // go left
// imagesContainer.prevAll('.js-project-gallery-next');
// } else if (event.keyCode == 39) {
// // go right
// imagesContainer.prevAll('.js-project-gallery-next');
// }
//
// });
// jQuery(document.documentElement).keyup(function (event) {
//
//
// var cycle = $('.project-gallery-items');
// //if (!cycle.length) return false;
//
// if (event.keyCode == 37) {
// alert('что-то')
//
// cycle.cycle('prev');
// } else if (event.keyCode == 39) {
//
// cycle.cycle('next');
// }
//
//
// });
\ No newline at end of file \ No newline at end of file
local/components/cpeople/project/templates/.default/detail-gallery.php
<link rel="stylesheet" href="/css/owl.theme.css"> <link rel="stylesheet" href="/css/owl.theme.css">
<link rel="stylesheet" href="/css/owl.carousel.css"> <link rel="stylesheet" href="/css/owl.carousel.css">
<!-- <link rel="stylesheet" href="/css/scroll.css"> --> <!-- <link rel="stylesheet" href="/css/scroll.css">
...@@ -61,7 +61,7 @@ if($images) { ...@@ -61,7 +61,7 @@ if($images) {
} }
?> ?>
<i class="flaticon-search" id='previewer_toggle'></i> <!-- <i class="flaticon-search" id='previewer_toggle'></i>-->
<div class="project-galleries" id='object_head_gal'> <div class="project-galleries" id='object_head_gal'>
<?/*<nav class="project-galleries-nav"> <?/*<nav class="project-galleries-nav">
...@@ -92,9 +92,10 @@ $prevNum = 0; ?> ...@@ -92,9 +92,10 @@ $prevNum = 0; ?>
<span class="project-gallery-num-div">/</span> <span class="project-gallery-num-div">/</span>
<span class="project-gallery-num-total js-total"><?= count($arImage['images']) ?></span> <span class="project-gallery-num-total js-total"><?= count($arImage['images']) ?></span>
</div> </div>
<ul class="project_slider">
<? foreach($arImage['images'] as $img) { <ul data-fancybox class="project_slider">
<? foreach($arImage['images'] as $img) {
$ext = end(explode('.', $img->getUrl())); $ext = end(explode('.', $img->getUrl()));
$previews[$prevNum] = $img; $previews[$prevNum] = $img;
...@@ -105,7 +106,7 @@ $prevNum = 0; ?> ...@@ -105,7 +106,7 @@ $prevNum = 0; ?>
?> ?>
<li class="project-gallery-item js-slide<? if($img->isPlan) { ?> _plan<? } ?>" style="background-image: url(<?= $img->getUrl() ?>)"> <li class="project-gallery-item js-slide<? if($img->isPlan) { ?> _plan<? } ?>" style="background-image: url(<?= $img->getUrl() ?>)">
<? } elseif ($imgNumber >= 2 and $ext != 'mp4') { <? } elseif ($imgNumber >= 2 and $ext != 'mp4') {
...@@ -116,7 +117,7 @@ $prevNum = 0; ?> ...@@ -116,7 +117,7 @@ $prevNum = 0; ?>
?> ?>
<li class="project-gallery-item js-slide<? if($img->isPlan) { ?> _plan<? } ?>" data-original="<?= $img->getUrl() ?>" style="background-image: url(/img/empty.png)"> <li class="project-gallery-item js-slide<? if($img->isPlan) { ?> _plan<? } ?>" data-original="<?= $img->getUrl() ?>" >
<? } ?> <? } ?>
...@@ -151,7 +152,7 @@ $prevNum = 0; ?> ...@@ -151,7 +152,7 @@ $prevNum = 0; ?>
<img alt="<?= ($val = $img->getDescription()) ? $val : $item->getImgAlt($imgNumber) ?>" src="<?= $img->getUrl() ?>" style="display:none"> <img alt="<?= ($val = $img->getDescription()) ? $val : $item->getImgAlt($imgNumber) ?>" src="<?= $img->getUrl() ?>" style="display:none">
<? } ?> <? } ?>
</li> </li>
<? <?
......
local/components/cpeople/project/templates/.default/detail.php
...@@ -8,7 +8,8 @@ $bedrooms = $item->getBedroomCount(); ...@@ -8,7 +8,8 @@ $bedrooms = $item->getBedroomCount();
$gallery = $item->getPreviewGallery(); $gallery = $item->getPreviewGallery();
?> ?>
<div class="page-head _project js-full" data-id="<?= $item->ID ?>">
<div class="page-head _project js-full" data-id="<?= $item->ID ?>" style="height: 300px">
<div class="phone" itemscope itemtype="http://schema.org/Organization"> <div class="phone" itemscope itemtype="http://schema.org/Organization">
<span itemprop="name" style="display:none">Stroy House</span> <span itemprop="name" style="display:none">Stroy House</span>
...@@ -17,9 +18,14 @@ $gallery = $item->getPreviewGallery(); ...@@ -17,9 +18,14 @@ $gallery = $item->getPreviewGallery();
<span itemprop="address" style="display:none">Россия, Москва, Селивёрстов переулок, 1А</span> <span itemprop="address" style="display:none">Россия, Москва, Селивёрстов переулок, 1А</span>
<a href="tel:+7 (495) 645–44–30" class="phone-value" itemprop="telephone">+7 (495) 645–44–30</a> <a href="tel:+7 (495) 645–44–30" class="phone-value" itemprop="telephone">+7 (495) 645–44–30</a>
<span itemprop="telephone" style="display:none">+7 (495) 645-44-34</span> <span itemprop="telephone" style="display:none">+7 (495) 645-44-34</span>
<a href="/callback/" class="phone-call">Заказать звонок</a> <div class="project js-project">
<a href="#order_price" class='phone-call js-order-project'>Заказать звонок</a>
</div>
<?$APPLICATION->IncludeComponent('cpeople:form', 'callback')?>
</div> </div>
<div class="path"> <div class="path">
<ul class="path-elements"> <ul class="path-elements">
<li class="path-elements-item"><a href="/">Главная</a></li> <li class="path-elements-item"><a href="/">Главная</a></li>
......
local/templates/main/footer.php
...@@ -44,9 +44,15 @@ if($detect->isMobile() || $detect->isTablet()){?> ...@@ -44,9 +44,15 @@ if($detect->isMobile() || $detect->isTablet()){?>
<a class="author" href="price/design-cost/" ">Цены</a> <a class="author" href="price/design-cost/" ">Цены</a>
<a class="author" href="/info/lumber/">Полезная информация</a> <a class="author" href="/info/lumber/">Полезная информация</a>
<a class="author" href="/contacts/">Контакты</a> <a class="author" href="/contacts/">Контакты</a>
<? 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'])) { ?><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>-->
<a class="author">Россия, Москва, Селивёрстов переулок, 1А</a>
<a class="author">+7 (495) 645–44–30</a>
<?}else{?> <?}else{?>
<?}?> <?}?>
...@@ -68,6 +74,10 @@ if($detect->isMobile() || $detect->isTablet()){?> ...@@ -68,6 +74,10 @@ if($detect->isMobile() || $detect->isTablet()){?>
<script>if (screen.width<=768) {document.write('<link rel="stylesheet" href="/css/main.css?<?=filemtime(BASE_PATH . '/css/main.css')?>" id="pre_load">');document.body.style.display="block";}</script> <script>if (screen.width<=768) {document.write('<link rel="stylesheet" href="/css/main.css?<?=filemtime(BASE_PATH . '/css/main.css')?>" id="pre_load">');document.body.style.display="block";}</script>
<link rel="stylesheet" type='text/css' href="/css/flaticon.css"> <link rel="stylesheet" type='text/css' href="/css/flaticon.css">
<link rel="stylesheet" type='text/css' href="/css/media.css" > <link rel="stylesheet" type='text/css' href="/css/media.css" >
<!--<link rel="stylesheet" href="/css/fansy3.2.1.css" />-->
<!--<script src="//code.jquery.com/jquery-3.2.1.min.js"></script>-->
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.1.20/jquery.fancybox.min.js"></script>-->
<script> <script>
//Ставим Куки //Ставим Куки
function SetCookie(id, days){ function SetCookie(id, days){
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!