Skip to content

U
udvgroup.na4u.ru
Commit 046ccad3 authored by Владимир Акимов's avatar Владимир Акимов
Browse files
Options

Правки багов

parent 6bdb489c
Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 104 deletions
include/bonus.php
View file @ 046ccad3
...@@ -352,7 +352,7 @@ while ($ob = $res->GetNextElement()) { ...@@ -352,7 +352,7 @@ while ($ob = $res->GetNextElement()) {
<p> <p>
<?=$text?> <?=$text?>
</p> </p>
<a href="mailto:<?=$btnEmail?>" class="button button--size-xl-m bonus__button"><span <a href="<?=$btnEmail?>" class="button button--size-xl-m bonus__button"><span
class="button__text"><?=$btnText?></span><span class="button__icon"> class="button__text"><?=$btnText?></span><span class="button__icon">
<svg width="1em" height="1em" viewBox="0 0 20 20" data-icon="icon-arrow-up-right"> <svg width="1em" height="1em" viewBox="0 0 20 20" data-icon="icon-arrow-up-right">
......
local/templates/newudv/.styles.php
View file @ 046ccad3
<? <?
return array ( return array (
'' =>
array (
'tag' => 'blockquote',
'title' => 'Цитата',
'html' => '<blockquote>Цитата</blockquote>',
),
'article__content' => 'article__content' =>
array ( array (
'tag' => 'article', 'tag' => 'article',
'title' => 'Статьи', 'title' => 'Статьи',
'html' => '<article class="article__content" id="key">Статьи</article>', 'html' => '<article class="article__content">Статьи (article)</article>',
), ),
); );
?> ?>
\ No newline at end of file
local/templates/newudv/components/bitrix/news.list/banner_main/template.php
View file @ 046ccad3
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
$this->setFrameMode(true); $this->setFrameMode(true);
?> ?>
<section class="page-section page-section--p-t-header"> <section class="page-section page-section--p-t-header">
<div class="hero" data-animate="hero-block"> <div class="hero hero--index hero--img-higher" data-animate="hero-block">
<div class="container container--no-p"> <div class="container container--no-p">
<?php foreach ($arResult["ITEMS"] as $arItem) : ?> <?php foreach ($arResult["ITEMS"] as $arItem) : ?>
<? <?
...@@ -100,4 +100,4 @@ $this->setFrameMode(true); ...@@ -100,4 +100,4 @@ $this->setFrameMode(true);
<? endforeach; ?> <? endforeach; ?>
</div> </div>
</div> </div>
</section> </section>
\ No newline at end of file
local/templates/newudv/components/bitrix/news.list/events_tags/template.php
View file @ 046ccad3
...@@ -11,23 +11,6 @@ ...@@ -11,23 +11,6 @@
/** @var string $componentPath */ /** @var string $componentPath */
/** @var CBitrixComponent $component */ /** @var CBitrixComponent $component */
$this->setFrameMode(true); $this->setFrameMode(true);
if ($_GET['line']){
?>
<style>
.events__list li {
display: none;
}
.events__list li[data-hash="<?=$_GET['line']?>"] {
display: block;
}
.events__bottom{
display: none;
}
</style>
<?php
}
?> ?>
<div id="page"> <div id="page">
......
local/templates/newudv/components/bitrix/news/events/bitrix/news.detail/.default/result_modifier.php
View file @ 046ccad3
...@@ -93,7 +93,7 @@ if (!empty($arResult['PROPERTIES']['SPIKERS']['VALUE'])) { ...@@ -93,7 +93,7 @@ if (!empty($arResult['PROPERTIES']['SPIKERS']['VALUE'])) {
$IblockId=71;// инфоблок $IblockId=71;// инфоблок
if ($arResult['PROPERTIES']['LINE']['VALUE']=="онлайн"){ if ($arResult['PROPERTIES']['LINE']['VALUE']=="онлайн"){
$id=516; $id=516;
} else $id=517; } else $id=457;
$arFilter = Array( $arFilter = Array(
"IBLOCK_ID"=>$IblockId, "IBLOCK_ID"=>$IblockId,
"ACTIVE"=>"Y", "ACTIVE"=>"Y",
......
local/templates/newudv/components/bitrix/news/events/bitrix/news.detail/.default/template.php
View file @ 046ccad3
...@@ -325,8 +325,9 @@ if (is_array($arResult["PROPERTIES"]['H2_WHY']["VALUE"])){ ...@@ -325,8 +325,9 @@ if (is_array($arResult["PROPERTIES"]['H2_WHY']["VALUE"])){
<ul class="socials__list"> <ul class="socials__list">
<?if ($arResult['PROPERTIES']['VK']['VALUE']){?> <?if ($arResult['PROPERTIES']['VK']['VALUE']){?>
<li class="socials__item"> <li class="socials__item">
<a target="_blank" class="socials__link" <button target="_blank" class="socials__link"
href="<?=$arResult['PROPERTIES']['VK']['VALUE']?>" aria-label="Вконтакте"> data-href="<?=$arResult['PROPERTIES']['VK']['VALUE']?>"
aria-label="Вконтакте">
<span class="socials__icon"> <span class="socials__icon">
<img src="<?=SITE_TEMPLATE_PATH?>/images/svg/vk-dark.svg" alt="Картинка" width="24" height="24" <img src="<?=SITE_TEMPLATE_PATH?>/images/svg/vk-dark.svg" alt="Картинка" width="24" height="24"
loading="lazy"> loading="lazy">
...@@ -334,12 +335,12 @@ if (is_array($arResult["PROPERTIES"]['H2_WHY']["VALUE"])){ ...@@ -334,12 +335,12 @@ if (is_array($arResult["PROPERTIES"]['H2_WHY']["VALUE"])){
<span class="socials__icon socials__icon--hover"> <span class="socials__icon socials__icon--hover">
<img src="<?=SITE_TEMPLATE_PATH?>/images/svg/vk-green.svg" alt="Картинка" width="24" height="24" loading="lazy"> <img src="<?=SITE_TEMPLATE_PATH?>/images/svg/vk-green.svg" alt="Картинка" width="24" height="24" loading="lazy">
</span> </span>
</a> </button>
</li> </li>
<?}?> <?}?>
<?if ($arResult['PROPERTIES']['TELEGRAM']['VALUE']){?> <?if ($arResult['PROPERTIES']['TELEGRAM']['VALUE']){?>
<li class="socials__item"> <li class="socials__item">
<a target="_blank" class="socials__link" href="<?=$arResult['PROPERTIES']['TELEGRAM']['VALUE']?>" <button target="_blank" class="socials__link" data-href="<?=$arResult['PROPERTIES']['TELEGRAM']['VALUE']?>"
aria-label="Телеграм"> aria-label="Телеграм">
<span class="socials__icon"> <span class="socials__icon">
<img src="<?=SITE_TEMPLATE_PATH?>/images/svg/tg-dark.svg" alt="Картинка" width="24" height="24" loading="lazy"> <img src="<?=SITE_TEMPLATE_PATH?>/images/svg/tg-dark.svg" alt="Картинка" width="24" height="24" loading="lazy">
...@@ -347,13 +348,14 @@ if (is_array($arResult["PROPERTIES"]['H2_WHY']["VALUE"])){ ...@@ -347,13 +348,14 @@ if (is_array($arResult["PROPERTIES"]['H2_WHY']["VALUE"])){
<span class="socials__icon socials__icon--hover"> <span class="socials__icon socials__icon--hover">
<img src="<?=SITE_TEMPLATE_PATH?>/images/svg/tg-green.svg" alt="Картинка" width="24" height="24" loading="lazy"> <img src="<?=SITE_TEMPLATE_PATH?>/images/svg/tg-green.svg" alt="Картинка" width="24" height="24" loading="lazy">
</span> </span>
</a> </button>
</li> </li>
<?}?> <?}?>
<?if ($arResult['PROPERTIES']['WHATSUP']['VALUE']){?> <?if ($arResult['PROPERTIES']['WHATSUP']['VALUE']){?>
<li class="socials__item"> <li class="socials__item">
<a target="_blank" class="socials__link" <button target="_blank" class="socials__link"
href="<?=$arResult['PROPERTIES']['WHATSUP']['VALUE']?>" aria-label="Whatsapp"> data-href="<?=$arResult['PROPERTIES']['WHATSUP']['VALUE']?>"
aria-label="Whatsapp">
<span class="socials__icon"> <span class="socials__icon">
<img src="<?=SITE_TEMPLATE_PATH?>/images/svg/whatsapp-dark.svg" alt="Картинка" width="24" height="24" loading="lazy"> <img src="<?=SITE_TEMPLATE_PATH?>/images/svg/whatsapp-dark.svg" alt="Картинка" width="24" height="24" loading="lazy">
</span> </span>
...@@ -361,7 +363,7 @@ if (is_array($arResult["PROPERTIES"]['H2_WHY']["VALUE"])){ ...@@ -361,7 +363,7 @@ if (is_array($arResult["PROPERTIES"]['H2_WHY']["VALUE"])){
<img src="<?=SITE_TEMPLATE_PATH?>/images/svg/whatsapp-green.svg" alt="Картинка" width="24" height="24" loading="lazy"> <img src="<?=SITE_TEMPLATE_PATH?>/images/svg/whatsapp-green.svg" alt="Картинка" width="24" height="24" loading="lazy">
</span> </span>
</a> </button>
</li> </li>
<?}?> <?}?>
<li class="socials__item"> <li class="socials__item">
......
local/templates/newudv/components/bitrix/news/events/bitrix/news.list/.default/template.php
View file @ 046ccad3
...@@ -57,12 +57,14 @@ $this->setFrameMode(true); ...@@ -57,12 +57,14 @@ $this->setFrameMode(true);
<?}?> <?}?>
</p> </p>
</div> </div>
<div id="page2"></div>
<div class="events__article-controls-wrap"> <div class="events__article-controls-wrap">
<div class="article-controls swiper events__article-controls article-controls--horizontal" data-tabs-controls-slider="container"> <div class="article-controls swiper events__article-controls article-controls--horizontal" data-tabs-controls-slider="container">
<ul class="article-controls__list swiper-wrapper" data-tabs-controls-slider="wrapper"> <ul class="article-controls__list swiper-wrapper" data-tabs-controls-slider="wrapper">
<li class="article-controls__item swiper-slide" data-tabs-controls-slider="slide"> <li class="article-controls__item swiper-slide" data-tabs-controls-slider="slide">
<a href="/about/events/"> <a href="#page2" class="all-events">
<button class="article-controls__btn is-active" data-articles="all"> <button class="article-controls__btn <?=(!$_GET['line'])?'is-active':''?>"
data-articles="all">
<span class="article-controls__icon"> <span class="article-controls__icon">
<svg width="0.93em" height="1em" viewBox="0 0 12 13" data-icon="icon-right"> <svg width="0.93em" height="1em" viewBox="0 0 12 13" data-icon="icon-right">
...@@ -76,8 +78,9 @@ $this->setFrameMode(true); ...@@ -76,8 +78,9 @@ $this->setFrameMode(true);
</li> </li>
<li class="article-controls__item swiper-slide" data-tabs-controls-slider="slide"> <li class="article-controls__item swiper-slide" data-tabs-controls-slider="slide">
<a class="line-link" data-name="online" href="?line=online#page"> <a class="line-link" data-name="online" href="?line=7#page2">
<button class="article-controls__btn" data-articles="eco"> <button class="article-controls__btn <?=($_GET['line']==7)?'is-active':''?>"
data-articles="eco">
<span class="article-controls__icon"> <span class="article-controls__icon">
<svg width="0.93em" height="1em" viewBox="0 0 12 13" data-icon="icon-right"> <svg width="0.93em" height="1em" viewBox="0 0 12 13" data-icon="icon-right">
...@@ -90,8 +93,9 @@ $this->setFrameMode(true); ...@@ -90,8 +93,9 @@ $this->setFrameMode(true);
</a> </a>
</li> </li>
<li class="article-controls__item swiper-slide" data-tabs-controls-slider="slide"> <li class="article-controls__item swiper-slide" data-tabs-controls-slider="slide">
<a class="line-link" data-name="offline" href="?line=offline#page"> <a class="line-link" data-name="offline" href="?line=8#page2">
<button class="article-controls__btn" data-articles="eco"> <button class="article-controls__btn <?=($_GET['line']==8)?'is-active':''?>"
data-articles="eco">
<span class="article-controls__icon"> <span class="article-controls__icon">
<svg width="0.93em" height="1em" viewBox="0 0 12 13" data-icon="icon-right"> <svg width="0.93em" height="1em" viewBox="0 0 12 13" data-icon="icon-right">
...@@ -129,6 +133,9 @@ $this->setFrameMode(true); ...@@ -129,6 +133,9 @@ $this->setFrameMode(true);
if ($_GET['search']){ if ($_GET['search']){
$GLOBALS['arrFilter']= array('?NAME' => $_GET['search']); $GLOBALS['arrFilter']= array('?NAME' => $_GET['search']);
} }
if ($_GET['line']){
$GLOBALS['arrFilter']['PROPERTY_LINE']=$_GET['line'];
}
$APPLICATION->IncludeComponent( $APPLICATION->IncludeComponent(
......
local/templates/newudv/components/bitrix/news/news/bitrix/news.detail/.default/result_modifier.php
View file @ 046ccad3
...@@ -17,7 +17,7 @@ $arFilter = Array( ...@@ -17,7 +17,7 @@ $arFilter = Array(
"!ID"=>$arResult['ID'] "!ID"=>$arResult['ID']
); );
$res = CIBlockElement::GetList(Array("ID"=>"DESC"), $arFilter, false, array('nTopCount'=>3), $arSelect); $res = CIBlockElement::GetList(Array("PROPERTY_DATE"=>"DESC"), $arFilter, false, array('nTopCount'=>3), $arSelect);
while($ob = $res->GetNextElement()) { while($ob = $res->GetNextElement()) {
$arItem = $ob->GetFields(); $arItem = $ob->GetFields();
$arItem['PREVIEW_PICTURE']= CFile::GetFileArray($arItem['PREVIEW_PICTURE']); $arItem['PREVIEW_PICTURE']= CFile::GetFileArray($arItem['PREVIEW_PICTURE']);
......
local/templates/newudv/components/bitrix/news/news/bitrix/news.detail/.default/template.php
View file @ 046ccad3
...@@ -97,10 +97,6 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']) { ...@@ -97,10 +97,6 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']) {
</div> </div>
<? } ?> <? } ?>
</div> </div>
</article>
<div class="article__main-wrap">
<div class="article__main">
<article class="article__content" id="key">
<? if ($arResult['DETAIL_PICTURE']['SRC']) { <? if ($arResult['DETAIL_PICTURE']['SRC']) {
$imgSrcMob = CFile::GetPath($arResult["PROPERTIES"]['DETAIL_PICTURE_MOB']['VALUE']); $imgSrcMob = CFile::GetPath($arResult["PROPERTIES"]['DETAIL_PICTURE_MOB']['VALUE']);
?> ?>
...@@ -119,7 +115,10 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']) { ...@@ -119,7 +115,10 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']) {
<p> <p>
<?= $arResult['PREVIEW_TEXT'] ?> <?= $arResult['PREVIEW_TEXT'] ?>
</p> </p>
</article> </article>
<div class="article__main-wrap">
<div class="article__main">
<?= $arResult['DETAIL_TEXT'] ?> <?= $arResult['DETAIL_TEXT'] ?>
<div class="article__bottom"> <div class="article__bottom">
<? if ($arResult['PROPERTIES']['AUTHOR']['VALUE'] && $arResult['PROPERTIES']['AUTHOR_TEXT']['VALUE']) { ?> <? if ($arResult['PROPERTIES']['AUTHOR']['VALUE'] && $arResult['PROPERTIES']['AUTHOR_TEXT']['VALUE']) { ?>
...@@ -155,7 +154,7 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']) { ...@@ -155,7 +154,7 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']) {
<div class="item-info item-info--article"> <div class="item-info item-info--article">
<div class="item-info__wrap"> <div class="item-info__wrap">
<? if ($arResult['PROPERTIES']["HASHTAG"]["VALUE"]): ?> <? if ($arResult['PROPERTIES']["HASHTAG"]["VALUE"]): ?>
<a href="<?= $arResult['PROPERTIES']["HASHTAG_LINK"]["VALUE"] ?>?hash=<?= $arResult['PROPERTIES']["HASHTAG"]["VALUE"] ?>" <a href="/about/blog/?hash=<?= $arResult['PROPERTIES']["HASHTAG"]["VALUE"] ?>#page2"
class="item-info__category"><?= $arResult['PROPERTIES']["HASHTAG"]["VALUE"] ?></a> class="item-info__category"><?= $arResult['PROPERTIES']["HASHTAG"]["VALUE"] ?></a>
<? endif; ?> <? endif; ?>
<time class="item-info__date" <time class="item-info__date"
...@@ -178,8 +177,8 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']) { ...@@ -178,8 +177,8 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']) {
<ul class="socials__list"> <ul class="socials__list">
<? if ($arResult['PROPERTIES']['VK']['VALUE']) { ?> <? if ($arResult['PROPERTIES']['VK']['VALUE']) { ?>
<li class="socials__item"> <li class="socials__item">
<a target="_blank" class="socials__link" <button target="_blank" class="socials__link"
href="<?= $arResult['PROPERTIES']['VK']['VALUE'] ?>" data-href="<?= $arResult['PROPERTIES']['VK']['VALUE'] ?>"
aria-label="Вконтакте"> aria-label="Вконтакте">
<span class="socials__icon"> <span class="socials__icon">
<img src="<?= SITE_TEMPLATE_PATH ?>/images/svg/vk-dark.svg" <img src="<?= SITE_TEMPLATE_PATH ?>/images/svg/vk-dark.svg"
...@@ -190,13 +189,13 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']) { ...@@ -190,13 +189,13 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']) {
<img src="<?= SITE_TEMPLATE_PATH ?>/images/svg/vk-green.svg" <img src="<?= SITE_TEMPLATE_PATH ?>/images/svg/vk-green.svg"
alt="Картинка" width="24" height="24" loading="lazy"> alt="Картинка" width="24" height="24" loading="lazy">
</span> </span>
</a> </button>
</li> </li>
<? } ?> <? } ?>
<? if ($arResult['PROPERTIES']['TELEGRAM']['VALUE']) { ?> <? if ($arResult['PROPERTIES']['TELEGRAM']['VALUE']) { ?>
<li class="socials__item"> <li class="socials__item">
<a target="_blank" class="socials__link" <button target="_blank" class="socials__link"
href="<?= $arResult['PROPERTIES']['TELEGRAM']['VALUE'] ?>" data-href="<?= $arResult['PROPERTIES']['TELEGRAM']['VALUE'] ?>"
aria-label="Телеграм"> aria-label="Телеграм">
<span class="socials__icon"> <span class="socials__icon">
<img src="<?= SITE_TEMPLATE_PATH ?>/images/svg/tg-dark.svg" <img src="<?= SITE_TEMPLATE_PATH ?>/images/svg/tg-dark.svg"
...@@ -206,13 +205,13 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']) { ...@@ -206,13 +205,13 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']) {
<img src="<?= SITE_TEMPLATE_PATH ?>/images/svg/tg-green.svg" <img src="<?= SITE_TEMPLATE_PATH ?>/images/svg/tg-green.svg"
alt="Картинка" width="24" height="24" loading="lazy"> alt="Картинка" width="24" height="24" loading="lazy">
</span> </span>
</a> </button>
</li> </li>
<? } ?> <? } ?>
<? if ($arResult['PROPERTIES']['WHATSUP']['VALUE']) { ?> <? if ($arResult['PROPERTIES']['WHATSUP']['VALUE']) { ?>
<li class="socials__item"> <li class="socials__item">
<a target="_blank" class="socials__link" <button target="_blank" class="socials__link"
href="<?= $arResult['PROPERTIES']['WHATSUP']['VALUE'] ?>" data-href="<?= $arResult['PROPERTIES']['WHATSUP']['VALUE'] ?>"
aria-label="Whatsapp"> aria-label="Whatsapp">
<span class="socials__icon"> <span class="socials__icon">
<img src="<?= SITE_TEMPLATE_PATH ?>/images/svg/whatsapp-dark.svg" <img src="<?= SITE_TEMPLATE_PATH ?>/images/svg/whatsapp-dark.svg"
...@@ -223,7 +222,7 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']) { ...@@ -223,7 +222,7 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']) {
alt="Картинка" width="24" height="24" loading="lazy"> alt="Картинка" width="24" height="24" loading="lazy">
</span> </span>
</a> </button>
</li> </li>
<? } ?> <? } ?>
<li class="socials__item"> <li class="socials__item">
......
local/templates/newudv/components/bitrix/news/news/bitrix/news.list/.default/result_modifier.php
View file @ 046ccad3
...@@ -23,7 +23,9 @@ if (!empty($arResult["ITEMS"])) { ...@@ -23,7 +23,9 @@ if (!empty($arResult["ITEMS"])) {
$arResult['MAIN']=$arResult['ITEMS'][0]; $arResult['MAIN']=$arResult['ITEMS'][0];
unset($arResult['ITEMS'][0]); unset($arResult['ITEMS'][0]);
$arResult['MAIN']['PREVIEW_PICTURE_MOB']=CFile::GetPath($arResult['MAIN']['PROPERTIES']['PREVIEW_PICTURE_MOB']['VALUE']);
//хештеги //хештеги
$arResult['HASHTAGS']=[]; $arResult['HASHTAGS']=[];
$arFilter = Array( $arFilter = Array(
"IBLOCK_ID"=>$arParams['IBLOCK_ID'], "IBLOCK_ID"=>$arParams['IBLOCK_ID'],
...@@ -69,7 +71,7 @@ $IblockId=71;// инфоблок ...@@ -69,7 +71,7 @@ $IblockId=71;// инфоблок
$arFilter = Array( $arFilter = Array(
"IBLOCK_ID"=>$IblockId, "IBLOCK_ID"=>$IblockId,
"ACTIVE"=>"Y", "ACTIVE"=>"Y",
"ID"=>525 "ID"=>458
); );
$arSelect = Array("ID", "IBLOCK_ID", "NAME","PREVIEW_TEXT","PROPERTY_TITLE","PROPERTY_TAG","PROPERTY_BOOK");//IBLOCK_ID и ID $arSelect = Array("ID", "IBLOCK_ID", "NAME","PREVIEW_TEXT","PROPERTY_TITLE","PROPERTY_TAG","PROPERTY_BOOK");//IBLOCK_ID и ID
......
local/templates/newudv/components/bitrix/news/news/bitrix/news.list/.default/template.php
View file @ 046ccad3
...@@ -95,7 +95,7 @@ if ($_GET['hash']){ ...@@ -95,7 +95,7 @@ if ($_GET['hash']){
$arResult['MAIN']['PREVIEW_PICTURE']['SRC'] ?>, <?= $arResult['MAIN']['PREVIEW_PICTURE']['SRC'] ?>" $arResult['MAIN']['PREVIEW_PICTURE']['SRC'] ?>, <?= $arResult['MAIN']['PREVIEW_PICTURE']['SRC'] ?>"
type="image/webp"> type="image/webp">
<source media="(max-width: 767px)" <source media="(max-width: 767px)"
srcset="<?= $arResult['MAIN']['PREVIEW_PICTURE']['SRC'] ?>, <?= $arResult['MAIN']['PREVIEW_PICTURE']['SRC'] ?>, <?= $arResult['MAIN']['PREVIEW_PICTURE']['SRC'] ?>" srcset="<?= $arResult['MAIN']['PREVIEW_PICTURE_MOB']?>"
type="image/webp"> type="image/webp">
<img src="<?= $arResult['MAIN']['PREVIEW_PICTURE']["SRC"] ?>" <img src="<?= $arResult['MAIN']['PREVIEW_PICTURE']["SRC"] ?>"
srcset="<?= $arResult['MAIN']['PREVIEW_PICTURE']['SRC'] ?>, <?= $arResult['MAIN']['PREVIEW_PICTURE']['SRC'] ?>" srcset="<?= $arResult['MAIN']['PREVIEW_PICTURE']['SRC'] ?>, <?= $arResult['MAIN']['PREVIEW_PICTURE']['SRC'] ?>"
...@@ -221,7 +221,8 @@ if ($_GET['hash']){ ...@@ -221,7 +221,8 @@ if ($_GET['hash']){
<span class="custom-toggle__label"> <span class="custom-toggle__label">
<span class="custom-toggle__label-text">Я согласен с <a href="#">Политикой конфиденциальности</a></span> <span class="custom-toggle__label-text">Я согласен на обработку персональных данных в соответствии с <a href="/privacy/">Политикой
конфиденциальности</a></span>
<span class="custom-toggle__label-icon"> <span class="custom-toggle__label-icon">
<svg width="1em" height="1em" viewBox="0 0 20 20" data-icon="icon-arrow-up-right"> <svg width="1em" height="1em" viewBox="0 0 20 20" data-icon="icon-arrow-up-right">
...@@ -293,7 +294,9 @@ if ($_GET['hash']){ ...@@ -293,7 +294,9 @@ if ($_GET['hash']){
$GLOBALS['arrFilter'] = array('!ID' => $arResult['MAIN']['ID']); $GLOBALS['arrFilter'] = array('!ID' => $arResult['MAIN']['ID']);
if ($_GET['hash']){ if ($_GET['hash']){
$GLOBALS['arrFilter']['PROPERTY_HASHTAG']=$_GET['hash']; $GLOBALS['arrFilter']['PROPERTY_HASHTAG']=$_GET['hash'];
} $newsCount=10000000;
} else $newsCount=9;
$APPLICATION->IncludeComponent( $APPLICATION->IncludeComponent(
"bitrix:news.list", "bitrix:news.list",
"news_tags", "news_tags",
...@@ -301,7 +304,7 @@ if ($_GET['hash']){ ...@@ -301,7 +304,7 @@ if ($_GET['hash']){
"USE_FILTER" => "Y", "USE_FILTER" => "Y",
"IBLOCK_TYPE" => $arParams["IBLOCK_TYPE"], "IBLOCK_TYPE" => $arParams["IBLOCK_TYPE"],
"IBLOCK_ID" => $arParams["IBLOCK_ID"], "IBLOCK_ID" => $arParams["IBLOCK_ID"],
"NEWS_COUNT" => $arParams["NEWS_COUNT"], "NEWS_COUNT" => $newsCount,
"SORT_BY1" => $arParams["SORT_BY1"], "SORT_BY1" => $arParams["SORT_BY1"],
"SORT_ORDER1" => $arParams["SORT_ORDER1"], "SORT_ORDER1" => $arParams["SORT_ORDER1"],
"SORT_BY2" => $arParams["SORT_BY2"], "SORT_BY2" => $arParams["SORT_BY2"],
...@@ -321,7 +324,7 @@ if ($_GET['hash']){ ...@@ -321,7 +324,7 @@ if ($_GET['hash']){
"ADD_SECTIONS_CHAIN" => $arParams["ADD_SECTIONS_CHAIN"], "ADD_SECTIONS_CHAIN" => $arParams["ADD_SECTIONS_CHAIN"],
"CACHE_TYPE" => $arParams["CACHE_TYPE"], "CACHE_TYPE" => $arParams["CACHE_TYPE"],
"CACHE_TIME" => $arParams["CACHE_TIME"], "CACHE_TIME" => $arParams["CACHE_TIME"],
"CACHE_FILTER" => 0, "CACHE_FILTER" => "N",
"CACHE_GROUPS" => $arParams["CACHE_GROUPS"], "CACHE_GROUPS" => $arParams["CACHE_GROUPS"],
"DISPLAY_TOP_PAGER" => $arParams["DISPLAY_TOP_PAGER"], "DISPLAY_TOP_PAGER" => $arParams["DISPLAY_TOP_PAGER"],
"DISPLAY_BOTTOM_PAGER" => $arParams["DISPLAY_BOTTOM_PAGER"], "DISPLAY_BOTTOM_PAGER" => $arParams["DISPLAY_BOTTOM_PAGER"],
......
local/templates/newudv/components/bitrix/news/products/bitrix/news.detail/.default/result_modifier.php
View file @ 046ccad3
...@@ -47,8 +47,6 @@ if (!empty($arResult['PROPERTIES']['FAQ']['VALUE'])) { ...@@ -47,8 +47,6 @@ if (!empty($arResult['PROPERTIES']['FAQ']['VALUE'])) {
} }
$vk=str_replace("https://vk.com/video-", "",$arResult['PROPERTIES']['VIDEO_LINK']['VALUE']); $vk=str_replace("https://vk.com/video-", "",$arResult['PROPERTIES']['VIDEO_LINK']['VALUE']);
$arResult['VK_LINK']=explode("_",$vk); $arResult['VK_LINK']=explode("_",$vk);
$arResult["PREZENT_DATE"] = CIBlockFormatProperties::DateFormat('d.m.Y H:s', MakeTimeStamp($arResult["PROPERTIES"]["PREZENT_DATE"]["VALUE"], CSite::GetDateFormat())); $arResult["PREZENT_DATE"] = CIBlockFormatProperties::DateFormat('d.m.Y H:s', MakeTimeStamp($arResult["PROPERTIES"]["PREZENT_DATE"]["VALUE"], CSite::GetDateFormat()));
......
local/templates/newudv/components/bitrix/news/products/bitrix/news.detail/.default/template.php
View file @ 046ccad3
...@@ -886,25 +886,33 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']){ ...@@ -886,25 +886,33 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']){
<ul class="materials__documents-list"> <ul class="materials__documents-list">
<? foreach ($arResult['DOCUMENTS'] as $k=>$item) { <? foreach ($arResult['DOCUMENTS'] as $k=>$item) {
if ($k==2) break; if ($k==2) break;
$file=CFile::GetFileArray($item['PROPERTIES']['DOCUMENT']['VALUE']); if ($item['PROPERTIES']['DOCUMENT']['VALUE']) {
$type=explode("/",$file['CONTENT_TYPE']); $file = CFile::GetFileArray($item['PROPERTIES']['DOCUMENT']['VALUE']);
$size=round($file['FILE_SIZE']/1000); $type = explode("/", $file['CONTENT_TYPE']);
$size = round($file['FILE_SIZE'] / 1000);
$svg="file.svg";
} elseif ($item['PROPERTIES']['LINK']['VALUE']) {
$svg="link.svg";
$file['SRC']=$item['PROPERTIES']['LINK']['VALUE'];
}
?> ?>
<li class="materials__documents-item"> <li class="materials__documents-item">
<div class="document-link materials__document-link"> <div class="document-link materials__document-link">
<a target="_blank" class="document-link__inner" type="download" <a target="_blank" class="document-link__inner" type="download"
href="<?=$file['SRC']?>"> href="<?=$file['SRC']?>">
<div class="document-link__icon"> <div class="document-link__icon">
<img src="<?=SITE_TEMPLATE_PATH?>/images/svg/file.svg" <img src="<?=SITE_TEMPLATE_PATH?>/images/svg/<?=$svg?>"
alt="Картинка" width="24" alt="Картинка" width="24"
height="24" loading="lazy"> height="24" loading="lazy">
</div> </div>
<div class="document-link__data-wrap"> <div class="document-link__data-wrap">
<p class="document-link__title"><?=$item['NAME']?></p> <p class="document-link__title"><?=$item['NAME']?></p>
<span class="document-link__file-data"> <?if ($item['PROPERTIES']['DOCUMENT']['VALUE']){?>
<span class="document-link__file-data">
<?=mb_strtoupper($type[1])?>, <?=mb_strtoupper($type[1])?>,
<?=$size?> <?=$size?>
KB</span> KB</span>
<?}?>
</div> </div>
</a> </a>
</div> </div>
...@@ -917,25 +925,33 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']){ ...@@ -917,25 +925,33 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']){
<ul class="materials__documents-list"> <ul class="materials__documents-list">
<? foreach ($arResult['DOCUMENTS'] as $k=>$item) { <? foreach ($arResult['DOCUMENTS'] as $k=>$item) {
if ($k<2) continue; if ($k<2) continue;
$file=CFile::GetFileArray($item['PROPERTIES']['DOCUMENT']['VALUE']); if ($item['PROPERTIES']['DOCUMENT']['VALUE']) {
$type=explode("/",$file['CONTENT_TYPE']); $file = CFile::GetFileArray($item['PROPERTIES']['DOCUMENT']['VALUE']);
$size=round($file['FILE_SIZE']/1000); $type = explode("/", $file['CONTENT_TYPE']);
$size = round($file['FILE_SIZE'] / 1000);
$svg="file.svg";
} elseif ($item['PROPERTIES']['LINK']['VALUE']) {
$svg="link.svg";
$file['SRC']=$item['PROPERTIES']['LINK']['VALUE'];
}
?> ?>
<li class="materials__documents-item"> <li class="materials__documents-item">
<div class="document-link materials__document-link"> <div class="document-link materials__document-link">
<a target="_blank" class="document-link__inner" type="download" <a target="_blank" class="document-link__inner" type="download"
href="<?=$file['SRC']?>"> href="<?=$file['SRC']?>">
<div class="document-link__icon"> <div class="document-link__icon">
<img src="<?=SITE_TEMPLATE_PATH?>/images/svg/file.svg" <img src="<?=SITE_TEMPLATE_PATH?>/images/svg/<?=$svg?>"
alt="Картинка" width="24" alt="Картинка" width="24"
height="24" loading="lazy"> height="24" loading="lazy">
</div> </div>
<div class="document-link__data-wrap"> <div class="document-link__data-wrap">
<p class="document-link__title"><?=$item['NAME']?></p> <p class="document-link__title"><?=$item['NAME']?></p>
<span class="document-link__file-data"> <?if ($item['PROPERTIES']['DOCUMENT']['VALUE']){?>
<span class="document-link__file-data">
<?=mb_strtoupper($type[1])?>, <?=mb_strtoupper($type[1])?>,
<?=$size?> <?=$size?>
KB</span> KB</span>
<?}?>
</div> </div>
</a> </a>
</div> </div>
......
local/templates/newudv/components/bitrix/news/solutions/bitrix/news.detail/.default/template.php
View file @ 046ccad3
...@@ -31,14 +31,6 @@ if (!$img767) { ...@@ -31,14 +31,6 @@ if (!$img767) {
} }
$im768 = CFile::GetPath($arResult["PROPERTIES"]['IMG_768']["VALUE"]);
if (!$im768) {
$im768 = SITE_TEMPLATE_PATH . "/images/hero/hero-solutions-cloud-xl.webp";
}
$im767 = CFile::GetPath($arResult["PROPERTIES"]['IMG_767']["VALUE"]);
if (!$im767) {
$im767 = SITE_TEMPLATE_PATH . "/images/hero/hero-solutions-cloud.webp";
}
//архитектура //архитектура
$arch = CFile::GetPath($arResult["PROPERTIES"]['SOLUTION_IMG']["VALUE"]); $arch = CFile::GetPath($arResult["PROPERTIES"]['SOLUTION_IMG']["VALUE"]);
$arch1921 = CFile::GetPath($arResult["PROPERTIES"]['SOLUTION_IMG_1921']["VALUE"]); $arch1921 = CFile::GetPath($arResult["PROPERTIES"]['SOLUTION_IMG_1921']["VALUE"]);
...@@ -169,10 +161,10 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']){ ...@@ -169,10 +161,10 @@ if ($arResult['PROPERTIES']['NAME']['VALUE']){
<picture> <picture>
<source media="(min-width: 768px)" <source media="(min-width: 768px)"
srcset="<?= $im768 ?>" srcset="<?= $arResult["DETAIL_PICTURE"]["SRC"] ?>"
type="image/webp"> type="image/webp">
<source media="(max-width: 767px)" <source media="(max-width: 767px)"
srcset="<?= $im767 ?>" srcset="<?= $arResult["DETAIL_PICTURE"]["SRC"] ?>"
type="image/webp"> type="image/webp">
<img src="<?= $arResult["DETAIL_PICTURE"]["SRC"] ?>" <img src="<?= $arResult["DETAIL_PICTURE"]["SRC"] ?>"
srcset="<?= $arResult["DETAIL_PICTURE"]["SRC"] ?>" srcset="<?= $arResult["DETAIL_PICTURE"]["SRC"] ?>"
......
local/templates/newudv/components/bitrix/news/solutions/bitrix/news.list/.default/template.php
View file @ 046ccad3
...@@ -159,10 +159,10 @@ if (!$img768){ ...@@ -159,10 +159,10 @@ if (!$img768){
<div class="solution-hub-content__image"> <div class="solution-hub-content__image">
<picture> <picture>
<source media="(min-width: 768px)" <source media="(min-width: 768px)"
srcset="<?= $img768 ?>" srcset="<?= $item["PREVIEW_PICTURE"]["SRC"] ?>"
type="image/webp"> type="image/webp">
<source media="(max-width: 767px)" <source media="(max-width: 767px)"
srcset="<?= $img767 ?>" srcset="<?= $item["PREVIEW_PICTURE"]["SRC"] ?>"
type="image/webp"> type="image/webp">
<img src="<?= $item["PREVIEW_PICTURE"]["SRC"] ?>" <img src="<?= $item["PREVIEW_PICTURE"]["SRC"] ?>"
srcset="<?= $item["PREVIEW_PICTURE"]["SRC"] ?>" srcset="<?= $item["PREVIEW_PICTURE"]["SRC"] ?>"
......
local/templates/newudv/css/custom.css
View file @ 046ccad3
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.number-element__icon.up svg{ .number-element__icon.up svg{
transform: rotate(180deg); transform: rotate(180deg);
} }
.news #page2 { .news #page2, .events #page2 {
position: relative; position: relative;
top: -120px; top: -120px;
height: 0px; height: 0px;
......
local/templates/newudv/css/style.css040225 0 → 100644
View file @ 046ccad3
This source diff could not be displayed because it is too large. You can view the blob instead.
local/templates/newudv/js/script.js
View file @ 046ccad3
...@@ -113,10 +113,6 @@ $(document).ready(function(){ ...@@ -113,10 +113,6 @@ $(document).ready(function(){
$('.news__pagination').show(); $('.news__pagination').show();
}); });
//кнопка показать еще для мероприятий //кнопка показать еще для мероприятий
...@@ -243,6 +239,7 @@ $(document).ready(function(){ ...@@ -243,6 +239,7 @@ $(document).ready(function(){
// онлайн/оффлайн // онлайн/оффлайн
$(document).on('click', '.line-link', function(e){ $(document).on('click', '.line-link', function(e){
e.preventDefault(); e.preventDefault();
e.stopPropagation();
$(".article-controls__item").each(function() { $(".article-controls__item").each(function() {
$(this).find('.article-controls__btn').removeClass('is-active'); $(this).find('.article-controls__btn').removeClass('is-active');
}); });
...@@ -251,34 +248,63 @@ $(document).ready(function(){ ...@@ -251,34 +248,63 @@ $(document).ready(function(){
$('.events__pagination').fadeOut(300); $('.events__pagination').fadeOut(300);
var targetContainer = $('#pages'), var targetContainer = $('#page'),
url = "/about/events/"+$(this).attr('href'); url = "/about/events/"+$(this).attr('href');
window.history.replaceState( null, null, url ); window.history.replaceState( null, null, url );
let name=$(this).data("name");
if (url !== undefined) { if (url !== undefined) {
targetContainer.find('.events__list').detach(); targetContainer.find('.events-list').detach();
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: url, url: url,
dataType: 'html', dataType: 'html',
async: false, async: false,
success: function(data){ success: function(data){
var elements = $(data).find('.events__list'); var elements = $(data).find('.events-list');
targetContainer.append(elements); targetContainer.append(elements);
} }
}); });
} }
// $.each($('ul.events__list > li'), function(index, category) {
// if ($(this).data("hash")!=name){
// $(this).hide();
// } else $(this).show();
// });
}); });
//все мероприятия
$(document).on('click', '.all-events', function(e){
e.preventDefault;
$(".article-controls__item").each(function() {
$(this).find('.article-controls__btn').removeClass('is-active');
});
$(this).find('.article-controls__btn').addClass('is-active');
var targetContainer = $('#page'), url = "/about/events/#page2";
window.history.replaceState( null, null, url );
if (url !== undefined) {
targetContainer.find('.events-list').detach();
$.ajax({
type: 'GET',
url: url,
dataType: 'html',
async: false,
success: function(data){
var elements = $(data).find('.events-list');
targetContainer.append(elements);
}
});
}
// $('#pag').show();
// $('.news-pag').show();
// $('.news__pagination').show();
});
// поиск на мерприятих // поиск на мерприятих
$('.search').on('input', function(e) { $('.search').on('input', function(e) {
...@@ -306,6 +332,7 @@ $(document).ready(function(){ ...@@ -306,6 +332,7 @@ $(document).ready(function(){
type: 'GET', type: 'GET',
url: url, url: url,
dataType: 'html', dataType: 'html',
async: false,
success: function (data) { success: function (data) {
...@@ -415,7 +442,7 @@ $(document).ready(function(){ ...@@ -415,7 +442,7 @@ $(document).ready(function(){
}); });
//Если в тег не добавлена ссыла - он должен быть некликабельным //Если в тег не добавлена ссылка - он должен быть некликабельным
$.each($('ul.events__list > li'), function(index, category) { $.each($('ul.events__list > li'), function(index, category) {
if ($(this).data("hash")!=name){ if ($(this).data("hash")!=name){
$(this).hide(); $(this).hide();
......
local/templates/newudv/js/scripts.js 0 → 100644
View file @ 046ccad3
This source diff could not be displayed because it is too large. You can view the blob instead.
local/templates/newudv/styles.css
View file @ 046ccad3
...@@ -15,5 +15,5 @@ blockquote:last-child { ...@@ -15,5 +15,5 @@ blockquote:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.article__content{ .article__content{
} }
\ No newline at end of file
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