TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

from server 25.12

This commit is contained in:
root 2022-12-25 12:30:38 +00:00
parent c892fc6584
commit 7e8eedf7c4
47 changed files with 625 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/rainlab/blog/models/Post.php
View File

@ -385,9 +385,13 @@ class Post extends Model
}
if ($typePost !==null) {
$query->where('type_post',$typePost);
$typePost = is_array($typePost) ? $typePost : [$typePost];
$query->whereIn('type_post',$typePost);
}
// if ($groupId !==null) {
// $query->with(['category_groups']);
// }

6
themes/modern2/assets/new/scripts/core/article.js
View File

@ -197,10 +197,7 @@ const runBtns = new NewsBtn(".news-global").activateSwitch(
const articleSwiper = new Swiper(".articleSwiper", {
slidesPerView: 1,
spaceBetween: 0,
autoplay: {
delay: 3000,
disableOnInteraction: false,
},
loop: false,
navigation: {
prevEl: ".article-prev",
nextEl: ".article-next",
@ -210,6 +207,7 @@ const articleSwiper = new Swiper(".articleSwiper", {
const articleBottomSwiper = new Swiper(".articleBottomSwiper", {
slidesPerView: 2,
spaceBetween: 50,
loop: false,
autoplay: {
delay: 3000,
disableOnInteraction: false,

23
themes/modern2/assets/new/scripts/core/main.js
View File

@ -257,10 +257,19 @@ const photoScrollerSwiper = new Swiper(".photoScrollerSwiper", {
},
});
const bannerSwiper = new Swiper(".bannerSwiper", {
slidesPerView: 2,
spaceBetween: 25,
// effect: "fade",
const bannerSwiper_1 = new Swiper(".bannerSwiper-1", {
slidesPerView: 1,
spaceBetween: 0,
loop: true,
autoplay: {
delay: "5000",
},
});
const bannerSwiper_2 = new Swiper(".bannerSwiper-2", {
slidesPerView: 1,
spaceBetween: 0,
loop: true,
autoplay: {
delay: "5000",
@ -270,7 +279,7 @@ const bannerSwiper = new Swiper(".bannerSwiper", {
const mainAdvertSwiper = new Swiper(".mainAdvertSwiper", {
slidesPerView: 1,
spaceBetween: 0,
effect: "fade",
loop: true,
autoplay: {
delay: "5000",
@ -403,3 +412,7 @@ const trendingSwiper = new Swiper(".trendingSwiper", {
delay: "5000",
},
});
Marquee3k.init({
selector: "marquee2k",
});

211
themes/modern2/assets/new/scripts/marquee/marquee3k.js Normal file
View File

@ -0,0 +1,211 @@
/**
* MARQUEE 3000 MARQUEE 3000 MARQUEE 3000 MARQUEE 3000 MARQUEE 3000
* http://github.com/ezekielaquino/marquee3000
* Marquees for the new millennium v1.0
* MIT License
*/
(function (root, factory) {
if (typeof define === "function" && define.amd) {
define([], factory);
} else if (typeof exports === "object") {
module.exports = factory();
} else {
root.Marquee3k = factory();
}
})(this, function () {
"use strict";
let animationId = 0;
class Marquee3k {
constructor(element, options) {
if (element.children.length === 0) {
throw new Error(
"Encountered a marquee element without children, please supply a wrapper for your content"
);
}
this.element = element;
this.selector = options.selector;
this.speed = element.dataset.speed || 0.25;
this.pausable = element.dataset.pausable === "true" ? true : false;
this.reverse = element.dataset.reverse === "true" ? true : false;
this.paused = false;
this.parent = element.parentElement;
this.parentProps = this.parent.getBoundingClientRect();
this.content = element.children[0];
this.innerContent = this.content.innerHTML;
this.wrapStyles = "";
this.offset = 0;
this._setupWrapper();
this._setupContent();
this._setupEvents();
this.wrapper.appendChild(this.content);
this.element.appendChild(this.wrapper);
}
_setupWrapper() {
this.wrapper = document.createElement("div");
this.wrapper.classList.add("marquee3k__wrapper");
this.wrapper.style.whiteSpace = "nowrap";
}
_setupContent() {
this.content.classList.add(`${this.selector}__copy`);
this.content.style.display = "inline-block";
this.contentWidth = this.content.offsetWidth;
this.requiredReps =
this.contentWidth > this.parentProps.width
? 2
: Math.ceil(
(this.parentProps.width - this.contentWidth) / this.contentWidth
) + 1;
for (let i = 0; i < this.requiredReps; i++) {
this._createClone();
}
if (this.reverse) {
this.offset = this.contentWidth * -1;
}
this.element.classList.add("is-init");
}
_setupEvents() {
this.element.addEventListener("mouseenter", () => {
if (this.pausable) this.paused = true;
});
this.element.addEventListener("mouseleave", () => {
if (this.pausable) this.paused = false;
});
}
_createClone() {
const clone = this.content.cloneNode(true);
clone.style.display = "inline-block";
clone.classList.add(`${this.selector}__copy`);
this.wrapper.appendChild(clone);
}
animate() {
if (!this.paused) {
const isScrolled = this.reverse
? this.offset < 0
: this.offset > this.contentWidth * -1;
const direction = this.reverse ? -1 : 1;
const reset = this.reverse ? this.contentWidth * -1 : 0;
if (isScrolled) this.offset -= this.speed * direction;
else this.offset = reset;
this.wrapper.style.whiteSpace = "nowrap";
this.wrapper.style.transform = `translate(${this.offset}px, 0) translateZ(0)`;
}
}
_refresh() {
this.contentWidth = this.content.offsetWidth;
}
repopulate(difference, isLarger) {
this.contentWidth = this.content.offsetWidth;
if (isLarger) {
const amount = Math.ceil(difference / this.contentWidth) + 1;
for (let i = 0; i < amount; i++) {
this._createClone();
}
}
}
static refresh(index) {
MARQUEES[index]._refresh();
}
static pause(index) {
MARQUEES[index].paused = true;
}
static play(index) {
MARQUEES[index].paused = false;
}
static toggle(index) {
MARQUEES[index].paused = !MARQUEES[index].paused;
}
static refreshAll() {
for (let i = 0; i < MARQUEES.length; i++) {
MARQUEES[i]._refresh();
}
}
static pauseAll() {
for (let i = 0; i < MARQUEES.length; i++) {
MARQUEES[i].paused = true;
}
}
static playAll() {
for (let i = 0; i < MARQUEES.length; i++) {
MARQUEES[i].paused = false;
}
}
static toggleAll() {
for (let i = 0; i < MARQUEES.length; i++) {
MARQUEES[i].paused = !MARQUEES[i].paused;
}
}
static init(options = { selector: "marquee3k" }) {
if (animationId) window.cancelAnimationFrame(animationId);
window.MARQUEES = [];
const marquees = Array.from(
document.querySelectorAll(`.${options.selector}`)
);
let previousWidth = window.innerWidth;
let timer;
for (let i = 0; i < marquees.length; i++) {
const marquee = marquees[i];
const instance = new Marquee3k(marquee, options);
MARQUEES.push(instance);
}
animate();
function animate() {
for (let i = 0; i < MARQUEES.length; i++) {
MARQUEES[i].animate();
}
animationId = window.requestAnimationFrame(animate);
}
window.addEventListener("resize", () => {
clearTimeout(timer);
timer = setTimeout(() => {
const isLarger = previousWidth < window.innerWidth;
const difference = window.innerWidth - previousWidth;
for (let i = 0; i < MARQUEES.length; i++) {
MARQUEES[i].repopulate(difference, isLarger);
}
previousWidth = this.innerWidth;
}, 250);
});
}
}
return Marquee3k;
});

5
themes/modern2/assets/new/styles/_contact.scss
View File

@ -14,11 +14,14 @@
.contact-form,
.contact-content {
@include flex(column);
align-items: center;
gap: 4rem;
width: 100%;
}
.contact-block {
width: 50%;
width: 100%;
max-width: 60rem;
@include flex(column);
gap: 1.4rem;

4
themes/modern2/assets/new/styles/_main.scss
View File

@ -23,6 +23,10 @@
@include flex;
gap: 2.5rem;
@include stretch;
.swiper {
width: 50%;
}
}
.banner {

24
themes/modern2/assets/new/styles/_nav.scss
View File

@ -158,18 +158,19 @@
.marquee-title {
position: absolute;
left: 0;
top: 0;
left: -0.1rem;
top: -0.1rem;
z-index: 2;
// padding-right: 4rem;
font-size: 1.5rem;
color: $base-white;
font-weight: bold;
max-width: 12rem;
max-width: 13rem;
@include stretch;
height: 4.4rem;
background-image: url(../icons/marquee.svg);
background-repeat: no-repeat;
background-position: 0% center;
background-size: cover;
@include flex;
align-items: stretch;
justify-content: center;
@ -201,6 +202,21 @@
}
}
.marquee2k {
overflow: hidden;
width: 100%;
height: 4.2rem;
p {
padding: 1.1rem 0;
a {
margin-left: 2.4rem;
font-size: 1.7rem;
color: $base-white;
}
}
}
.nav-bottom-inner {
overflow-x: auto;
background: $base-green;

20
themes/modern2/assets/new/styles/main/_aside.scss
View File

@ -175,6 +175,21 @@
}
}
.aside-banner {
max-width: 30rem;
width: 100%;
img {
width: 100%;
height: 100%;
object-fit: contain;
}
a {
display: block;
}
}
.aside-container {
width: 100%;
padding: 0 4rem 0 0;
@ -182,6 +197,11 @@
}
// Media
@media screen and (max-width: 1350px) {
.aside-banner {
max-width: 22rem;
}
}
@media screen and (max-width: 1070px) {
.aside {
display: none;

17
themes/modern2/assets/new/styles/main/_main-news.scss
View File

@ -100,7 +100,7 @@
.main-news-min-bg {
@include imgStyle($objFit: cover);
max-height: 40rem;
// height: 40rem;
}
.main-news-min-info {
@ -155,6 +155,12 @@
}
}
.mainAdvertSwiper {
.swiper-slide {
height: 17rem;
}
}
.photoScrollerSwiper {
width: 100%;
height: 100%;
@ -198,6 +204,9 @@
// Media
@media screen and (max-width: 1070px) {
.main-news-min-bg {
height: 40rem;
}
.mainNewsSwiper {
display: block;
}
@ -239,3 +248,9 @@
gap: 2.5rem;
}
}
@media screen and (max-width: 500px) {
.main-news-min-bg {
height: 30rem;
}
}

16
themes/modern2/assets/new/styles/main/_trending.scss
View File

@ -51,12 +51,21 @@
gap: 2.5rem;
}
.trending-aside {
width: 36%;
}
.trending-main {
width: 36%;
}
.trending-aside-item {
@include flex(column);
gap: 1.6rem;
}
.trending-banner {
width: 28%;
.swiper-slide {
@include flex;
align-items: center;
@ -115,7 +124,8 @@
@include stretch;
@include flex(column);
gap: 0.4rem;
justify-content: flex-end;
// justify-content: flex-end;
justify-content: flex-start;
}
// Media
@ -130,6 +140,10 @@
.trending-banner {
display: none;
}
.trending-aside,
.trending-main {
width: 100%;
}
.trending-inner {
grid-template-columns: 1fr 1fr;
}

4
themes/modern2/assets/new/styles/main/_useful.scss
View File

@ -47,6 +47,10 @@
gap: 2.5rem;
}
.useful-main {
width: 100%;
}
.useful-main-content {
display: grid;
grid-template-columns: 1fr 1fr;

83
themes/modern2/assets/new/styles/style.css
View File

@ -293,18 +293,20 @@ a {
.marquee-title {
position: absolute;
left: 0;
top: 0;
left: -0.1rem;
top: -0.1rem;
z-index: 2;
font-size: 1.5rem;
color: rgb(255, 255, 255);
font-weight: bold;
max-width: 12rem;
max-width: 13rem;
width: 100%;
height: 100%;
height: 4.4rem;
background-image: url(../icons/marquee.svg);
background-repeat: no-repeat;
background-position: 0% center;
background-size: cover;
display: flex;
flex-direction: row;
align-items: stretch;
@ -337,6 +339,20 @@ a {
padding: 1.1rem 0;
}
.marquee2k {
overflow: hidden;
width: 100%;
height: 4.2rem;
}
.marquee2k p {
padding: 1.1rem 0;
}
.marquee2k p a {
margin-left: 2.4rem;
font-size: 1.7rem;
color: rgb(255, 255, 255);
}
.nav-bottom-inner {
overflow-x: auto;
background: rgb(3, 159, 55);
@ -570,6 +586,9 @@ a {
width: 100%;
height: 100%;
}
.banners-inner .swiper {
width: 50%;
}
.banner {
max-width: unset;
@ -704,7 +723,6 @@ a {
max-height: unset;
width: 100%;
height: 100%;
max-height: 40rem;
}
.main-news-min-bg img {
width: 100%;
@ -763,6 +781,10 @@ a {
transition: 0.3s all ease;
}
.mainAdvertSwiper .swiper-slide {
height: 17rem;
}
.photoScrollerSwiper {
width: 100%;
height: 100%;
@ -817,6 +839,9 @@ a {
}
@media screen and (max-width: 1070px) {
.main-news-min-bg {
height: 40rem;
}
.mainNewsSwiper {
display: block;
}
@ -858,6 +883,11 @@ a {
gap: 2.5rem;
}
}
@media screen and (max-width: 500px) {
.main-news-min-bg {
height: 30rem;
}
}
.aside {
position: -webkit-sticky;
position: sticky;
@ -1029,12 +1059,31 @@ a {
display: block;
}
.aside-banner {
max-width: 30rem;
width: 100%;
}
.aside-banner img {
width: 100%;
height: 100%;
-o-object-fit: contain;
object-fit: contain;
}
.aside-banner a {
display: block;
}
.aside-container {
width: 100%;
padding: 0 4rem 0 0;
max-width: unset;
}
@media screen and (max-width: 1350px) {
.aside-banner {
max-width: 22rem;
}
}
@media screen and (max-width: 1070px) {
.aside {
display: none;
@ -1325,12 +1374,23 @@ a {
gap: 2.5rem;
}
.trending-aside {
width: 36%;
}
.trending-main {
width: 36%;
}
.trending-aside-item {
display: flex;
flex-direction: column;
gap: 1.6rem;
}
.trending-banner {
width: 28%;
}
.trending-banner .swiper-slide {
display: flex;
flex-direction: row;
@ -1405,7 +1465,7 @@ a {
display: flex;
flex-direction: column;
gap: 0.4rem;
justify-content: flex-end;
justify-content: flex-start;
}
@media screen and (max-width: 1500px) {
@ -1417,6 +1477,10 @@ a {
.trending-banner {
display: none;
}
.trending-aside,
.trending-main {
width: 100%;
}
.trending-inner {
grid-template-columns: 1fr 1fr;
}
@ -1728,6 +1792,10 @@ a {
gap: 2.5rem;
}
.useful-main {
width: 100%;
}
.useful-main-content {
display: grid;
grid-template-columns: 1fr 1fr;
@ -2497,11 +2565,14 @@ a {
.contact-content {
display: flex;
flex-direction: column;
align-items: center;
gap: 4rem;
width: 100%;
}
.contact-block {
width: 50%;
width: 100%;
max-width: 60rem;
display: flex;
flex-direction: column;
gap: 1.4rem;

2
themes/modern2/assets/new/styles/style.css.map
View File

File diff suppressed because one or more lines are too long

22
themes/modern2/layouts/new/master-inside.htm
View File

@ -12,17 +12,16 @@ code = "new-top-menui"
[staticPage]
useContent = 1
default = 0
[SeoCmsPage]
==
<!DOCTYPE html>
<html lang="{{ activeLocale }}">
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="{{ 'assets/new/styles/style.css'|theme}}" />
<title>{{ this.page.meta_title }}</title>
{% partial 'new/head' %}
{% component 'SeoCmsPage' %}
{% styles %}
</head>
@ -55,7 +54,7 @@ default = 0
</div>
<div class="header-left">
<a href="/new" class="header-logo">
<a href="/" class="header-logo">
<img src="{{ 'assets/images/newYearLogo.png'|theme}}" alt="" />
</a>
</div>
@ -120,6 +119,17 @@ default = 0
{% scripts %}
<!-- javascript end
============================================= -->
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-HHRB3PCSBQ"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-HHRB3PCSBQ');
</script>
</body>

23
themes/modern2/layouts/new/master.htm
View File

@ -5,16 +5,15 @@ forceUrl = 1
code = "samsung"
type = "slider"
random = 0
[SeoCmsPage]
==
<!DOCTYPE html>
<html lang="{{ activeLocale }}">
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="{{ 'assets/new/styles/style.css'|theme}}" />
<title>{{ this.page.meta_title }}</title>
{% partial 'new/head' %}
{% component 'SeoCmsPage' %}
<style>
.trending-banner a {
display: block;
@ -57,7 +56,7 @@ random = 0
</div>
<div class="header-left">
<a href="/new" class="header-logo">
<a href="/" class="header-logo">
<img src="{{ 'assets/images/newYearLogo.png'|theme}}" alt="logo" />
</a>
</div>
@ -130,6 +129,18 @@ random = 0
{% framework extras %}
<!-- javascript end
============================================= -->
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-HHRB3PCSBQ"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-HHRB3PCSBQ');
</script>
</body>
</html>

2
themes/modern2/meta/menus/event_menu.yaml
View File

@ -12,7 +12,7 @@ items:
tm:
title: ''
url: ''
isHidden: '0'
isHidden: '1'
cssClass: ''
isExternal: '0'
name: event_menu

2
themes/modern2/pages/index.htm
View File

@ -1,5 +1,5 @@
title = "Главная"
url = "/"
url = "/old"
layout = "master"
meta_title = "Новости Туркменистана и мира"
meta_description = "Мы информируем о событиях, происшествиях и тенденциях, которые влияют на жизнь Туркменистана и всего Центрально-Азиатского региона. Ежедневно контент пополняется свежими и достоверными новостями."

31
themes/modern2/pages/new/categories.htm
View File

@ -1,31 +0,0 @@
title = "new/categories"
url = "/new/categories"
layout = "new/master-inside"
is_hidden = 0
robot_index = "index"
robot_follow = "follow"
[blogCategories]
slug = "{{ :slug }}"
displayEmpty = 1
categoryPage = "newcategories"
==
{% if blogCategories.categories|length > 0 %}
<ul class="category-list">
{% partial blogCategories ~ "::items"
categories = blogCategories.categories
currentCategorySlug = blogCategories.currentCategorySlug
%}
</ul>
{% else %}
<p>No categories were found.</p>
{% endif %}
{% for post in blogCategories.categories %}
<h3 style="color:red;"> {{ post.name }} </h3><br>
<h3> {{ post }} </h3><br>
{% endfor%}

5
themes/modern2/pages/new/category.htm
View File

@ -1,10 +1,13 @@
title = "new/category"
title = "Рубрика Рубрика"
url = "/new/category/:slug/:page?"
layout = "new/master-inside"
is_hidden = 0
robot_index = "index"
robot_follow = "follow"
[viewBag]
localeTitle[en] = "Category"
[blogPosts]
pageNumber = "{{ :page }}"
categoryFilter = "{{ :slug }}"

9
themes/modern2/pages/new/group.htm
View File

@ -1,10 +1,13 @@
title = "new/group/category"
title = "Рубрика"
url = "/new/posts/:categoryGroup/:slug?"
layout = "new/master-inside"
is_hidden = 0
robot_index = "index"
robot_follow = "follow"
[viewBag]
localeTitle[en] = "Category"
[blogPosts]
pageNumber = "{{ :page }}"
categoryFilter = "{{ :slug }}"
@ -30,6 +33,10 @@ function onStart(){
$currentCatLink = '/'.$this['categorySlug'];
$currentUrl = '/'.$currentLocale.'/new/posts/'.$this['group'].$currentCatLink;
if(!$this['categorySlug']){
$this->page->meta_title = $this['groupName']->name;
}
//dd($currentUrl);
if($this->menuItems && $this['group']){

17
themes/modern2/pages/new/home.htm
View File

@ -1,10 +1,17 @@
title = "new/home"
url = "/new"
title = "Главная"
url = "/"
layout = "new/master"
meta_title = "Новости Туркменистана и мира"
meta_description = "Мы информируем о событиях, происшествиях и тенденциях, которые влияют на жизнь Туркменистана и всего Центрально-Азиатского региона. Ежедневно контент пополняется свежими и достоверными новостями."
is_hidden = 0
seo_keywords = "Новости Туркменистана, новости мира, последние новости, актуальные новости, президент, Гурбангулы Бердымухаммедов, События, Общество, Экономика, Культура, Экомир, Спорт. Технологии, независимое, информационное агентство, информагентство Туркменистана, страны, интересные новости, фото, видео, объявления, в Ашхабаде, в Туркменистане."
robot_index = "index"
robot_follow = "follow"
[viewBag]
localeTitle[en] = "Home"
localeUrl[en] = "/home"
[builderList adv4]
modelClass = "Tps\Reklama\Models\Reklama"
scope = "-"
@ -50,7 +57,7 @@ pageNumber = "{{ :page }}"
{% partial 'newHome/main' %}
{% partial 'newHome/main-popular' %}
{% partial 'adv/2adv' records=records id=4 %}
{% partial 'adv/2adv' records=records id=19 id2=20 %}
{% partial 'newHome/publication' %}
@ -64,7 +71,7 @@ pageNumber = "{{ :page }}"
{% set detailsUrlParameter = adv5.detailsUrlParameter %}
{% partial 'adv/2adv' records=records id=5 %}
{% partial 'adv/2adv' records=records id=21 id2=22 %}
{% partial 'newHome/poleznoe' %}
@ -129,5 +136,7 @@ pageNumber = "{{ :page }}"
</section>
{% put scripts %}
<script src="{{ 'assets/new/scripts/marquee/marquee3k.js'|theme}}"></script>
<script src="{{ 'assets/new/scripts/core/main.js'|theme}}"></script>
{% endput %}

25
themes/modern2/pages/new/newPost.htm
View File

@ -1,10 +1,14 @@
title = "newPost"
title = "Пост"
url = "/new/post/:id/:slug"
layout = "new/master-inside"
is_hidden = 0
seo_keywords = "Türkmenistan, Turkmenistan, Туркменистан, Ориент новости, Orient news, Orienttm, Turkmen habarlary, Turkmen habarlar, Turkmen news, Новости Туркменистана, Новости СНГ, Новости средней азии, Новости Центральной Азии,"
robot_index = "index"
robot_follow = "follow"
[viewBag]
localeTitle[en] = "Post"
[views]
slug = "{{ :slug }}"
@ -12,6 +16,9 @@ slug = "{{ :slug }}"
slug = "{{ :slug }}"
id = "{{ :id }}"
categoryPage = 404
[SeoBlogPost]
post = "post"
==
<?php
function onStart(){
@ -19,6 +26,9 @@ function onStart(){
$postId = $this->param('id');
$currentPost = RainLab\Blog\Models\Post::where('id', $postId)->with(['category_groups'])->first();
$this['featuredPosts'] = RainLab\Blog\Models\Post::with(['categories'])->where('id', $postId)->paginate(10);
$catId = $this['featuredPosts'][0]->categories[0]->id;
//dd($this['featuredPosts'][0]->categories[0]->slug);
if($this->menuItems && $postId && $currentPost && $currentPost->category_groups){
@ -34,6 +44,12 @@ function onStart(){
}
}
// dd($this['posts']);
}
?>
==
@ -46,6 +62,8 @@ function onStart(){
</style>
{% endput %}
{% component 'SeoBlogPost' %}
{% set post = blogPost.post %}
@ -70,7 +88,7 @@ function onStart(){
<div class="swiper-slide">
<div class="article-item">
<img src="{{img.photoq|media_cdn|resize(1112)}}" alt=" {{post.title}}" />
<img src="{{img.photoq|media_cdn|resize(692)}}" alt=" {{post.title}}" />
</div>
</div>
@ -79,7 +97,7 @@ function onStart(){
{% else %}
<div class="swiper-slide">
<div class="article-item">
<img src="{{post.featured_image|media_cdn|resize(1112)}}" alt=" {{post.title}}" />
<img src="{{post.featured_image|media_cdn|resize(692)}}" alt=" {{post.title}}" />
</div>
</div>
{% endif %}
@ -96,6 +114,7 @@ function onStart(){
<div class="article-desc">
{{post.content|md}}
<!-- <h5>ORIENT NEWS</h5>
<h5>Фото: figma.com</h5> -->
</div>

13
themes/modern2/pages/new/page-not-found-404.htm Normal file
View File

@ -0,0 +1,13 @@
title = "Page not found (404)"
url = "/new/404"
layout = "new/master-inside"
is_hidden = 0
robot_index = "index"
robot_follow = "follow"
==
<div class="jumbotron">
<div class="container">
<h1>{{'Page not found'|_}}</h1>
<p>{{'We are sorry, but the page you requested cannot be found.'|_}}</p>
</div>
</div>

6
themes/modern2/pages/new/search.htm
View File

@ -1,8 +1,10 @@
title = "new/search"
title = "Поиск"
url = "/new/search"
layout = "new/master-inside"
meta_title = "Поиск"
meta_description = "Поиск"
is_hidden = 0
robot_index = "index"
robot_index = "noindex"
robot_follow = "follow"
[blogPosts]

22
themes/modern2/partials/adv/2adv.htm
View File

@ -3,7 +3,8 @@
<section class="banners">
<div class="container banner-container">
<div class="banners-inner">
<div class="swiper bannerSwiper">
<div class="swiper bannerSwiper-1">
<div class="swiper-wrapper">
{% for record in records if record.group_id == id and record.active == 1 %}
@ -18,6 +19,23 @@
</div>
</div>
<div class="swiper bannerSwiper-2">
<div class="swiper-wrapper">
{% for record in records if record.group_id == id2 and record.active == 1 %}
<div class="swiper-slide">
<div class="banner">
<img src="{{record.media|media}}" alt="" />
</div>
</div>
</section>
{% else %}
<li class="no-data">{{ noRecordsMessage }}</li>
{% endfor %}
</div>
</div>
</div>
</div>
</section>

16
themes/modern2/partials/adv/right-sidebar.htm Normal file
View File

@ -0,0 +1,16 @@
[viewBag]
==
<div class="aside-ad-wrapper">
{% for record in records if record.group_id == id %}
{% if record.id == 96 %}
<a href="#">
<img src="{{record.media|media}}" alt="" />
</a>
{% endif %}
{% else %}
<li class="no-data">{{ noRecordsMessage }}</li>
{% endfor %}
</div>

20
themes/modern2/partials/adv/right-sidebar2.htm Normal file
View File

@ -0,0 +1,20 @@
[viewBag]
==
<div class="{{css}}-banner">
<div class="swiper trendingSwiper">
<div class="swiper-wrapper">
{% for record in records if record.group_id == id and record.active == 1 %}
<div class="swiper-slide">
<a href="#">
<img src="{{record.media|media}}" alt="" />
</a>
</div>
{% else %}
<li class="no-data">{{ noRecordsMessage }}</li>
{% endfor %}
</div>
</div>
</div>

18
themes/modern2/partials/new/head.htm Normal file
View File

@ -0,0 +1,18 @@
[viewBag]
==
<meta charset="UTF-8" />
<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-4375305456879458"
crossorigin="anonymous"></script>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="{{ 'assets/new/styles/style.css'|theme}}" />
<!-- <title>{{ this.page.meta_title }}</title> -->
<link rel="icon" href="{{'assets/images/icon/cropped-cropped-orienticon-32x32.png'|theme}}" sizes="32x32">
<link rel="icon" href="{{'assets/images/icon/cropped-cropped-orienticon-192x192.png'|theme}}" sizes="192x192">
<link rel="apple-touch-icon-precomposed" href="{{'assets/images/icon/cropped-cropped-orienticon-180x180.png'|theme}}">
<meta name="msapplication-TileImage" content="{{'assets/images/icon/cropped-cropped-orienticon-270x270.png'|theme}}">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="yandex-verification" content="9d83831cdb407bac" />

23
themes/modern2/partials/new/latest-news-mobile.htm
View File

@ -3,23 +3,13 @@
[blogPosts]
pageNumber = "{{ :page }}"
typePost = "turkmenistan"
postsPerPage = 6
noPostsMessage = "No posts found"
sortOrder = "published_at desc"
categoryPage = 404
postPage = 404
[blogPosts blogPosts2]
pageNumber = "{{ :page }}"
typePost = "world"
postsPerPage = 6
postsPerPage = 10
noPostsMessage = "No posts found"
sortOrder = "published_at desc"
categoryPage = 404
postPage = 404
==
{% set posts = blogPosts.posts %}
{% set posts2 = blogPosts2.posts %}
<!-- ASIDE MOBILE ============-->
@ -42,18 +32,7 @@ postPage = 404
{% endfor %}
{% for post2 in posts2 %}
<li>
<a href="{{'new/newPost'|page({id:post2.id,slug:post2.slug})}}">
<div class="time">{{post2.published_at|date('H:i')}}</div>
<p class="content">
{{ post2.title }}
</p>
</a>
</li>
{% endfor %}
</ul>
<button type="button" class="aside-mobile-open">
<img src="{{'assets/new/images/down-arrow.png'|theme}}" alt="" />

20
themes/modern2/partials/new/morque.htm
View File

@ -14,23 +14,23 @@ postPage = 404
<div class="marquee">
<div class="container">
<div class="marquee-inner">
<div class="marquee-title">
<span> {{'Главное'|_}}</span>
</div>
<marquee behavior="scroll" direction="left" scrollamount="7" onmouseover="this.stop()" onmouseleave="this.start()" class="ticker">
<div class="ticker-wrapper">
<div class="marquee2k" data-speed="0.6" data-reverse="false" data-pausable="true">
<p>
{% for post in posts %}
<div class="ticker-item">
<a href="{{'new/newPost'|page({id:post.id,slug:post.slug})}}">
{{post.title}}
</a>
</div>
<a href="{{'new/newPost'|page({id:post.id,slug:post.slug})}}">{{post.title}}</a>
{% endfor %}
</p>
</div>
</marquee>
</div>
</div>
</div>

18
themes/modern2/partials/new/post-featured.htm
View File

@ -1,15 +1,11 @@
[viewBag]
[blogPosts]
pageNumber = "{{ :page }}"
featured = "yes"
postsPerPage = 10
noPostsMessage = "No posts found"
sortOrder = "published_at desc"
[blogCategories]
slug = "watan"
displayEmpty = 0
categoryPage = 404
postPage = 404
==
{% set posts = blogPosts.posts %}
{% set posts = blogCategories.categories.shift.take_posts(10) %}
<div class="article-content-bottom">
<h3>{{'new.post.page.chitayte.takzhe'|_}}</h3>
@ -21,7 +17,7 @@ postPage = 404
<div class="swiper-slide">
<div class="video-item photo-item article-bottom-item">
<div class="video photo">
<img src="{{post.featured_image|media}}" />
<a href="{{'new/newPost'|page({id:post.id,slug:post.slug})}}" ><img src="{{post.featured_image|media|resize(391)}}" /></a>
</div>
<div class="sub-news-left-content-item-content video-info">
<div class="sub-news-left-content-item-date-content-head article-bottom-head">
@ -29,9 +25,9 @@ postPage = 404
<span>|</span>
<h4>{{post.published_at|date('H:i')}}</h4>
</div>
<p class="sub-news-left-content-item-date-content-info article-content-info article-content-info">
<a href="{{'new/newPost'|page({id:post.id,slug:post.slug})}}" class="sub-news-left-content-item-date-content-info article-content-info article-content-info">
{{ post.title }}
</p>
</a>
</div>
</div>
</div>

2
themes/modern2/partials/new/post_list_item.htm
View File

@ -3,7 +3,7 @@
<a href="{{'new/newPost'|page({id:post.id,slug:post.slug})}}" class="sub-news-left-content-item rubric-item">
<div class="sub-news-left-content-item-img">
{% if post.featured_image %}
<img src="{{post.featured_image|media|resize(350, 200)}}" alt="{{post.title}}" />
<img src="{{post.featured_image|media|resize(350, 200)}}" alt="{{post.title}}" loading="lazy" />
{% endif %}
</div>
<div class="sub-news-left-content-item-content">

2
themes/modern2/partials/newHome/main-bussiness.htm
View File

@ -1,7 +1,7 @@
[viewBag]
==
<div class="sub-news-left">
<h2>{{ 'new.home.page.left'|_ }}</h2>
<h2><a href="{{'new/group'|page({categoryGroup: 'news', slug:'novosti-biznesa'})}}">{{ 'new.home.page.left'|_ }}</a></h2>
<div class="sub-news-left-content">
{% for post in categoryPosts %}

25
themes/modern2/partials/newHome/main-popular.htm
View File

@ -35,7 +35,7 @@ pageNumber = "{{ :page }}"
<div class="trending-inner">
<div class="trending-aside">
<div class="trending-head">
<h2>{{ 'new.home.ot.redaktora'|_ }}</h2>
<h2><a href="{{'new/group'|page({categoryGroup: 'stati', slug:'ot-redaktora'})}}">{{ 'new.home.ot.redaktora'|_ }}</a></h2>
<span></span>
</div>
@ -61,28 +61,7 @@ pageNumber = "{{ :page }}"
{% partial 'newHome/popular-item' %}
<div class="trending-banner">
<div class="swiper trendingSwiper">
<div class="swiper-wrapper">
{% for record in records if record.group_id == 18 and record.active == 1 %}
<div class="swiper-slide">
<a href="#">
<img src="{{record.media|media}}" alt="" />
</a>
</div>
{% else %}
<li class="no-data">{{ noRecordsMessage }}</li>
{% endfor %}
</div>
</div>
</div>
{% partial 'adv/right-sidebar2' records=records id=18 css="trending" %}
</div>
</div>

12
themes/modern2/partials/newHome/main-slider.htm
View File

@ -17,12 +17,12 @@ postPage = 404
<a href="{{'new/newPost'|page({id:posts.first.id,slug:posts.first.slug})}}" class="main-news-lead">
<div class="main-news-bg">
<img src="{{posts[0].featured_image|media|resize(964, 655,{mode: 'crop'})}}" alt="{{posts[0].title}}" />
<img src="{{posts[0].featured_image|media|resize(814, 505,{mode: 'crop'})}}" alt="{{posts[0].title}}" />
</div>
<div class="main-news-overlay"></div>
<div class="main-news-info">
<div class="main-news-info-title">
<h3> {{posts[0].categories.implode('name', ', ')}}</h3>
<h3> {{posts[0].categories.first.name}}</h3>
<span>|</span>
<h4>{{posts[0].published_at|date('d.m.Y')}}</h4>
<span>|</span>
@ -39,7 +39,7 @@ postPage = 404
<a href="{{'new/newPost'|page({id:posts[1].id,slug:posts[1].slug})}}" class="main-news-min-item">
<div class="main-news-min-bg">
<img src="{{posts[1].featured_image|media|resize(375, 191, {mode: 'crop'})}}" alt="{{posts[1].title}}" />
<img src="{{posts[1].featured_image|media|resize(275)}}" alt="{{posts[1].title}}" />
<div class="main-news-overlay"></div>
<p class="main-news-min-info">
{{posts[1].title}}
@ -50,7 +50,7 @@ postPage = 404
<a href="{{'new/newPost'|page({id:posts[2].id,slug:posts[2].slug})}}" class="main-news-min-item">
<div class="main-news-min-bg">
<img src="{{posts[2].featured_image|media|resize(375, 191, {mode: 'crop'})}}" alt="{{posts[2].title}}" />
<img src="{{posts[2].featured_image|media|resize(275)}}" alt="{{posts[2].title}}" />
<div class="main-news-overlay"></div>
<p class="main-news-min-info">
{{posts[2].title}}
@ -61,7 +61,7 @@ postPage = 404
<a href="{{'new/newPost'|page({id:posts[3].id,slug:posts[3].slug})}}" class="main-news-min-item">
<div class="main-news-min-bg">
<img src="{{posts[3].featured_image|media|resize(375, 191, {mode: 'crop'})}}" alt="{{posts[3].title}}" />
<img src="{{posts[3].featured_image|media|resize(275)}}" alt="{{posts[3].title}}" />
<div class="main-news-overlay"></div>
<p class="main-news-min-info">
{{posts[3].title}}
@ -81,7 +81,7 @@ postPage = 404
<div class="swiper-slide">
<a href="{{'new/newPost'|page({id:post.id,slug:post.slug})}}" class="main-news-min-item">
<div class="main-news-min-bg">
<img src="{{post.featured_image|media|resize(768)}}" alt=""/>
<img src="{{post.featured_image|media|resize(534)}}" alt=""/>
<div class="main-news-overlay"></div>
<p class="main-news-min-info">
{{ post.title }}

6
themes/modern2/partials/newHome/main-tender.htm
View File

@ -10,7 +10,7 @@ $this['afisha'] = RainLab\Blog\Models\CategoryGroup::where('slug', 'poster')->wi
==
<div class="sub-news-right">
<div class="sub-news-right-top">
<h2>{{'new.home.page.right'|_ }}</h2>
<h2><a href="{{'new/group'|page({categoryGroup: 'news', slug:'watan'})}}">{{'new.home.page.right'|_ }}</a></h2>
<div class="sub-news-right-top-content">
{% for post in categoryPosts %}
@ -33,10 +33,10 @@ $this['afisha'] = RainLab\Blog\Models\CategoryGroup::where('slug', 'poster')->wi
</div>
</div>
<div class="sub-news-right-bottom">
<h2>{{afisha.name}}</h2>
<h2><a href="{{'new/group'|page({categoryGroup: 'poster'})}}">{{afisha.name}}</a></h2>
<div class="sub-news-right-bottom-content">
{% for category in afisha.category_items %}
<a href="{{ 'new/afisha'|page({slug:category.slug}) }}" class="sub-news-right-bottom-item">{{ category.name }}</a>
<a href="{{'new/group'|page({categoryGroup: 'poster', slug:category.slug})}}" class="sub-news-right-bottom-item">{{ category.name }}</a>
{% else %}
<a href="#" class="sub-news-right-bottom-item">No Record</a>

5
themes/modern2/partials/newHome/main.htm
View File

@ -58,17 +58,16 @@ pageNumber = "{{ :page }}"
<div class="swiper-wrapper">
{% for key, record in records if record.group_id == 16 %}
<!-- {% if record.id == 93 %} -->
<div class="swiper-slide">
<a href="#">
<a href="{{ record.url }}" target="_blank">
<img src="{{record.media|media}}" alt="" />
</a>
</div>
<!-- {% endif %} -->
{% else %}
<li class="no-data">{{ noRecordsMessage }}</li>
{% endfor %}

2
themes/modern2/partials/newHome/media-post-item.htm
View File

@ -3,7 +3,7 @@
<a href="{{'new/newPost'|page({id:post.id,slug:post.slug})}}" class="useful-aside-item">
<div class="useful-aside-item-top">
<div class="useful-aside-img">
<img src="{{post.featured_image|media|resize(100)}}" alt="" />
<img src="{{post.featured_image|media|resize(87)}}" alt="" />
</div>
<span>{{post.published_at|date('d.m.Y')}} | {{post.published_at|date('H:i')}}</span>
</div>

23
themes/modern2/partials/newHome/photo-item.htm
View File

@ -1,27 +1,8 @@
[viewBag]
==
<!-- <div class="swiper-slide">
<div class="video-item photo-item">
<div class="video photo">
<img src="{{post.featured_image|media|resize(383, 274, {mode: 'crop'})}}" />
</div>
<div class="sub-news-left-content-item-content video-info">
<div class="sub-news-left-content-item-date-content-head">
<h4>{{post.published_at|date('d.m.Y')}}</h4>
<span>|</span>
<h4>{{post.published_at|date('H:i')}}</h4>
</div>
<p class="sub-news-left-content-item-date-content-info">
{{post.title}}
</p>
</div>
</div>
</div>
-->
<div class="video-item photo-item">
<div class="video photo">
<img src="{{post.poster_file|media|resize(383, 274, {mode: 'crop'})}}" />
<img src="{{post.poster_file|media|resize(283)}}" />
</div>
<div class="photo-item-folder">
<!-- fl-1 -->
@ -29,7 +10,7 @@
{% for photo in post.media_file %}
<div class="swiper-slide">
<div class="photo-scroller-item">
<img src="{{photo.media|media}}" />
<img src="{{photo.media|media|resize(283)}}" />
</div>
</div>
{% endfor %}

2
themes/modern2/partials/newHome/photo.htm
View File

@ -30,7 +30,7 @@ pageNumber = "{{ :page }}"
<div class="trending-head media-head">
<h2>{{ 'new.page.photo.archive'|_ }}</h2>
<h2><a href="{{'new/group'|page({categoryGroup: 'media', slug:'photo'})}}" style="color:white;">{{ 'new.page.photo.archive'|_ }}</a></h2>
<span></span>
</div>
<div class="trending-content">

4
themes/modern2/partials/newHome/poleznoe.htm
View File

@ -26,7 +26,7 @@ postPage = 404
<div class="useful-inner">
<div class="trending-main useful-main">
<div class="trending-head">
<h2>{{ 'new.page.poleznoe'|_ }}</h2>
<h2><a href="{{'new/group'|page({categoryGroup: 'stati', slug:'poleznoe'})}}">{{ 'new.page.poleznoe'|_ }}</a></h2>
<span></span>
</div>
<div class="useful-main-content trending-main-content">
@ -43,7 +43,7 @@ postPage = 404
<div class="useful-aside">
<div class="trending-head">
<h2>{{ 'new.page.media.partner'|_ }}</h2>
<h2><a href="{{'new/group'|page({categoryGroup: 'news', slug:'novosti-partnerov'})}}">{{ 'new.page.media.partner'|_ }}</a></h2>
<span></span>
</div>
<div class="useful-aside-content">

2
themes/modern2/partials/newHome/post-item-img-cat.htm
View File

@ -2,7 +2,7 @@
==
<a href="{{'new/newPost'|page({id:post.id,slug:post.slug})}}" class="trending-item">
<div class="trending-img">
<img src="{{post.featured_image|media|resize(117)}}" alt="" />
<img src="{{post.featured_image|media|resize(87)}}" alt="" />
</div>
<div class="trending-main-content-inner">
<div class="sub-news-left-content-item-date-content-head trending-aside-content-head">

2
themes/modern2/partials/newHome/post-item-img.htm
View File

@ -2,7 +2,7 @@
==
<a href="{{'new/newPost'|page({id:post.id,slug:post.slug})}}" class="sub-news-left-content-item">
<div class="sub-news-left-content-item-img">
<img src="{{post.featured_image|media|resize(117)}}" alt="" />
<img src="{{post.featured_image|media|resize(87)}}" alt="" />
</div>
<div class="sub-news-left-content-item-content">
<div class="sub-news-left-content-item-date-content-head">

10
themes/modern2/partials/newHome/publication.htm
View File

@ -16,7 +16,7 @@ exceptCategories = "ot-redaktora"
<div class="container">
<div class="posts-inner">
<div class="trending-head">
<h2>{{'new.home.publication'|_}}</h2>
<h2><a href="{{'new/group'|page({categoryGroup: 'stati'})}}">{{'new.home.publication'|_}}</a></h2>
<span></span>
</div>
<div class="posts-content">
@ -25,11 +25,11 @@ exceptCategories = "ot-redaktora"
<a href="{{'new/newPost'|page({id:posts[0].id,slug:posts[0].slug})}}" class="posts-item big">
<div class="trending-aside-item">
<div class="trending-img">
<img src="{{posts[0].featured_image|media|resize(818, 571, {mode: 'crop'})}}" alt="" />
<img src="{{posts[0].featured_image|media|resize(618)}}" alt="" />
</div>
<div class="trending-aside-content">
<div class="sub-news-left-content-item-date-content-head trending-aside-content-head">
<h3>{{posts[0].categories.implode('name', ', ')}}</h3>
<h3>{{posts[0].categories.first.name}}</h3>
<span>|</span>
<h4>{{posts[0].published_at|date('d.m.Y')}}</h4>
<span>|</span>
@ -47,11 +47,11 @@ exceptCategories = "ot-redaktora"
<a href="{{'new/newPost'|page({id:post.id,slug:post.slug})}}" class="posts-item sm">
<div class="trending-aside-item">
<div class="trending-img">
<img src="{{post.featured_image|media|resize(396, 217, {mode: 'crop'})}}" alt="{{post.title}}" />
<img src="{{post.featured_image|media|resize(396, 217, {mode: 'crop'})}}" alt="{{post.title}}" loading="lazy" />
</div>
<div class="trending-aside-content">
<div class="sub-news-left-content-item-date-content-head trending-aside-content-head">
<h3>{{post.categories.implode('name', ', ')}}</h3>
<h3>{{ post.categories.first.name }}</h3>
<span>|</span>
<h4>{{post.published_at|date('d.m.Y')}}</h4>
<span>|</span>

15
themes/modern2/partials/newHome/right-sidebar.htm
View File

@ -85,19 +85,6 @@ pageNumber = "{{ :page }}"
</a>
</div>
</div>
<div class="aside-ad-wrapper">
{% for record in records if record.group_id == 17 %}
{% if record.id == 96 %}
<a href="#">
<img src="{{record.media|media}}" alt="" />
</a>
{% endif %}
{% else %}
<li class="no-data">{{ noRecordsMessage }}</li>
{% endfor %}
</div>
{% partial 'adv/right-sidebar2' records=records id=17 css="aside" %}
</aside>
</div>

2
themes/modern2/partials/newHome/video-item.htm
View File

@ -3,7 +3,7 @@
<div class="video-item {% if post.type == 'photo' %} photo-item {% endif %}">
<div class="video {% if post.type == 'photo' %} photo {% endif %}">
{% if post.type == 'photo' %}
<img src="{{post.poster_file|media|resize(683, 385, )}}">
<img src="{{post.poster_file|media|resize(683, 385, )}}" loading="lazy">
{% else %}
<video src="{{post.media_file[0].media|media}}" controls poster="{{post.poster_file|media}}" ></video>
{% endif %}

2
themes/modern2/partials/newHome/video.htm
View File

@ -20,7 +20,7 @@ pageNumber = "{{ :page }}"
<div class="trending-head media-head">
<h2>{{ 'new.page.video.archive'|_ }}</h2>
<h2><a href="{{'new/group'|page({categoryGroup: 'media', slug:'video'})}}" style="color:white;">{{ 'new.page.video.archive'|_ }}</a></h2>
<span></span>
</div>
<div class="trending-content">