Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
www
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finnv
www
Commits
69b00909
Commit
69b00909
authored
Aug 11, 2023
by
Ольга
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Доработан блок с акциями
parent
7e7985c6
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
88 additions
and
77 deletions
+88
-77
style.css
...aspro-scorp/components/bitrix/news.list/actions/style.css
+0
-1
template.php
...-scorp/components/bitrix/news.list/services2/template.php
+8
-1
detail.php
...o-scorp/components/bitrix/news/services-blocks/detail.php
+3
-2
section.php
...-scorp/components/bitrix/news/services-blocks/section.php
+3
-2
blocks.php
include/blocks.php
+74
-71
No files found.
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']
):?>
...
@@ -33,3 +38,5 @@
...
@@ -33,3 +38,5 @@
<?
endif
;
?>
<?
endif
;
?>
<?
endif
;
?>
<?
endif
;
?>
</div>
</div>
</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,6 +282,9 @@ if ($blocks) {
...
@@ -283,6 +282,9 @@ if ($blocks) {
<?
break
;
<?
break
;
case
$mapBlocks
[
'ACTIONS'
]
:
?>
case
$mapBlocks
[
'ACTIONS'
]
:
?>
<?php
<?php
if
(
$arParams
[
'ACTIONS'
])
{
global
$filterActions
;
$filterActions
[
'ID'
]
=
$arParams
[
'ACTIONS'
];
$APPLICATION
->
IncludeComponent
(
$APPLICATION
->
IncludeComponent
(
"bitrix:news.list"
,
"bitrix:news.list"
,
"actions"
,
"actions"
,
...
@@ -310,7 +312,7 @@ if ($blocks) {
...
@@ -310,7 +312,7 @@ if ($blocks) {
0
=>
""
,
0
=>
""
,
1
=>
""
,
1
=>
""
,
),
),
"FILTER_NAME"
=>
"
"
,
"FILTER_NAME"
=>
"filterActions
"
,
"HIDE_LINK_WHEN_NO_DETAIL"
=>
"N"
,
"HIDE_LINK_WHEN_NO_DETAIL"
=>
"N"
,
"IBLOCK_ID"
=>
ACTIONS_ID
,
"IBLOCK_ID"
=>
ACTIONS_ID
,
"IBLOCK_TYPE"
=>
"aspro_scorp_content"
,
"IBLOCK_TYPE"
=>
"aspro_scorp_content"
,
...
@@ -352,6 +354,7 @@ if ($blocks) {
...
@@ -352,6 +354,7 @@ if ($blocks) {
),
),
false
false
);
);
}
?>
?>
<?
break
;
<?
break
;
case
$mapBlocks
[
'SERTIFICATE'
]
:
?>
case
$mapBlocks
[
'SERTIFICATE'
]
:
?>
...
...
Михаил Ливач
@maus
mentioned in commit
11eb810b
·
Aug 18, 2023
mentioned in commit
11eb810b
mentioned in commit 11eb810bf21e0fda989f8d9d68e6baa5bd5cb31a
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment