Skip to content

TASK: add last materials #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zaveryukha wants to merge 2 commits into
base: master
Choose a base branch
from
Open

TASK: add last materials #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
540c5b1
TASK: add last materials
zaveryukha Jun 12, 2019
61564dd
TASK: small changes in main page
zaveryukha Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 46 additions & 35 deletions DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/NodeTypes/PageMain.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
prototype(Sfi.Kateheo:AbstractList) < prototype(Flowpack.Listable:Collection) {
@process.styles = ${'<style>
.newsList {
display: flex;
flex-wrap: wrap;
margin: -12px;
}
.newsList-item {
flex-basis: 100%;
padding: 12px;
}
@media screen and (min-width:640px) {
.newsList-item {
flex-basis: 50%;
}
}
@media screen and (min-width:1024px) {
.newsList-item {
flex-basis: 33.33%;
}
}
@media screen and (min-width:1024px) {
.newsList-item:nth-child(4) {
display: none;
}
}
</style>' + value}
listClass = 'newsList'
itemClass = 'newsList-item'
itemRenderer = Flowpack.Listable:ContentCaseShort
collection = Neos.Neos:ContentCollection
}


prototype(Sfi.Kateheo:PageMain) < prototype(Sfi.Kateheo:AbstractDocument) {
prototype(Psmb.Carousel:Carousel).@process.wrap = afx`<div class="backgroundColor-kateheo">{value}</div>`
body.content = Neos.Fusion:Component {
Expand All @@ -9,39 +43,14 @@ prototype(Sfi.Kateheo:PageMain) < prototype(Sfi.Kateheo:AbstractDocument) {
mode = 'front'
}

newsList = Flowpack.Listable:Collection {
@process.styles = ${'<style>
.newsList {
display: flex;
flex-wrap: wrap;
margin: -12px;
}
.newsList-item {
flex-basis: 100%;
padding: 12px;
}
@media screen and (min-width:640px) {
.newsList-item {
flex-basis: 50%;
}
}
@media screen and (min-width:1024px) {
.newsList-item {
flex-basis: 33.33%;
}
}
@media screen and (min-width:1024px) {
.newsList-item:nth-child(4) {
display: none;
}
}
</style>' + value}
listClass = 'newsList'
itemClass = 'newsList-item'
itemRenderer = Flowpack.Listable:ContentCaseShort
newsList = Sfi.Kateheo:AbstractList {
collection = ${Search.query(site).nodeType("Sfi.Kateheo:News").sortDesc('date').from(0).limit(4).execute().toArray()}
}

lastAdded = Sfi.Kateheo:AbstractList {
collection = ${Search.query(site).nodeType("Sfi.Kateheo:Article").sortDesc('date').from(0).limit(6).execute().toArray()}
}

soundCloudPlayer = Sfi.Kateheo:SoundCloudPlayer {
soundCloudLink = ${site.properties.soundCloudLink}
}
Expand All @@ -63,6 +72,13 @@ prototype(Sfi.Kateheo:PageMain) < prototype(Sfi.Kateheo:AbstractDocument) {
{props.main}
</div>
<div class="primarySectionsMain" style="margin-bottom: 48px">{props.primarySections}</div>
<h3 class="H2 color-grayLight" style="margin-bottom: 12px">Последние материалы сайта</h3>
{props.lastAdded}
<h3 class="H2 color-grayLight" style="margin-bottom: 12px">События</h3>
{props.newsList}
<div class="LinkHover ParagraphAlt--Small color-grayLight" style="margin-bottom: 24px">
<a href={props.archiveUri}>Архив всех материалов сайта ›</a>
</div>
<div style="background-color: var(--color-graySoundCloud); padding: 36px 24px; margin-bottom: 48px">
<div class="row">
<div class="columns medium-4">
Expand All @@ -77,11 +93,6 @@ prototype(Sfi.Kateheo:PageMain) < prototype(Sfi.Kateheo:AbstractDocument) {
</div>
</div>
</div>
<h3 class="H2 color-grayLight" style="margin-bottom: 12px">Новости</h3>
{props.newsList}
<div class="LinkHover ParagraphAlt--Small color-grayLight" style="margin-bottom: 24px">
<a href={props.archiveUri}>Архив всех материалов сайта ›</a>
</div>
</div>
`
style = ${'<style>
Expand Down
4 changes: 2 additions & 2 deletions DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/NodeTypes/Repository.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ prototype(Sfi.Kateheo:ListingByType) < prototype(Flowpack.Listable:PaginatedColl
type = ${facetConfig.type}
}
prototype(Flowpack.Listable:Collection) {
listClass = ${facetConfig.type == 'Sfi.Kateheo:News' && 'medium-block-grid-2'}
listClass = ${(facetConfig.type == 'Sfi.Kateheo:News' || facetConfig.type == 'Sfi.Kateheo:Article') && 'medium-block-grid-2'}
}
@cache {
entryDiscriminator = Neos.Fusion:Array {
Expand Down Expand Up @@ -98,7 +98,7 @@ prototype(Sfi.Kateheo:ListingOverview) < prototype(Neos.Fusion:Collection) {
@process.wrap = Sfi.Kateheo:FacetWrapper {
label = ${facetConfig.label}
}
listClass = ${facetConfig.type == 'Sfi.Kateheo:News' && 'medium-block-grid-2'}
listClass = ${(facetConfig.type == 'Sfi.Kateheo:News' || facetConfig.type == 'Sfi.Kateheo:Article') && 'medium-block-grid-2'}
@context.query = Sfi.Kateheo:Query {
type = ${facetConfig.type}
value.@process.paginate = ${displayAll ? value.from(0).limit(1000) : value.from(0).limit(4)}
Expand Down
3 changes: 1 addition & 2 deletions DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/Objects/Footer.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ prototype(Sfi.Kateheo:Footer) < prototype(Neos.Fusion:Component) {
<p class="ParagraphAlt--Small">
По вопросам работы портала<br/>
kateheo.ru обращайтесь:<br/>
редактор портала С.М. Бурлака<br/>
E-mail: <a style="text-decoration: underline" href="mailto:burlakas@sfi.ru">burlakas@sfi.ru</a>
редактор портала Н.А. Адаменко<br/>
</p>
</div>
<div class="large-3 medium-4 columns">
Expand Down