Skip to content

W
www
Commit 69b00909 authored by Ольга's avatar Ольга
1 Browse files
Options

Доработан блок с акциями

parent 7e7985c6
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 77 deletions
bitrix/templates/aspro-scorp/components/bitrix/news.list/actions/style.css
View file @ 69b00909
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
.actions__list { .actions__list {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center;
padding:0; padding:0;
margin-left: -30px; margin-left: -30px;
margin-right: -30px; margin-right: -30px;
......
bitrix/templates/aspro-scorp/components/bitrix/news.list/services2/template.php
View file @ 69b00909
<?if(!defined('B_PROLOG_INCLUDED') || B_PROLOG_INCLUDED !== true) die();?><?$this->setFrameMode(true);?> <?if(!defined('B_PROLOG_INCLUDED') || B_PROLOG_INCLUDED !== true) die();?><?$this->setFrameMode(true);?>
<?php if($arResult['ITEMS']):?>
<section class="service-items">
<?php if($arParams['BLOCK_TITLE']):?>
<h2 class="title-block underline service-items__title"><?php echo $arParams['BLOCK_TITLE']?></h2>
<?php endif?>
<div class="item-views services2"> <div class="item-views services2">
<?if($arResult['ITEMS']):?> <?if($arResult['ITEMS']):?>
...@@ -32,4 +37,6 @@ ...@@ -32,4 +37,6 @@
<div class="cat-desc"><hr style="<?=(strlen($arResult['NAV_STRING']) && $arParams['DISPLAY_BOTTOM_PAGER'] ? 'margin-top:16px;' : '')?>" /><?=$arCurSectionPath['DESCRIPTION']?></div> <div class="cat-desc"><hr style="<?=(strlen($arResult['NAV_STRING']) && $arParams['DISPLAY_BOTTOM_PAGER'] ? 'margin-top:16px;' : '')?>" /><?=$arCurSectionPath['DESCRIPTION']?></div>
<?endif;?> <?endif;?>
<?endif;?> <?endif;?>
</div> </div>
\ No newline at end of file </section>
<?php endif?>
\ No newline at end of file
bitrix/templates/aspro-scorp/components/bitrix/news/services-blocks/detail.php
View file @ 69b00909
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<? <?
// get element // get element
$arItemFilter = CScorp::GetCurrentElementFilter($arResult['VARIABLES'], $arParams); $arItemFilter = CScorp::GetCurrentElementFilter($arResult['VARIABLES'], $arParams);
$arElement = CCache::CIblockElement_GetList(array('CACHE' => array('TAG' => CCache::GetIBlockCacheTag($arParams['IBLOCK_ID']), 'MULTI' => 'N')), $arItemFilter, false, false, array('ID', 'NAME', 'PREVIEW_TEXT','DETAIL_PICTURE','DETAIL_PAGE_URL','DETAIL_TEXT', 'PREVIEW_PICTURE', 'PROPERTY_FIRST_SCREEN', 'PROPERTY_BLOCKS','PROPERTY_FAQ','PROPERTY_SCHEME', 'PROPERTY_TABLE_PRICE', 'PROPERTY_ADVANTAGES','IBLOCK_SECTION_ID')); $arElement = CCache::CIblockElement_GetList(array('CACHE' => array('TAG' => CCache::GetIBlockCacheTag($arParams['IBLOCK_ID']), 'MULTI' => 'N')), $arItemFilter, false, false, array('ID', 'NAME', 'PREVIEW_TEXT','DETAIL_PICTURE','DETAIL_PAGE_URL','DETAIL_TEXT', 'PREVIEW_PICTURE', 'PROPERTY_FIRST_SCREEN', 'PROPERTY_BLOCKS','PROPERTY_FAQ','PROPERTY_SCHEME', 'PROPERTY_TABLE_PRICE', 'PROPERTY_ADVANTAGES', 'PROPERTY_ACTIONS','IBLOCK_SECTION_ID'));
$arSection = CCache::CIblockSection_GetList(array("CACHE" => array("TAG" => CCache::GetIBlockCacheTag($arParams["IBLOCK_ID"]), "MULTI" => "N")), array('ID' => $arElement['IBLOCK_SECTION_ID']), false, array('ID','NAME'), true); $arSection = CCache::CIblockSection_GetList(array("CACHE" => array("TAG" => CCache::GetIBlockCacheTag($arParams["IBLOCK_ID"]), "MULTI" => "N")), array('ID' => $arElement['IBLOCK_SECTION_ID']), false, array('ID','NAME'), true);
$isTitle = false; $isTitle = false;
...@@ -118,7 +118,8 @@ $isTitle = false; ...@@ -118,7 +118,8 @@ $isTitle = false;
'FAQ' => $arElement["PROPERTY_FAQ_VALUE"], 'FAQ' => $arElement["PROPERTY_FAQ_VALUE"],
'TABLE_PRICE' => $arElement["PROPERTY_TABLE_PRICE_VALUE"], 'TABLE_PRICE' => $arElement["PROPERTY_TABLE_PRICE_VALUE"],
'IS_DETAIL' => true, 'IS_DETAIL' => true,
'ADVANTAGES' => $arElement["ADVANTAGES"] 'ADVANTAGES' => $arElement["PROPERTY_ADVANTAGES_VALUE"],
'ACTIONS' => $arElement["PROPERTY_ACTIONS_VALUE"]
) )
) )
); ?> ); ?>
......
bitrix/templates/aspro-scorp/components/bitrix/news/services-blocks/section.php
View file @ 69b00909
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
$arItemFilter = CScorp::GetCurrentSectionElementFilter($arResult["VARIABLES"], $arParams); $arItemFilter = CScorp::GetCurrentSectionElementFilter($arResult["VARIABLES"], $arParams);
$arSectionFilter = CScorp::GetCurrentSectionFilter($arResult["VARIABLES"], $arParams); $arSectionFilter = CScorp::GetCurrentSectionFilter($arResult["VARIABLES"], $arParams);
$itemsCnt = CCache::CIblockElement_GetList(array("CACHE" => array("TAG" => CCache::GetIBlockCacheTag($arParams["IBLOCK_ID"]))), $arItemFilter, array()); $itemsCnt = CCache::CIblockElement_GetList(array("CACHE" => array("TAG" => CCache::GetIBlockCacheTag($arParams["IBLOCK_ID"]))), $arItemFilter, array());
$arSection = CCache::CIblockSection_GetList(array("CACHE" => array("TAG" => CCache::GetIBlockCacheTag($arParams["IBLOCK_ID"]), "MULTI" => "N")), $arSectionFilter, false, array('ID', 'DESCRIPTION', 'PICTURE', 'DETAIL_PICTURE', 'NAME', 'UF_BLOCKS', 'UF_FIRST_SCREEN', 'UF_TABLE_PRICE', 'UF_SCHEME', 'UF_FAQ', 'UF_ADVANTAGES'), true); $arSection = CCache::CIblockSection_GetList(array("CACHE" => array("TAG" => CCache::GetIBlockCacheTag($arParams["IBLOCK_ID"]), "MULTI" => "N")), $arSectionFilter, false, array('ID', 'DESCRIPTION', 'PICTURE', 'DETAIL_PICTURE', 'NAME', 'UF_BLOCKS', 'UF_FIRST_SCREEN', 'UF_TABLE_PRICE', 'UF_SCHEME', 'UF_FAQ', 'UF_ADVANTAGES', 'UF_ACTION'), true);
CScorp::AddMeta( CScorp::AddMeta(
array( array(
...@@ -107,7 +107,8 @@ CScorp::AddMeta( ...@@ -107,7 +107,8 @@ CScorp::AddMeta(
'FAQ' => $arSection['UF_FAQ'], 'FAQ' => $arSection['UF_FAQ'],
'TABLE_PRICE' => $arSection['UF_TABLE_PRICE'], 'TABLE_PRICE' => $arSection['UF_TABLE_PRICE'],
'IS_DETAIL' => false, 'IS_DETAIL' => false,
'ADVANTAGES' => $arSection["UF_ADVANTAGES"] 'ADVANTAGES' => $arSection["UF_ADVANTAGES"],
'ACTIONS' => $arSection["UF_ACTION"]
) )
) )
); ?> ); ?>
......
include/blocks.php
View file @ 69b00909
...@@ -90,8 +90,7 @@ if ($blocks) { ...@@ -90,8 +90,7 @@ if ($blocks) {
<?php endif ?> <?php endif ?>
<? break; <? break;
case $mapBlocks['SERVICES']: ?> case $mapBlocks['SERVICES']: ?>
<section class="service-items">
<h2 class="title-block underline service-items__title">Наши услуги</h2>
<?php <?php
if ($arParams['IS_DETAIL']) { if ($arParams['IS_DETAIL']) {
global $filterService; global $filterService;
...@@ -162,10 +161,10 @@ if ($blocks) { ...@@ -162,10 +161,10 @@ if ($blocks) {
"IBLOCK_URL" => $arResult["FOLDER"] . $arResult["URL_TEMPLATES"]["news"], "IBLOCK_URL" => $arResult["FOLDER"] . $arResult["URL_TEMPLATES"]["news"],
"INCLUDE_SUBSECTIONS" => "N", "INCLUDE_SUBSECTIONS" => "N",
"SHOW_DETAIL_LINK" => $arParams["SHOW_DETAIL_LINK"], "SHOW_DETAIL_LINK" => $arParams["SHOW_DETAIL_LINK"],
'BLOCK_TITLE' => 'Наши услуги'
), ),
$component $component
); ?> ); ?>
</section>
<? break; <? break;
case $mapBlocks['TABLE']: ?> case $mapBlocks['TABLE']: ?>
<?php <?php
...@@ -283,75 +282,79 @@ if ($blocks) { ...@@ -283,75 +282,79 @@ if ($blocks) {
<? break; <? break;
case $mapBlocks['ACTIONS']: ?> case $mapBlocks['ACTIONS']: ?>
<?php <?php
$APPLICATION->IncludeComponent( if ($arParams['ACTIONS']) {
"bitrix:news.list", global $filterActions;
"actions", $filterActions['ID'] = $arParams['ACTIONS'];
array( $APPLICATION->IncludeComponent(
"ACTIVE_DATE_FORMAT" => "d.m.Y", "bitrix:news.list",
"ADD_SECTIONS_CHAIN" => "N", "actions",
"AJAX_MODE" => "N", array(
"AJAX_OPTION_ADDITIONAL" => "", "ACTIVE_DATE_FORMAT" => "d.m.Y",
"AJAX_OPTION_HISTORY" => "N", "ADD_SECTIONS_CHAIN" => "N",
"AJAX_OPTION_JUMP" => "N", "AJAX_MODE" => "N",
"AJAX_OPTION_STYLE" => "N", "AJAX_OPTION_ADDITIONAL" => "",
"CACHE_FILTER" => "N", "AJAX_OPTION_HISTORY" => "N",
"CACHE_GROUPS" => "N", "AJAX_OPTION_JUMP" => "N",
"CACHE_TIME" => "36000000", "AJAX_OPTION_STYLE" => "N",
"CACHE_TYPE" => "A", "CACHE_FILTER" => "N",
"CHECK_DATES" => "Y", "CACHE_GROUPS" => "N",
"DETAIL_URL" => "", "CACHE_TIME" => "36000000",
"DISPLAY_BOTTOM_PAGER" => "Y", "CACHE_TYPE" => "A",
"DISPLAY_DATE" => "Y", "CHECK_DATES" => "Y",
"DISPLAY_NAME" => "Y", "DETAIL_URL" => "",
"DISPLAY_PICTURE" => "Y", "DISPLAY_BOTTOM_PAGER" => "Y",
"DISPLAY_PREVIEW_TEXT" => "Y", "DISPLAY_DATE" => "Y",
"DISPLAY_TOP_PAGER" => "N", "DISPLAY_NAME" => "Y",
"FIELD_CODE" => array( "DISPLAY_PICTURE" => "Y",
0 => "", "DISPLAY_PREVIEW_TEXT" => "Y",
1 => "", "DISPLAY_TOP_PAGER" => "N",
), "FIELD_CODE" => array(
"FILTER_NAME" => "", 0 => "",
"HIDE_LINK_WHEN_NO_DETAIL" => "N", 1 => "",
"IBLOCK_ID" => ACTIONS_ID, ),
"IBLOCK_TYPE" => "aspro_scorp_content", "FILTER_NAME" => "filterActions",
"IMAGE_POSITION" => "left", "HIDE_LINK_WHEN_NO_DETAIL" => "N",
"INCLUDE_IBLOCK_INTO_CHAIN" => "N", "IBLOCK_ID" => ACTIONS_ID,
"INCLUDE_SUBSECTIONS" => "N", "IBLOCK_TYPE" => "aspro_scorp_content",
"MESSAGE_404" => "", "IMAGE_POSITION" => "left",
"NEWS_COUNT" => "1000", "INCLUDE_IBLOCK_INTO_CHAIN" => "N",
"PAGER_BASE_LINK_ENABLE" => "N", "INCLUDE_SUBSECTIONS" => "N",
"PAGER_DESC_NUMBERING" => "N", "MESSAGE_404" => "",
"PAGER_DESC_NUMBERING_CACHE_TIME" => "36000", "NEWS_COUNT" => "1000",
"PAGER_SHOW_ALL" => "N", "PAGER_BASE_LINK_ENABLE" => "N",
"PAGER_SHOW_ALWAYS" => "N", "PAGER_DESC_NUMBERING" => "N",
"PAGER_TEMPLATE" => ".default", "PAGER_DESC_NUMBERING_CACHE_TIME" => "36000",
"PAGER_TITLE" => "Новости", "PAGER_SHOW_ALL" => "N",
"PARENT_SECTION" => "", "PAGER_SHOW_ALWAYS" => "N",
"PARENT_SECTION_CODE" => "", "PAGER_TEMPLATE" => ".default",
"PREVIEW_TRUNCATE_LEN" => "", "PAGER_TITLE" => "Новости",
"PROPERTY_CODE" => array( "PARENT_SECTION" => "",
0 => "", "PARENT_SECTION_CODE" => "",
1 => "", "PREVIEW_TRUNCATE_LEN" => "",
"PROPERTY_CODE" => array(
0 => "",
1 => "",
),
"SET_BROWSER_TITLE" => "N",
"SET_LAST_MODIFIED" => "N",
"SET_META_DESCRIPTION" => "N",
"SET_META_KEYWORDS" => "N",
"SET_STATUS_404" => "N",
"SET_TITLE" => "N",
"SHOW_404" => "N",
"SHOW_DETAIL_LINK" => "N",
"SORT_BY1" => "ACTIVE_FROM",
"SORT_BY2" => "SORT",
"SORT_ORDER1" => "DESC",
"SORT_ORDER2" => "ASC",
"STRICT_SECTION_CHECK" => "N",
"VIEW_TYPE" => "list",
"COMPONENT_TEMPLATE" => "actions",
"BLOCK_TITLE" => 'Доступные акции'
), ),
"SET_BROWSER_TITLE" => "N", false
"SET_LAST_MODIFIED" => "N", );
"SET_META_DESCRIPTION" => "N", }
"SET_META_KEYWORDS" => "N",
"SET_STATUS_404" => "N",
"SET_TITLE" => "N",
"SHOW_404" => "N",
"SHOW_DETAIL_LINK" => "N",
"SORT_BY1" => "ACTIVE_FROM",
"SORT_BY2" => "SORT",
"SORT_ORDER1" => "DESC",
"SORT_ORDER2" => "ASC",
"STRICT_SECTION_CHECK" => "N",
"VIEW_TYPE" => "list",
"COMPONENT_TEMPLATE" => "actions",
"BLOCK_TITLE" => 'Доступные акции'
),
false
);
?> ?>
<? break; <? break;
case $mapBlocks['SERTIFICATE']: ?> case $mapBlocks['SERTIFICATE']: ?>
......
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