Skip to content

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

Go to a project
Commit 3153d33e by Semenenko Timofey
Options

Полсдений пулл правок

1 parent 28409ac2
Pipeline #3006 for 3153d33e skipped in 0 seconds
Expand all
Inline Side-by-side
Showing 12 changed files with 49 additions and 106 deletions
.htaccess1 deleted 100644 → 0
Options -Indexes
ErrorDocument 404 /404.php
<IfModule mod_php5.c>
php_flag allow_call_time_pass_reference 1
php_flag session.use_trans_sid off
#php_value display_errors 1
#php_value mbstring.internal_encoding UTF-8
</IfModule>
<IfModule mod_rewrite.c>
Options +FollowSymLinks
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-l
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !/bitrix/urlrewrite.php$
RewriteRule ^(.*)$ /bitrix/urlrewrite.php [L]
RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization}]
</IfModule>
<IfModule mod_dir.c>
DirectoryIndex index.php index.html
</IfModule>
<IfModule mod_expires.c>
ExpiresActive on
ExpiresByType image/jpeg "access plus 3 day"
ExpiresByType image/gif "access plus 3 day"
</IfModule>
\ No newline at end of file
1.php deleted 100644 → 0
<?php
//$url = "ipgeobase.ru:7020/geo/?ip=194.135.216.194";
//$ch = curl_init();
//var_dump(curl_getinfo($ch));
/*curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_HTTPHEADER, 'Content-Type:application/x-www-form-urlencoded');
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
$curlResult = curl_exec($ch);
var_dump($curlResult);
var_dump(curl_error($ch));*/
//var_dump(file_get_contents("http://194.85.91.253:7020/geo/?ip=194.135.216.194"));
//var_dump(geoip_record_by_name('194.135.216.194'));
//if (geoip_db_avail(GEOIP_COUNTRY_EDITION))
//print geoip_database_info(GEOIP_COUNTRY_EDITION);
$data1=geoip_record_by_name($_SERVER['REMOTE_ADDR']);
$data['country'] = $data1["country_name"];
$data['district'] = '';//$result->getDestrict();
$data['region'] = geoip_region_name_by_code($data1["country_code"],$data1["region"]);
$data['city'] = $data1["city"];
var_dump($data);
?>
\ No newline at end of file
1/s-h.zip deleted 100644 → 0
No preview for this file type
css/main.css
......@@ -10254,6 +10254,7 @@ A.people-item:hover .people-item-name {
top: 27px;
}
.contacts-tabs-head .phone-call {
top: 12px;
font-size: 1.1rem;
line-height: 1.6rem;
}
......@@ -14650,7 +14651,7 @@ h2.resp-accordion:first-child {
padding: 20px 10px;
}
/* Кнoпкa зaкрыть для тех ктo в тaнке) */
#feed_form #feed_close {
#feed_form #feed_close {
width: 21px;
height: 21px;
position: absolute;
......@@ -14660,7 +14661,7 @@ h2.resp-accordion:first-child {
display: block;
}
/* Пoдлoжкa */
#overlay-feed {
#overlay-feed {
z-index:3;
position:fixed;
background-color:#000;
......@@ -14714,3 +14715,7 @@ h2.resp-accordion:first-child {
cursor:pointer;
display:none;
}
.contacts_toogles b{
top: 10px;
font-size: 14px;
}
\ No newline at end of file
info/lumber/index.php
......@@ -41,7 +41,7 @@ $APPLICATION->SetPageProperty('HIDE_CENTRING_WRAP', 'Y');
<div class="phone-teaser" style="background-image: url(/_temp/phone-teaser-bg.jpg)">
<span class="phone-teaser-text">
<span>Приезжайте к нам в гости в любое время:<br/>ни один вопрос не останется без ответа</span>
<a href="/callback/" class="big-button process-make-time">Назначить время</a>
<a href="#order_price" class='big-button process-make-time js-order-project'>Назначить время</a>
</span>
</div>
......
js/compiled.js
......@@ -22796,11 +22796,11 @@ function getMimeType(path) {
var contactsContainer = self.parents('.contacts-tabs-item');
if ($('.js-list-container').length) {
$('.js-collapsable').each(function () {
$(this).removeClass("_active");
$(this).find('.js-collapsable-content').slideUp(400);
})
// $('.js-collapsable').each(function () {
// $(this).removeClass("_active");
// $(this).find('.js-collapsable-content').slideUp(400);
//
// })
}
container.toggleClass('_active');
content.slideToggle(400, function () {
local/components/cpeople/contacts/templates/.default/tab-office.php
......@@ -24,9 +24,9 @@
<? } ?>
<li class="contacts-list-item _collapsable js-collapsable<? if (!$i) { ?> <? } ?>" itemscope
itemtype="http://schema.org/Organization">
<a href="#!" class="contacts-tabs-head-item js-collapsable-toggle js-office"
<a href="#!" class="contacts_toogles js-collapsable-toggle js-office"
data-id="<?= $item->ID ?>">
<b>Подробно...</b>
<b class="contacts_toogles">Подробнее...</b>
</a>
<div class="js-collapsable-content contacts-list-item-content">
......
local/components/cpeople/project/templates/.default/detail.php
......@@ -21,7 +21,7 @@ $gallery = $item->getPreviewGallery();
<div class="project js-project">
<a href="#order_price" class='phone-call js-order-project'>Заказать звонок</a>
</div>
<?$APPLICATION->IncludeComponent('cpeople:form', 'callback')?>
<? $APPLICATION->IncludeComponent('cpeople:form', 'callback') ?>
</div>
......@@ -30,58 +30,59 @@ $gallery = $item->getPreviewGallery();
<ul class="path-elements">
<li class="path-elements-item"><a href="/">Главная</a></li>
<li class="path-elements-item"><a href="/projects/">Проекты</a></li>
<? if($breadcrumb = $arResult['ITEM']->getTypeBreadcrumb()) { ?>
<? if ($breadcrumb = $arResult['ITEM']->getTypeBreadcrumb()) { ?>
<li class="path-elements-item"><a href="<?= $breadcrumb[1] ?>"><?= $breadcrumb[0] ?></a></li>
<? } ?>
<? } ?>
</ul>
<h1 class="path-current"><?= $item->getName() ?></h1>
</div>
<a href="#!" class="project-like js-fav-toggle">нравится</a>
<? require 'detail-gallery.php' ?>
<? require 'detail-gallery.php' ?>
<div class="project-info">
<? if($square || $floors || $bedrooms) { ?>
<? if ($square || $floors || $bedrooms) { ?>
<div class="project-info-specs">
<span class="va"></span>
<? if($square) { ?>
<? if ($square) { ?>
<span class="project-info-specs-item _square">
<span class="project-info-specs-item-value"><?= $square ?></span>
<span class="project-info-specs-item-unit">м<sup>2</sup></span>
<?/*<span class="project-info-specs-item-sub">площадь</span>*/?>
<? /*<span class="project-info-specs-item-sub">площадь</span>*/ ?>
</span>
<? } ?>
<? if($floors) { ?>
<? } ?>
<? if ($floors) { ?>
<span class="project-info-specs-item _floors">
<span class="project-info-specs-item-value"><?= $floors ?></span>
<span class="project-info-specs-item-unit"><?= num_to_string($floors, 'этаж', 'этажа', 'этажей', false) ?></span>
</span>
<? } ?>
<? if($bedrooms) { ?>
<? } ?>
<? if ($bedrooms) { ?>
<span class="project-info-specs-item _bedrooms">
<span class="project-info-specs-item-value"><?= $bedrooms ?></span>
<span class="project-info-specs-item-unit"><?= num_to_string($bedrooms, 'спальня', 'спальни', 'спален', false) ?></span>
</span>
<? } ?>
<? } ?>
</div>
<? } ?>
<? } ?>
<div class="project-info-link-wr">
<span class="va"></span>
<? if(isset($planImageI)) { ?>
<a href="#layout" class="project-info-link big-button _white js-slide-to-layout" data-image="<?= $planImageI ?>">Планировки</a>
<? } ?>
<? if (isset($planImageI)) { ?>
<a href="#layout" class="project-info-link big-button _white js-slide-to-layout"
data-image="<?= $planImageI ?>">Планировки</a>
<? } ?>
<a href="#order" class="project-info-link big-button js-order-project">Хочу такой дом</a>
</div>
</div>
<!---->
<!---->
</div>
</div>
</div>
</div>
<!---->
<!---->
</div>
......@@ -95,9 +96,7 @@ $gallery = $item->getPreviewGallery();
<?= $item->DETAIL_TEXT ?>
</div>
</div>
<div class="project-shar"><a><div class="ya-share2" data-services="facebook,vkontakte,whatsapp,skype,telegram"></div></a></div>
<? if(($youtubeId = $item->getPropValue('YOUTUBE_URL')) && $youtubeId = getYoutubeId($youtubeId)) { ?>
<? if (($youtubeId = $item->getPropValue('YOUTUBE_URL')) && $youtubeId = getYoutubeId($youtubeId)) { ?>
<?
$youtubePreview = $item->hasFile('YOUTUBE_PREVIEW')
? $item->getImageThumb('YOUTUBE_PREVIEW', array('width' => 540, 'height' => 320, 'type' => 'put_out'))
......@@ -106,8 +105,10 @@ $gallery = $item->getPreviewGallery();
$youtubeText = $item->getPropValue('YOUTUBE_TEXT');
?>
<div class="project-reviews">
<a href="https://www.youtube.com/embed/<?= $youtubeId ?>?autoplay=1" class="project-reviews-item fancybox fancybox.iframe" style="background-image: url(<?= $youtubePreview ?>)">
<? if($youtubeTitle || $youtubeText) { ?>
<a href="https://www.youtube.com/embed/<?= $youtubeId ?>?autoplay=1"
class="project-reviews-item fancybox fancybox.iframe"
style="background-image: url(<?= $youtubePreview ?>)">
<? if ($youtubeTitle || $youtubeText) { ?>
<span class="project-reviews-item-text">
<span class="project-reviews-item-title"><?= $youtubeTitle ?></span>
<span class="project-reviews-item-date"><?= $youtubeText ?></span>
......@@ -118,12 +119,16 @@ $gallery = $item->getPreviewGallery();
</div>
<? } ?>
<a href="#order_price" class='project-price-order js-order-project'>Узнать стоимость проекта</a>
<div class="project-shar"><a>
<div class="ya-share2" data-services="facebook,vkontakte,whatsapp,skype,telegram"></div>
</a></div>
<h3 class="project-similar-title">Похожие проекты</h3>
<ul class="project-similar tiles js-tiles js-more-container projects-list" data-url="/ajax/project.php?similar-project=<?= $item->ID ?>">
<ul class="project-similar tiles js-tiles js-more-container projects-list"
data-url="/ajax/project.php?similar-project=<?= $item->ID ?>">
<? require INCLUDE_PATH . 'project-list.php' ?>
</ul>
<? if($arResult['REMAIN'] > 0) { ?>
<? if ($arResult['REMAIN'] > 0) { ?>
<div class="icon-preloader js-more-icon-preloader" data-mode="auto">Загрузка...</div>
<? } ?>
</div>
......@@ -131,6 +136,5 @@ $gallery = $item->getPreviewGallery();
</div>
<?$APPLICATION->IncludeComponent('cpeople:form', 'feedback_project_popup', array('PROJECT_CODE' => $arResult['ITEM']->CODE))?>
<?$APPLICATION->IncludeComponent('cpeople:form', 'feedback_project_popup_order', array('PROJECT_CODE' => $arResult['ITEM']->CODE))?>
<? $APPLICATION->IncludeComponent('cpeople:form', 'feedback_project_popup', array('PROJECT_CODE' => $arResult['ITEM']->CODE)) ?>
<? $APPLICATION->IncludeComponent('cpeople:form', 'feedback_project_popup_order', array('PROJECT_CODE' => $arResult['ITEM']->CODE)) ?>
local/components/cpeople/project/templates/.default/template.php
......@@ -12,6 +12,3 @@ include 'header-filter.php';
<?
include 'project-list.php';
?>
\ 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!