commit from server

.htaccess

@@ -21,6 +21,7 @@
 </ifModule>
 <IfModule mod_headers.c>
     Header append Vary Accept env=REQUEST_image
+    Header set X-Robots-Tag "noindex, nofollow" for "cdn.orient.tm"
 </IfModule>
 <IfModule mod_mime.c>
     AddType image/webp .webp

config/cms.php

@@ -384,7 +384,7 @@ return [
     |
     */
 
-    'enableSafeMode' => null,
+    'enableSafeMode' => false, //null
 
     /*
     |--------------------------------------------------------------------------

plugins/rainlab/blog/components/RssFeed.php

@@ -136,7 +136,7 @@ class RssFeed extends ComponentBase
         $this->postPage = $this->page['postPage'] = $this->property('postPage');
         $this->category = $this->page['category'] = $this->loadCategory();
         $this->posts = $this->page['posts'] = $this->listPosts();
-$this->page['language'] = \App::getLocale();
+        $this->page['language'] = \App::getLocale();
         $this->page['link'] = $this->pageUrl($this->blogPage);
         $this->page['rssLink'] = $this->currentPageUrl();
         //Carbon::setLocale('en');
@@ -163,8 +163,11 @@ $this->page['language'] = \App::getLocale();
         /*
          * Add a "url" helper attribute for linking to each post and category
          */
+
         $posts->each(function($post) {
             $post->setUrl($this->postPage, $this->controller);
+            $locale = $post->locale;
+            $post->url = sprintf("https://orient.tm/%s/post/%d/%s", $locale, $post->id, $post->slug);
         });
 
         return $posts;

plugins/rainlab/blog/components/rssfeed/google.htm

@@ -3,10 +3,12 @@
     xmlns:media="http://search.yahoo.com/mrss/">
     <channel>
         <title>{{ this.page.meta_title ?: this.page.title }}{% if category %}:{{category.name}}{% endif %}</title>
-        <link>{{ link }}</link>
+        <link>{{ rssLink }}</link>
         <description>{{ this.page.meta_description ?: this.page.description }}</description>
         <atom:link href="{{ rssLink }}" rel="self" type="application/rss+xml" />
         <language>{{language}}</language>
+        <copyright>copiright</copyright>
+        <lastBuildDate>{{ posts|length > 0 ? posts.first.rss_date : '' }}</lastBuildDate>
         {% for post in posts %}
         <item>
             <title>{{ post.title }}</title>

plugins/rainlab/blog/models/Post.php

@@ -638,14 +638,19 @@ class Post extends Model
         if ($category !== null) {
 
             $category = Category::find($category);
-            $categories = $category->getAllChildrenAndSelf()->lists('id');
-            if (!$categories) {
-                $categories[] = $category->id;
+            
+            if ($category !== null) {
+                
+                $categories = $category->getAllChildrenAndSelf()->lists('id');
+                if (!$categories) {
+                    $categories[] = $category->id;
+                }
+                //            dd($categories);
+                $query->whereHas('categories', function ($q) use ($categories) {
+                    $q->whereIn('id', $categories);
+                });
             }
-            //            dd($categories);
-            $query->whereHas('categories', function ($q) use ($categories) {
-                $q->whereIn('id', $categories);
-            });
+
         }
 
         if ($select) {

plugins/tps/tps/Plugin.php

@@ -8,6 +8,7 @@ class Plugin extends PluginBase
     {
         return [
             'Tps\Tps\Components\MediaView'       => 'mediaView',
+            'Tps\Tps\Components\ExpertForm'       => 'expertForm',
         ];
     }
 

plugins/tps/tps/plugin.yaml

@@ -36,6 +36,19 @@ navigation:
                 icon: icon-question
                 permissions:
                     - media.authors
+    main-menu-item2:
+        label: FAQ
+        url: tps/tps/faqcontroller
+        icon: icon-question
+        sideMenu:
+            side-menu-item:
+                label: 'FAQ category'
+                url: tps/tps/faqcategorycontroller
+                icon: icon-sitemap
+    main-menu-item3:
+        label: 'Expert Form'
+        url: tps/tps/expertformcontroller
+        icon: icon-comments-o
 permissions:
     media.media:
         tab: Media

plugins/tps/tps/updates/version.yaml

@@ -36,3 +36,27 @@
 1.0.13:
     - 'Updated table tps_tps_media'
     - builder_table_update_tps_tps_media_2.php
+1.0.14:
+    - 'Created table tps_tps_faq_category'
+    - builder_table_create_tps_tps_faq_category.php
+1.0.15:
+    - 'Created table tps_tps_faq'
+    - builder_table_create_tps_tps_faq.php
+1.0.16:
+    - 'Updated table tps_tps_faq'
+    - builder_table_update_tps_tps_faq.php
+1.0.17:
+    - 'Updated table tps_tps_faq'
+    - builder_table_update_tps_tps_faq_2.php
+1.0.18:
+    - 'Updated table tps_tps_faq'
+    - builder_table_update_tps_tps_faq_3.php
+1.0.19:
+    - 'Updated table tps_tps_faq'
+    - builder_table_update_tps_tps_faq_4.php
+1.0.20:
+    - 'Created table tps_tps_expert_form'
+    - builder_table_create_tps_tps_expert_form.php
+1.0.21:
+    - 'Updated table tps_tps_expert_form'
+    - builder_table_update_tps_tps_expert_form.php

themes/modern2/assets/new/scripts/core/main.js

@@ -413,15 +413,17 @@ photoList.forEach((photoItem, index) => {
 
 const photoScrollerContainer = new Select(".photo-scroller").select();
 
-photoScrollerContainer.addEventListener("click", (e) => {
-  if (
-    !e.target.classList.contains("photo-scroller-next") &&
-    !e.target.classList.contains("photo-scroller-prev")
-  ) {
-    photoScroller.classList.remove("active");
-    document.body.style.overflow = "visible";
-  }
-});
+if (photoScrollerContainer) {
+    photoScrollerContainer.addEventListener("click", (e) => {
+      if (
+        !e.target.classList.contains("photo-scroller-next") &&
+        !e.target.classList.contains("photo-scroller-prev")
+      ) {
+        photoScroller.classList.remove("active");
+        document.body.style.overflow = "visible";
+      }
+    });
+}
 
 const trendingSwiper = new Swiper(".trendingSwiper", {
   slidesPerView: 1,

themes/modern2/config/lang.yaml

@@ -19,6 +19,25 @@ en:
   post.not_found: 'No posts found'
   footer.copyright: 'ORIENT - INFORMATION AGENCY'
   paginate.from: 'from'
+  #[component.expert_form]
+  expert_form.name: 'Your name'
+  expert_form.phone: 'Your phone number'
+  expert_form.email: 'Your email'
+  expert_form.message: 'Your message'
+  expert_form.name_error: 'Enter your name'
+  expert_form.phone_error: 'Enter your phone number'
+  expert_form.email_error: 'Enter your email'
+  expert_form.message_error: 'Enter your message'
+  expert_form.send: 'Send'
+  expert_form.name_placeholder: 'Pascal'
+  expert_form.phone_placeholder: 'Your contact number'
+  expert_form.email_placeholder: 'Your email address'
+  expert_form.message_placeholder: 'Ask your question'
+  expert_form.success_title: 'Ask an expert'
+  expert_form.success_text: 'Your message was successfully delivered'
+  expert_form.success_close_modal: 'Close a window'
+  expert_form.captcha: 'Protection'
+  expert_form.captcha_placeholder: 'Numbers from the picture'
 ru:
   site.name: 'Ориент'
   site.slogan: 'Наш ориентир то, что сближает людей'
@@ -40,4 +59,22 @@ ru:
   post.not_found: 'Записей не найдено'
   footer.copyright: 'ORIENT - ИНФОРМАЦИОННОЕ АГЕНТСТВО'
   paginate.from: 'из'
-
+  #[component.expert_form]
+  expert_form.name: 'Ваше имя'
+  expert_form.phone: 'Ваш телефон'
+  expert_form.email: 'Ваш email'
+  expert_form.message: 'Ваше сообщение'
+  expert_form.name_error: 'Введите свое имя'
+  expert_form.phone_error: 'Ваш телефон'
+  expert_form.email_error: 'Ваш email'
+  expert_form.message_error: 'Ваше сообщение'
+  expert_form.send: 'Отправить'
+  expert_form.name_placeholder: 'Паскаль'
+  expert_form.phone_placeholder: 'Ваш контактный номер'
+  expert_form.email_placeholder: 'Ваш адрес электронной почты'
+  expert_form.message_placeholder: 'Задайте свой вопрос'
+  expert_form.success_title: 'Спроси эксперта'
+  expert_form.success_text: 'Ваше сообщение успешно доставлено'
+  expert_form.success_close_modal: 'Закрыть окно'
+  expert_form.captcha: 'Проверка'
+  expert_form.captcha_placeholder: 'Цифры с картинки'

themes/modern2/config/settings.yaml

@@ -60,4 +60,33 @@ tabs:
         label: Top section cateegory
         default: events
         span: left
-
+    officeIsLocated:
+        tab: Contact us
+        label: The office is located at
+        default: г. Ашхабад, проспект Махтумкули, 72
+        span: right
+    workingHours:
+        tab: Contact us
+        label: Working hours
+        default: c 09:00 до 18:00
+        span: left
+    editorialEmail:
+        tab: Contact us
+        label: Editorial Email
+        default: ny.orienttm@gmail.com
+        span: right
+    emailTheAdministration:
+        tab: Contact us
+        label: Email of the administration
+        default: ny.orienttm@gmail.com
+        span: left
+    editorialPhone:
+        tab: Contact us
+        label: Editorial Phone
+        default: +993 65 50-42-48
+        span: right
+    administrationPhone:
+        tab: Contact us
+        label: Administration phone
+        default: +993 65 50-42-48
+        span: left

themes/modern2/layouts/new/master-inside.htm

@@ -22,6 +22,7 @@ default = 0
 
   {% partial 'new/head' %}
   {% component 'SeoCmsPage' %}
+
   {% styles %}
 </head>
 
@@ -120,6 +121,7 @@ default = 0
   <script src="{{ 'assets/new/jquery.js'|theme}}"></script>
   <script src="{{ 'assets/new/scripts/swiper/swiper-bundle.min.js'|theme}}"></script>
     <script src="{{ 'assets/new/copy.js'|theme}}"></script>
+ 
 
     {% framework extras %}
     {% scripts %}

themes/modern2/layouts/new/master.htm

@@ -23,6 +23,36 @@ random = 0
             height: 100%;
             margin: auto 0 0 0;
         }
+        
+
+      .btn-wrapper {
+        display: flex;
+        flex-direction: row;
+      }
+
+      .btn {
+        background: white;
+        border-radius: 20px;
+        border: 1px solid #504f4f;
+        display: flex;
+        align-items: center;
+        padding: 5px;
+        margin: 5px;
+        width: 50%;
+        
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+
+      .btn img {
+        height: 80%;
+        width: auto;
+        margin-right: 3px;
+      }
+
+        
   </style>
   {% styles %}
 </head>

themes/modern2/meta/menus/event_menu.yaml

@@ -2,16 +2,16 @@ items:
     -
         title: 'В помощь экспортерам'
         type: url
-        url: /ru/new/posts/news/pomosh-eksporteram
+        url: /ru/posts/news/pomosh-eksporteram
         code: ''
         viewBag:
             locale:
                 en:
                     title: 'Export Promotion'
-                    url: /en/new/posts/news/pomosh-eksporteram
+                    url: /en/posts/news/pomosh-eksporteram
                 tm:
                     title: 'Eksporty ösdürmek'
-                    url: /tm/new/posts/news/pomosh-eksporteram
+                    url: /tm/posts/news/pomosh-eksporteram
             isHidden: '0'
             cssClass: ''
             isExternal: '0'

themes/modern2/meta/menus/new-top-menui.yaml

@@ -1,54 +1,42 @@
 items:
     -
         title: Новости
-        nesting: null
         type: url
-        url: /ru/new/posts/news
+        url: /ru/posts/news
         code: ''
-        reference: null
-        cmsPage: null
-        replace: null
         viewBag:
             locale:
                 en:
                     title: News
-                    url: /en/new/posts/news
+                    url: /en/posts/news
                 tm:
                     title: Habarlar
-                    url: /tm/new/posts/news
+                    url: /tm/posts/news
             isHidden: '0'
             cssClass: ''
             isExternal: '0'
         items:
             -
                 title: События
-                nesting: null
                 type: url
-                url: /ru/new/posts/news/events
+                url: /ru/posts/news/events
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Events
-                            url: /new/posts/news/events
+                            url: /en/posts/news/events
                         tm:
                             title: Çäreler
-                            url: /tm/new/posts/news/events
+                            url: /tm/posts/news/events
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Экономика
-                nesting: null
                 type: url
-                url: /ru/new/posts/news/economy
+                url: /ru/posts/news/economy
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
@@ -56,19 +44,15 @@ items:
                             url: ''
                         tm:
                             title: Ykdysadyýet
-                            url: /tm/new/posts/news/ykdysadyyet
+                            url: /tm/posts/news/ykdysadyyet
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Общество
-                nesting: null
                 type: url
-                url: /ru/new/posts/news/society
+                url: /ru/posts/news/society
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
@@ -76,348 +60,296 @@ items:
                             url: ''
                         tm:
                             title: Jemgyýet
-                            url: /tm/new/posts/news/jemgyyet
+                            url: /tm/posts/news/jemgyyet
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Культура
-                nesting: null
                 type: url
-                url: /ru/new/posts/news/culture
+                url: /ru/posts/news/culture
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Culture
-                            url: /en/new/posts/news/culture
+                            url: /en/posts/news/culture
                         tm:
                             title: Medeniýet
-                            url: /tm/new/posts/news/medeniyet
+                            url: /tm/posts/news/medeniyet
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: 'Новости бизнеса'
-                nesting: null
                 type: url
-                url: /ru/new/posts/news/novosti-biznesa
+                url: /ru/posts/news/novosti-biznesa
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: 'Business news'
-                            url: /en/new/posts/news/business-news
+                            url: /en/posts/news/business-news
                         tm:
                             title: 'Biznes habarlary'
-                            url: /tm/new/posts/news/biznes-habarlary
+                            url: /tm/posts/news/biznes-habarlary
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Спорт
-                nesting: null
                 type: url
-                url: /ru/new/posts/news/sport
+                url: /ru/posts/news/sport
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Sport
-                            url: /en/new/posts/news/sport
+                            url: /en/posts/news/sport
                         tm:
                             title: Sport
-                            url: /tm/new/posts/news/sport
+                            url: /tm/posts/news/sport
+                    isHidden: '0'
+                    cssClass: ''
+                    isExternal: '0'
+            -
+                title: Наука
+                type: url
+                url: /ru/posts/news/nauka
+                code: ''
+                viewBag:
+                    locale:
+                        en:
+                            title: Science
+                            url: /en/posts/news/science
+                        tm:
+                            title: 'Ylym Bilim'
+                            url: ''
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Экомир
-                nesting: null
                 type: url
-                url: /ru/new/posts/news/eco-world
+                url: /ru/posts/news/eco-world
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Eco-world
-                            url: /en/new/posts/news/eco-world
+                            url: /en/posts/news/eco-world
                         tm:
                             title: Ekodünýä
-                            url: /tm/new/posts/news/ekodunya
+                            url: /tm/posts/news/ekodunya
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Технологии
-                nesting: null
                 type: url
-                url: /ru/new/posts/news/technology
+                url: /ru/posts/news/technology
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Technology
-                            url: /en/new/posts/news/technology
+                            url: /en/posts/news/technology
                         tm:
                             title: Tehnologiýalar
-                            url: /tm/new/posts/news/tehnologiyalar
+                            url: /tm/posts/news/tehnologiyalar
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: 'Новости партнеров'
-                nesting: null
                 type: url
-                url: /ru/new/posts/news/novosti-partnerov
+                url: /ru/posts/news/novosti-partnerov
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: 'Media partners news'
-                            url: /en/new/posts/news/media-partners-news
+                            url: /en/posts/news/media-partners-news
                         tm:
                             title: 'Hyzmatdaşlarymyzyň habarlary'
-                            url: /tm/new/posts/news/hyzmatdaslarymyzyn-habarlary
+                            url: /tm/posts/news/hyzmatdaslarymyzyn-habarlary
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
     -
         title: Статьи
-        nesting: null
         type: url
-        url: /ru/new/posts/stati
+        url: /ru/posts/stati
         code: ''
-        reference: null
-        cmsPage: null
-        replace: null
         viewBag:
             locale:
                 en:
                     title: Articles
-                    url: /en/new/posts/stati
+                    url: /en/posts/stati
                 tm:
                     title: Makalalar
-                    url: /tm/new/posts/stati
+                    url: /tm/posts/stati
             isHidden: '0'
             cssClass: ''
             isExternal: '0'
         items:
             -
                 title: События
-                nesting: null
                 type: url
-                url: /ru/new/posts/stati/events
+                url: /ru/posts/stati/events
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Events
-                            url: /en/new/posts/stati/events
+                            url: /en/posts/stati/events
                         tm:
                             title: Wakalar
-                            url: /tm/new/posts/stati/chareler
+                            url: /tm/posts/stati/chareler
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Экономика
-                nesting: null
                 type: url
-                url: /ru/new/posts/stati/economy
+                url: /ru/posts/stati/economy
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Economy
-                            url: /en/new/posts/stati/economy
+                            url: /en/posts/stati/economy
                         tm:
                             title: Ykdysadyýet
-                            url: /tm/new/posts/stati/ykdysadyyet
+                            url: /tm/posts/stati/ykdysadyyet
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Общество
-                nesting: null
                 type: url
-                url: /ru/new/posts/stati/society
+                url: /ru/posts/stati/society
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Society
-                            url: /en/new/posts/stati/society
+                            url: /en/posts/stati/society
                         tm:
                             title: Jemgyýet
-                            url: /tm/new/posts/stati/jemgyyet
+                            url: /tm/posts/stati/jemgyyet
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: 'От редактора'
-                nesting: null
                 type: url
-                url: /ru/new/posts/stati/ot-redaktora
+                url: /ru/posts/stati/ot-redaktora
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: 'Editor''s choice'
-                            url: /en/new/posts/stati/editors-choice
+                            url: /en/posts/stati/editors-choice
                         tm:
                             title: 'Redaktoryň pikiri'
-                            url: /tm/new/posts/stati/redaktoryn-pikiri
+                            url: /tm/posts/stati/redaktoryn-pikiri
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Культура
-                nesting: null
                 type: url
-                url: /ru/new/posts/stati/culture
+                url: /ru/posts/stati/culture
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Culture
-                            url: /en/new/posts/stati/culture
+                            url: /en/posts/stati/culture
                         tm:
                             title: Medeniýet
-                            url: /tm/new/posts/stati/medeniyet
+                            url: /tm/posts/stati/medeniyet
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Полезное
-                nesting: null
                 type: url
-                url: /ru/new/posts/stati/poleznoe
+                url: /ru/posts/stati/poleznoe
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: 'Useful articles'
-                            url: '/En/new/posts/stati/Useful articles'
+                            url: '/en/posts/stati/Useful articles'
                         tm:
                             title: 'Peýdaly makalalar'
-                            url: /tm/new/posts/stati/peydaly-makalalar
+                            url: /tm/posts/stati/peydaly-makalalar
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Спорт
-                nesting: null
                 type: url
-                url: /ru/new/posts/stati/sport
+                url: /ru/posts/stati/sport
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Sport
-                            url: /en/new/posts/stati/sport
+                            url: /en/posts/stati/sport
                         tm:
                             title: Sport
-                            url: /tm/new/posts/stati/sport
+                            url: /tm/posts/stati/sport
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Экомир
-                nesting: null
                 type: url
-                url: /ru/new/posts/stati/eco-world
+                url: /ru/posts/stati/eco-world
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Eco-world
-                            url: /en/new/posts/stati/eco-world
+                            url: /en/posts/stati/eco-world
                         tm:
                             title: Eco-world
-                            url: /tm/new/posts/stati/ekodunya
+                            url: /tm/posts/stati/ekodunya
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Технологии
-                nesting: null
                 type: url
-                url: /ru/new/posts/stati/technology
+                url: /ru/posts/stati/technology
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Technology
-                            url: /en/new/posts/stati/technology
+                            url: /en/posts/stati/technology
                         tm:
                             title: Tehnologiýalar
-                            url: /tm/new/posts/stati/tehnologiyalar
+                            url: /tm/posts/stati/tehnologiyalar
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
     -
         title: Медиа
-        nesting: null
         type: url
-        url: /ru/new/posts/media
+        url: /ru/posts/media
         code: ''
-        reference: null
-        cmsPage: null
-        replace: null
         viewBag:
             locale:
                 en:
                     title: Media
-                    url: /en/new/posts/media
+                    url: /en/posts/media
                 tm:
                     title: Media
-                    url: /tm/new/posts/media
+                    url: /tm/posts/media
             isHidden: '0'
             cssClass: ''
             isExternal: '0'
@@ -426,7 +358,7 @@ items:
                 title: Фото
                 nesting: null
                 type: url
-                url: /ru/new/posts/media/photo
+                url: /ru/posts/media/photo
                 code: ''
                 reference: null
                 cmsPage: null
@@ -446,7 +378,7 @@ items:
                 title: Видео
                 nesting: null
                 type: url
-                url: /ru/new/posts/media/video
+                url: /ru/posts/media/video
                 code: ''
                 reference: null
                 cmsPage: null
@@ -464,142 +396,114 @@ items:
                     isExternal: '0'
     -
         title: Афиша
-        nesting: null
         type: url
-        url: /ru/new/posts/poster
+        url: /ru/posts/poster
         code: ''
-        reference: null
-        cmsPage: null
-        replace: null
         viewBag:
             locale:
                 en:
                     title: Posters
-                    url: /en/new/posts/poster
+                    url: /en/posts/poster
                 tm:
                     title: Afişa
-                    url: /tm/new/posts/poster
+                    url: /tm/posts/poster
             isHidden: '0'
             cssClass: ''
             isExternal: '0'
         items:
             -
                 title: Концерты
-                nesting: null
                 type: url
-                url: /ru/new/posts/poster/koncerty
+                url: /ru/posts/poster/koncerty
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Concerts
-                            url: /en/new/posts/poster/concerts
+                            url: /en/posts/poster/concerts
                         tm:
                             title: Konsertler
-                            url: /tm/new/posts/poster/konsertler
+                            url: /tm/posts/poster/konsertler
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Кинотеатры
-                nesting: null
                 type: url
-                url: /ru/new/posts/poster/kinoteatry
+                url: /ru/posts/poster/kinoteatry
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Cinemas
-                            url: /en/new/posts/poster/cinemas
+                            url: /en/posts/poster/cinemas
                         tm:
                             title: Kinoteatrlar
-                            url: /tm/new/posts/poster/kinolar
+                            url: /tm/posts/poster/kinolar
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Театры
-                nesting: null
                 type: url
-                url: /ru/new/posts/poster/teatry
+                url: /ru/posts/poster/teatry
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Theaters
-                            url: /en/new/posts/poster/theaters
+                            url: /en/posts/poster/theaters
                         tm:
                             title: Teatrlar
-                            url: /tm/new/posts/poster/teatrlar
+                            url: /tm/posts/poster/teatrlar
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Выставки
-                nesting: null
                 type: url
-                url: /ru/new/posts/poster/vystavki
+                url: /ru/posts/poster/vystavki
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Exhibitions
-                            url: /en/new/posts/poster/exhibitions
+                            url: /en/posts/poster/exhibitions
                         tm:
                             title: Sergiler
-                            url: /tm/new/posts/poster/sergiler
+                            url: /tm/posts/poster/sergiler
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Спорт
-                nesting: null
                 type: url
-                url: /ru/new/posts/poster/sportt
+                url: /ru/posts/poster/sportt
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Sport
-                            url: /en/new/posts/poster/sport
+                            url: /en/posts/poster/sport
                         tm:
                             title: Sport
-                            url: /tm/new/posts/poster/sport
+                            url: /tm/posts/poster/sport
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: Объявления
-                nesting: null
                 type: url
-                url: /ru/new/posts/poster/obyavleniya
+                url: /ru/posts/poster/obyavleniya
                 code: ''
-                reference: null
-                cmsPage: null
-                replace: null
                 viewBag:
                     locale:
                         en:
                             title: Аds
-                            url: /en/new/posts/poster/ads
+                            url: /en/posts/poster/ads
                         tm:
                             title: Bildirişler
-                            url: /tm/new/posts/poster/mahabat
+                            url: /tm/posts/poster/mahabat
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
@@ -629,7 +533,7 @@ items:
         type: cms-page
         url: null
         code: ''
-        reference: new/contact
+        reference: contact
         cmsPage: null
         replace: null
         viewBag:

themes/modern2/pages/404.htm

@@ -5,6 +5,28 @@ is_hidden = 0
 robot_index = "index"
 robot_follow = "follow"
 ==
+<?php
+use Illuminate\Support\Facades\Response;
+
+function onStart()
+{
+    $html = '
+        <div style="display: flex; justify-content: center; align-items: center; height: 100vh; background-color: #f4f4f9;">
+            <div style="text-align: center; background-color: #ffffff; border-radius: 12px; box-shadow: 0 10px 20px rgba(0, 0, 0, 0.1); padding: 40px; max-width: 500px; width: 100%; font-family: Arial, sans-serif;">
+                <h1 style="font-size: 40px; color: #f44336; margin-bottom: 20px;">' . __('Page Deleted') . '</h1>
+                <p style="font-size: 18px; color: #333333; margin-bottom: 30px;">' . __('We are sorry, but the page you are trying to access has been deleted.') . '</p>
+                <a href="/" style="padding: 12px 25px; background-color: #4CAF50; color: #fff; text-decoration: none; font-size: 16px; border-radius: 8px; box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); transition: background-color 0.3s;">
+                    Go Back to Home
+                </a>
+            </div>
+        </div>';
+
+    // Add 'X-Robots-Tag' header to prevent indexing
+    return Response::make($html, 410)
+        ->header('X-Robots-Tag', 'noindex, nofollow');
+}
+?>
+==
 <div style="padding-bottom: 50px;height: 55rem;">
     <div style="padding: 10%;padding-top: 30px !important;">
         <h1 style="font-size: 26px;">{{'Page not found'|_}}</h1>

themes/modern2/pages/adstxt.htm

@@ -4,4 +4,5 @@ is_hidden = 0
 robot_index = "index"
 robot_follow = "follow"
 ==
-google.com, pub-4375305456879458, DIRECT, f08c47fec0942fa0
+google.com, pub-4375305456879458, DIRECT, f08c47fec0942fa0
+google.com, pub-9296898717630432, DIRECT, f08c47fec0942fa0

themes/modern2/pages/home2.htm

@@ -1,152 +0,0 @@
-title = "home2"
-url = "/home2"
-layout = "master"
-is_hidden = 0
-robot_index = "index"
-robot_follow = "follow"
-
-[blogCategories]
-slug = "{{ :slug }}"
-displayEmpty = 0
-categoryPage = "category"
-
-[adverts adv_center_1]
-code = "bank"
-type = "slider"
-random = 0
-
-[adverts adv_center_2]
-code = "bottom"
-type = "slider"
-random = 0
-
-[adverts adv_center_3]
-code = "cnpc"
-type = "slider"
-random = 0
-
-[adverts adv_center_4]
-code = "china-daily"
-type = "slider"
-random = 0
-
-[adverts adv_center_5]
-code = "very-bottom"
-type = "slider"
-random = 0
-
-[adverts right_top]
-code = "right-top"
-type = "slider"
-random = 0
-
-[adverts right_middle]
-code = "right-middle"
-type = "slider"
-random = 0
-
-[adverts right_bottom]
-code = "right-bottom"
-type = "slider"
-random = 0
-
-[adverts right_top_m]
-code = "right-top"
-type = "slider"
-random = 0
-
-[adverts right_middle_m]
-code = "right-middle"
-type = "slider"
-random = 0
-
-[adverts right_bottom_m]
-code = "right-bottom"
-type = "slider"
-random = 0
-==
-<section class="hero">
-    <div class="auto__container">
-        <div class="hero__inner">
-            {% partial 'slider' %}
-        </div>
-    </div>
-</section>
-
-
-<!-- main start
-================================================ -->
-<section class="main">
-    <div class="auto__container">
-        <div class="main__inner">
-            <div class="main__content">
-                <div class="main__banner">
-                    {% component 'adv_center_1' %}
-                </div>
-                <!-- event start ================================================ -->
-                {% partial 'index/top_section' category = blogCategories.categories.shift %}
-                <!-- event end ================================================ -->
-                <div class="main__banner">
-                    {% component 'adv_center_2' %}
-                </div>
-                <div class="main__body">
-                    <div class="main__body-row">
-                        {% partial 'index/category_posts2' category = blogCategories.categories.shift %}
-                        <div class="banner__mobile">
-                            {% component 'right_top_m' css_class= 'main__sidebar-adv' %}
-                        </div>
-                        {% partial 'index/category_posts2' category = blogCategories.categories.shift %}
-                    </div>
-                </div>
-                <div class="main__banner">
-                    {% component 'adv_center_3' %}
-                </div>
-                <div class="main__body">
-                    <div class="main__body-row">
-                        {% partial 'index/category_posts2' category = blogCategories.categories.shift %}
-                        <div class="banner__mobile">
-                            {% component 'right_middle_m' css_class = 'main__sidebar-adv' %}
-                        </div>
-                        {% partial 'index/category_posts2' category = blogCategories.categories.shift %}
-                    </div>
-                </div>
-                <div class="main__banner">
-                    {% component 'adv_center_4' %}
-                </div>
-                <div class="main__body">
-                    <div class="main__body-row">
-                        {% partial 'index/category_posts2' category = blogCategories.categories.shift %}
-                        <div class="banner__mobile">
-                            {% component 'right_bottom_m' css_class= 'main__sidebar-adv' %}
-                        </div>
-                        {% partial 'index/category_posts2' category = blogCategories.categories.shift %}
-                    </div>
-                </div>
-                <div class="main__banner">
-                    {% component 'adv_center_5' %}
-                </div>
-
-            </div>
-            <div class="main__sidebar">
-                {% partial 'sidebar__cards' %}
-                {% component 'right_top' css_class= 'main__sidebar-adv' %}
-                {% partial 'popular-posts2' %}
-                {% component 'right_middle' css_class = 'main__sidebar-adv' %}
-                {% component 'right_bottom' css_class= 'main__sidebar-adv' %}
-                 {% component 'right_top' css_class= 'main__sidebar-adv' %}
-                {% partial 'tags' %}
-                {% partial 'calendar' %}
-            </div>
-        </div>
-    </div>
-</section>
-
-<h1>{{ blogCategories.categories.shift.name }}</h1>
-<!-- popUp end
-    ================================================ -->
-{% partial 'index/mobile_app' %}
-<!-- popUp end
-    ================================================ -->
-
-<!-- main end
-================================================ -->

themes/modern2/pages/index.htm

@@ -1,157 +0,0 @@
-title = "Главная"
-url = "/qoldqq"
-layout = "master"
-meta_title = "Новости Туркменистана и мира"
-meta_description = "Мы информируем о событиях, происшествиях и тенденциях, которые влияют на жизнь Туркменистана и всего Центрально-Азиатского региона. Ежедневно контент пополняется свежими и достоверными новостями."
-is_hidden = 0
-seo_keywords = "Новости Туркменистана, новости мира, последние новости, актуальные новости, президент, Гурбангулы Бердымухаммедов, События, Общество, Экономика, Культура, Экомир, Спорт. Технологии, независимое, информационное агентство, информагентство Туркменистана, страны, интересные новости, фото, видео, объявления, в Ашхабаде, в Туркменистане."
-robot_index = "index"
-robot_follow = "follow"
-
-[viewBag]
-localeTitle[en] = "Home"
-localeMeta_title[en] = "All main news of Turkmenistan today. Latest news of the region."
-localeMeta_title[tm] = "Türkmenistanyň we dünýä habarlary"
-localeMeta_description[en] = "Events. The main and latest news of politics for today. Latest political news of Turkmenistan"
-
-[blogCategories]
-slug = "{{ :slug }}"
-displayEmpty = 0
-categoryPage = "category"
-
-[adverts adv_center_1]
-code = "bank"
-type = "slider"
-random = 0
-
-[adverts adv_center_2]
-code = "bottom"
-type = "slider"
-random = 0
-
-[adverts adv_center_3]
-code = "cnpc"
-type = "slider"
-random = 0
-
-[adverts adv_center_4]
-code = "china-daily"
-type = "slider"
-random = 0
-
-[adverts adv_center_5]
-code = "very-bottom"
-type = "slider"
-random = 0
-
-[adverts right_top]
-code = "right-top"
-type = "slider"
-random = 0
-
-[adverts right_middle]
-code = "right-middle"
-type = "slider"
-random = 0
-
-[adverts right_bottom]
-code = "right-bottom"
-type = "slider"
-random = 0
-
-[adverts right_top_m]
-code = "right-top"
-type = "slider"
-random = 0
-
-[adverts right_middle_m]
-code = "right-middle"
-type = "slider"
-random = 0
-
-[adverts right_bottom_m]
-code = "right-bottom"
-type = "slider"
-random = 0
-==
-<section class="hero">
-    <div class="auto__container">
-        <div class="hero__inner">
-            {% partial 'slider' %}
-        </div>
-    </div>
-</section>
-
-<!-- main start
-================================================ -->
-<section class="main">
-    <div class="auto__container">
-        <div class="main__inner">
-            <div class="main__content">
-                <div class="main__banner">
-                    {% component 'adv_center_1' %}
-                </div>
-                <!-- event start ================================================ -->
-                {% partial 'index/top_section' category = blogCategories.categories.shift %}
-                <!-- event end ================================================ -->
-                <div class="main__banner">
-                    {% component 'adv_center_2' %}
-                </div>
-                <div class="main__body">
-                    <div class="main__body-row">
-                        {% partial 'index/category_posts' category = blogCategories.categories.shift %}
-                        <div class="banner__mobile">
-                            {% component 'right_top_m' css_class= 'main__sidebar-adv' %}
-                        </div>
-                        {% partial 'index/category_posts' category = blogCategories.categories.shift %}
-                    </div>
-                </div>
-                <div class="main__banner">
-                    {% component 'adv_center_3' %}
-                </div>
-                <div class="main__body">
-                    <div class="main__body-row">
-                        {% partial 'index/category_posts' category = blogCategories.categories.shift %}
-                        <div class="banner__mobile">
-                            {% component 'right_middle_m' css_class = 'main__sidebar-adv' %}
-                        </div>
-                        {% partial 'index/category_posts' category = blogCategories.categories.shift %}
-                    </div>
-                </div>
-                <div class="main__banner">
-                    {% component 'adv_center_4' %}
-                </div>
-                <div class="main__body">
-                    <div class="main__body-row">
-                        {% partial 'index/category_posts' category = blogCategories.categories.shift %}
-                        <div class="banner__mobile">
-                            {% component 'right_bottom_m' css_class= 'main__sidebar-adv' %}
-                        </div>
-                        {% partial 'index/category_posts' category = blogCategories.categories.shift %}
-                    </div>
-                </div>
-                <div class="main__banner">
-                    {% component 'adv_center_5' %}
-                </div>
-
-            </div>
-            <div class="main__sidebar">
-                {% partial 'sidebar__cards' %}
-                {% component 'right_top' css_class= 'main__sidebar-adv' %}
-                {% partial 'popular-posts' %}
-                {% component 'right_middle' css_class = 'main__sidebar-adv' %}
-                {% component 'right_bottom' css_class= 'main__sidebar-adv' %}
-                {% partial 'tags' %}
-                {% partial 'calendar' %}
-            </div>
-        </div>
-    </div>
-</section>
-<!-- popUp end
-    ================================================ -->
-{% partial 'index/mobile_app' %}
-<!-- popUp end
-    ================================================ -->
-
-<!-- main end
-================================================ -->

themes/modern2/pages/new/contact.htm

@@ -2,49 +2,417 @@ title = "new/contact"
 url = "/new/contact"
 layout = "new/master-inside"
 meta_title = "Обратная связь"
-is_hidden = 0
+is_hidden = 1
 robot_index = "index"
 robot_follow = "follow"
 
 [contactForm]
 ==
+<style>
+/* General Styles */
+.contant {
+  font-family: Roboto, sans-serif;
+  color: #181D17;
+}
+
+.container {
+  max-width: 1660px;
+  margin: 0 auto;
+  padding: 20px;
+}
+
+.contact-inner {
+  display: flex;
+  flex-direction: column;
+  gap: 48px
+}
+
+.section-title-wrapper {
+    display: flex;
+    gap: 16px;
+    align-items: center;
+}
+
+.section-title {
+    font-family: Roboto;
+    font-size: 24px;
+    font-weight: 600;
+    line-height: 28.13px;
+}
+
+.section-title-separator {
+    width: 100%;
+    height: 1px;
+    background: #039F37;
+}
+
+.contact-content-wrapper {
+     display: flex;
+     gap: 48px;
+     padding: 0 67px;
+}
+
+.contact-left,
+.contact-right {
+  flex: 1;
+  background: #EBEFE6;
+  border: 1px solid #E4E9DD;
+  padding: 24px;
+  border-radius: 4px;
+}
+
+.contact-header {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+}
+
+.contact-header h3 {
+    font-size: 20px;
+    font-weight: 600;
+    line-height: 23.44px;
+}
+
+.contact-header p {
+    font-size: 17px;
+    font-weight: 400;
+    line-height: 22.1px;
+    color: #424940;
+}
+
+
+
+.contact-block {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+
+    max-width: none;
+}
+
+.contact-head h2 {
+  font-size: 24px;
+  font-weight: bold;
+  margin-bottom: 15px;
+  color: #333;
+}
+
+.contact-form .contact-content {
+  display: flex;
+  flex-direction: column;
+  gap: 24px;
+}
+
+.contact-content-form-top {
+    display: flex;
+    gap: 16px;
+    width: 100%;
+}
+
+.contact-form label {
+  display: block;
+  font-weight: bold;
+  font-size: 14px;
+  color: #333;
+}
+
+.contact-form input,
+.contact-form textarea {
+  width: 100%;
+  padding: 16px;
+  font-family: Roboto;
+  font-size: 16px;
+  font-weight: 400;
+  line-height: 18.75px;
+
+  border: 1px solid #7A7A7A;
+  border-radius: 2px;
+  background: none;
+}
+
+.contact-form textarea {
+  resize: none;
+}
+
+.contact-antispam img {
+  max-width: 100%;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+
+.contact-form button {
+  display: inline-block;
+  padding: 10px 20px;
+  font-size: 20px;
+  font-weight: 500;
+  line-height: 23.44px;
+
+  background-color: #00822C;
+  color: #fff;
+  border: none;
+  border-radius: 2px;
+  cursor: pointer;
+  width: 100%;
+  max-width: none;
+}
+
+.contact-form button:hover {
+  background-color: #218838;
+}
+
+/* Contact Details Section */
+.contact-right {
+  display: flex;
+  flex-direction: column;
+  gap: 63px;
+}
+
+.contact-right-block-wrapper {
+    display: flex;
+    gap: 24px;
+}
+
+.contact-right-block {
+    display: flex;
+    flex-direction: column;
+    gap: 24px;
+    flex: 1;
+}
+
+.contact-right-block-title {
+    font-size: 20px;
+    font-weight: 400;
+    line-height: 24px;
+}
+
+.contact-right-block-item {
+     display: flex;
+     gap: 10px;
+}
+
+.contact-right-block-item-content {
+     display: flex;
+     flex-direction: column;
+}
+
+.contact-right-block-item h4 {
+    font-size: 16px;
+    font-weight: 400;
+    line-height: 24px;
+    color: #181D17;
+}
+
+.contact-right-block-item p {
+    font-size: 16px;
+    font-weight: 400;
+    line-height: 24px;
+    color: #424940;
+}
+
+.contact-right ul {
+  list-style: none;
+  padding: 0;
+}
+
+.contact-right ul li {
+  margin-bottom: 10px;
+  font-size: 14px;
+  color: #555;
+}
+
+.contact-right ul li strong {
+  color: #333;
+}
+
+/* Responsive Styles */
+@media (max-width: 768px) {
+  .contact-inner {
+    flex-direction: column;
+    gap: 48px;
+  }
+  
+  .contact-content-form-top {
+    flex-direction: column;   
+  }
+  
+  .contact-right-block-wrapper {
+    flex-direction: column;   
+  }
+
+  .contact-left,
+  .contact-right {
+    flex: unset;
+  }
+  
+  .contact-content-wrapper {
+      padding: 0;
+      flex-direction: column;
+  }
+  
+    .contact-left,
+    .contact-right {
+      padding: 16px;
+    }
+}
+</style>
+
 <main class="contant">
-    <div class="container">
-      <div class="contact-inner">
+  <div class="container">
+    <div class="contact-inner">
+      <!-- Left Section: Contact Form -->
+      <div class="section-title-wrapper">
+        <h2 class="section-title">Контакты</h2>
+        <div class="section-title-separator"></div>
+      </div>
+      <div class="contact-content-wrapper">
         <div class="contact-left">
-          <div class="trending-head contact-head">
-            <h2>{{ 'contact.feedback'|_ }}</h2>
-            <span></span>
-          </div>
-          
-          
           <form class="contact-form">
             <div class="contact-content">
-              <div class="contact-block">
-                <label for="name" name="name">Ваше имя <span>*</span></label>
-                <input type="text" required placeholder="Аманов Аман" id="name" />
+              <div class="contact-header">
+                  <h3>Свяжитесь с нами</h3>
+                  <p>Есть идея или сообщение для нашего агентства? Заполните форму ниже, и мы обязательно с вами свяжемся. Ваши предложения и вопросы помогают нам становиться лучше!</p>
+              </div>
+              <div class="contact-content-form-top">
+                  <div class="contact-block">
+                    <label for="name" name="name">Ваше имя <span>*</span> </label>
+                    <input
+                      type="text"
+                      required
+                      placeholder="Аманов Аман"
+                      id="name"
+                    />
+                  </div>
+                  <div class="contact-block">
+                    <label for="email" name="email"
+                      >Ваше Email <span>*</span>
+                    </label>
+                    <input
+                      required
+                      type="email"
+                      placeholder="amanamanov@gmail.com"
+                      id="email"
+                    />
+                  </div>
               </div>
               <div class="contact-block">
-                <label for="email" name="email">Ваше Email <span>*</span></label>
-                <input required type="email" placeholder="amanamanov@gmail.com" id="email" />
-              </div>
-              <div class="contact-block">
-                <label for="message" name="message">Тема сообщения</label>
-                <textarea name="message" id="message" rows="10" placeholder="Тема сообщения"></textarea>
-              </div>
-              <div class="contact-antispam">
-                <img src="{{'assets/new/images/antispam.jpg'|theme}}" alt="" />
-              </div>
-              <div class="contact-block">
-                <label for="code" name="code">Введите текст на картинке<span>*</span></label>
-                <input type="text" required id="code" />
+                <label for="message" name="message">Ваше сообщение</label>
+                <textarea
+                  name="message"
+                  id="message"
+                  rows="4"
+                  placeholder="Задайте нам вопрос или напишите нам сообщение"
+                ></textarea>
               </div>
               <button type="submit">Отправить</button>
             </div>
-
-            <div class="contact-send"></div>
           </form>
         </div>
+
+        <div class="contact-right">
+          <div class="contact-header">
+              <h3>Контактные данные Orient</h2>
+              <p>
+                Наши контактные данные, адрес офиса и режим работы. Мы всегда на
+                связи, чтобы ответить на ваши вопросы и предложения. Ждем вас!
+              </p>
+          </div>
+          
+          <div class="contact-right-block-wrapper">
+          
+              <div class="contact-right-block">
+                  <h4 class="contact-right-block-title">Офис расположен по адресу:</h4>
+                  <div class="contact-right-block-item">
+                      <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M12 19C9.65 17.2667 7.896 15.5833 6.738 13.95C5.58 12.3167 5.00067 10.7167 5 9.15C5 7.06667 5.65 5.35433 6.95 4.013C8.25 2.67167 9.93333 2.00067 12 2C14.0667 1.99933 15.75 2.67033 17.05 4.013C18.35 5.35567 19 7.068 19 9.15C19 10.7167 18.421 12.3167 17.263 13.95C16.105 15.5833 14.3507 17.2667 12 19ZM12 11C12.55 11 13.021 10.8043 13.413 10.413C13.805 10.0217 14.0007 9.55067 14 9C13.9993 8.44933 13.8037 7.97867 13.413 7.588C13.0223 7.19733 12.5513 7.00133 12 7C11.4487 6.99867 10.978 7.19467 10.588 7.588C10.198 7.98133 10.002 8.452 10 9C9.998 9.548 10.194 10.019 10.588 10.413C10.982 10.807 11.4527 11.0027 12 11ZM5 22V20H19V22H5Z" fill="#39693B"/>
+                      </svg>
+                      <div class="contact-right-block-item-content">
+                          <p>{{ this.theme.officeIsLocated }}</p>
+                      </div>
+                  </div>
+              </div>
+              
+              <div class="contact-right-block">
+                  <h4 class="contact-right-block-title">Режим работы:</h4>
+                  <div class="contact-right-block-item">
+                      <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M14.55 16.55L15.95 15.125L13 12.175V8H11V13L14.55 16.55ZM11 6H13V4H11V6ZM18 13H20V11H18V13ZM11 20H13V18H11V20ZM4 13H6V11H4V13ZM12 22C10.6167 22 9.31667 21.7373 8.1 21.212C6.88334 20.6867 5.825 19.9743 4.925 19.075C4.025 18.1757 3.31267 17.1173 2.788 15.9C2.26333 14.6827 2.00067 13.3827 2 12C1.99933 10.6173 2.262 9.31733 2.788 8.1C3.314 6.88267 4.02633 5.82433 4.925 4.925C5.82367 4.02567 6.882 3.31333 8.1 2.788C9.318 2.26267 10.618 2 12 2C13.382 2 14.682 2.26267 15.9 2.788C17.118 3.31333 18.1763 4.02567 19.075 4.925C19.9737 5.82433 20.6863 6.88267 21.213 8.1C21.7397 9.31733 22.002 10.6173 22 12C21.998 13.3827 21.7353 14.6827 21.212 15.9C20.6887 17.1173 19.9763 18.1757 19.075 19.075C18.1737 19.9743 17.1153 20.687 15.9 21.213C14.6847 21.739 13.3847 22.0013 12 22Z" fill="#39693B"/>
+                      </svg>
+
+                      <div class="contact-right-block-item-content">
+                          <p>{{ this.theme.workingHours }}</p>
+                      </div>
+                  </div>
+              </div>
+              
+          </div>
+          
+           <div class="contact-right-block-wrapper">
+          
+              <div class="contact-right-block">
+                  <h4 class="contact-right-block-title">Контакты редакции:</h4>
+                  <div class="contact-right-block-item">
+                      <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M2 20V4H22V20H2ZM12 13L20 8V6L12 11L4 6V8L12 13Z" fill="#39693B"/>
+                      </svg>
+
+                      <div class="contact-right-block-item-content">
+                          <h4>Email редакции:</h4>
+
+                          <p>{{ this.theme.editorialEmail }}</p>
+                      </div>
+                  </div>
+                  
+                  <div class="contact-right-block-item">
+                      <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M10 20H14V19H10V20ZM5 23V1H19V23H5ZM7 16H17V6H7V16Z" fill="#39693B"/>
+                      </svg>
+
+
+                      <div class="contact-right-block-item-content">
+                          <h4>Телефон редакции:</h4>
+
+                          <p>{{ this.theme.editorialPhone }}</p>
+                      </div>
+                  </div>
+              </div>
+              
+              <div class="contact-right-block">
+                  <h4 class="contact-right-block-title">Контакты администрации:</h4>
+                  <div class="contact-right-block-item">
+                      <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M2 20V4H22V20H2ZM12 13L20 8V6L12 11L4 6V8L12 13Z" fill="#39693B"/>
+                      </svg>
+
+                      <div class="contact-right-block-item-content">
+                          <h4>Email администрации:</h4>
+
+                          <p>{{ this.theme.emailTheAdministration }}</p>
+                      </div>
+                  </div>
+                  
+                  <div class="contact-right-block-item">
+                      <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M10 20H14V19H10V20ZM5 23V1H19V23H5ZM7 16H17V6H7V16Z" fill="#39693B"/>
+                      </svg>
+
+
+                      <div class="contact-right-block-item-content">
+                          <h4>Телефон администрации:</h4>
+
+                          <p>{{ this.theme.administrationPhone }}</p>
+                      </div>
+                  </div>
+              </div>
+              
+          </div>
+          
+        </div>
       </div>
     </div>
-  </main>
+  </div>
+</main>
+
+{% put scripts %}
+<script src="{{ 'assets/new/scripts/marquee/marquee3k.js'|theme }}"></script>
+<script src="{{ 'assets/new/scripts/core/main.js'|theme }}"></script>
+{% endput %}

themes/modern2/pages/new/group.htm

@@ -1,5 +1,5 @@
 title = "Рубрика"
-url = "/new/posts/:categoryGroup/:slug?"
+url = "/posts/:categoryGroup/:slug?"
 layout = "new/master-inside"
 is_hidden = 0
 robot_index = "index"
@@ -19,6 +19,8 @@ categoryPage = "new/category"
 postPage = "new/newPost"
 
 [mediaView]
+
+[expertForm]
 ==
 <?php
 function onStart(){
@@ -36,7 +38,13 @@ function onStart(){
      $currentUrl = '/'.$currentLocale.'/new/posts/'.$this['group'].$currentCatLink;
 
      if(!$this['categorySlug'] && $this['group'] != 'media'){
-         $this->page->meta_title = $this['groupName']->name;
+         //$this->page->meta_title = $this['groupName']->name;
+         if ($this['groupName']) {
+             $this->page->meta_title = $this['groupName']->name;
+         } else {
+            // Handle the case where the group is not found
+            $this->page->meta_title = 'Unknown Group';
+         }
      }elseif(!$this['categorySlug'] && $this['group'] == 'media'){
          $this->page->meta_title = 'Media';
      }
@@ -95,6 +103,59 @@ function onStart(){
 {% set detailsPage = media.detailsPage %}
 {% set detailsKeyColumn = media.detailsKeyColumn %}
 {% set detailsUrlParameter = media.detailsUrlParameter %}
+{% put styles %}
+    <link href="{{'assets/css/form-faq.css'|theme}}" rel="stylesheet" />
+    <style>
+        .about__para_h3 {
+            line-height: 38px;
+            font-weight: 600;
+            text-align: center;
+            font-size: 2rem !important;
+        }
+        
+        /*.about__para {
+            font-size: 20px;
+            line-height: 38px;
+            font-weight: 400;
+        }*/
+        
+        .article-desc{
+            padding: 0 !important;
+            text-align: center;
+            gap: 0.4rem;
+        }
+        
+        
+      .btn-wrapper {
+        display: flex;
+        flex-direction: row;
+        justify-content: center;
+      }
+
+      .btn {
+        background: white;
+        border-radius: 20px;
+        border: 1px solid #504f4f;
+        display: flex;
+        align-items: center;
+        padding: 5px 15px;
+        margin: 5px;
+        width: auto;
+        
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+
+      .btn img {
+        height: 80%;
+        width: auto;
+        margin-right: 3px;
+      }
+      
+    </style>
+{% endput %}
 
 
 
@@ -106,6 +167,27 @@ function onStart(){
           <h2 style="text-transform: capitalize;">{% if category.name != "" %}{{category.name}}{% else %} {% if group == 'media' %} {{ group }} {% else %}{{ groupName.name }}{% endif %} {% endif %}</h2>
           <span></span>
         </div>
+        
+        {% if category.id == 813 %}
+            
+            <div class="article-desc">
+                <p class="about__para_h3">{{'Добро пожаловать в раздел "В помощь экспортерам"!'|_}}</p>
+                <p>{{'Здесь вы можете бесплатно задать вопрос эксперту консалтинговой компании “Export Hyzmat” по экспортной деятельности и получить на него ответ в течение 24 часов.'|_}}</p>
+                <p>{{'Для этого необходимо заполнить контактную форму, нажав на кнопку «Вопрос эксперту».'|_}}</p>
+                <p>{{'Вы также можете просмотреть "Часто задаваемые вопросы" ниже. Возможно, среди них уже есть ответ на ваш вопрос.'|_}}</p>
+            </div>
+            <div class="btn-wrapper">
+                <a href="{{'new/faq'|page}}" class="btn" style="font-size: 14px;">
+                      <img src="{{'assets/images/faq-icon.svg'|theme}}" alt="faq icon">
+                      <span>{{'Часто задаваемые вопросы'|_}}</span>
+                </a>
+                <button class="btn ask-expert-btn">
+                      <img src="{{'assets/images/question-mark-icon.svg'|theme}}" alt="question mark icon"> 
+                      <span>{{'Спроси эксперта'|_}}</span>
+                </button>
+            </div>
+            
+        {% endif %}
 
 
             {% if group == 'media' %}
@@ -165,10 +247,27 @@ function onStart(){
       </div>
     </div>
   </section>
+  
+  <main class="rubric-main">
+    <div class="container">
+      <div class="rubric-inner">
+
+        <div class="modal" id="expertFormModal">
+            <div class="modal-content">
+                <h2 id="form-header">{{'Спроси эксперта'|_}}</h2> 
+                {% component 'expertForm' %}
+            </div>
+        </div>
+
+      </div>
+    </div>
+  </main>
+
 
   {% put scripts %}
-       <script src="{{'assets/new/scripts/core/affiche-item.js'|theme}}"></script>
+       <!--<script src="{{'assets/new/scripts/core/affiche-item.js'|theme}}"></script>-->
        <script src="{{'assets/new/scripts/core/rubric.js'|theme}}"></script>
+       <script src="{{'assets/js/form-faq.js'|theme}}"></script>
 
 
        <script>
@@ -184,4 +283,6 @@ function onStart(){
         };
        </script>
 
-  {% endput %}
+
+
+  {% endput %}

themes/modern2/pages/new/home.htm

@@ -1,7 +1,7 @@
 title = "Главная"
 url = "/"
 layout = "new/master"
-meta_title = "Новости Туркменистана и мира"
+meta_title = "orient.tm - Новости Туркменистана и мира"
 meta_description = "Мы информируем о событиях, происшествиях и тенденциях, которые влияют на жизнь Туркменистана и всего Центрально-Азиатского региона. Ежедневно контент пополняется свежими и достоверными новостями."
 is_hidden = 0
 seo_keywords = "Новости Туркменистана, новости мира, последние новости, актуальные новости, президент, Гурбангулы Бердымухаммедов, События, Общество, Экономика, Культура, Экомир, Спорт. Технологии, независимое, информационное агентство, информагентство Туркменистана, страны, интересные новости, фото, видео, объявления, в Ашхабаде, в Туркменистане."
@@ -11,7 +11,13 @@ robot_follow = "follow"
 [viewBag]
 localeTitle[en] = "Home"
 localeTitle[tm] = "Baş Sahypa"
+
+[expertForm]
 ==
+{% put styles %}
+    <link href="{{'assets/css/form-faq.css'|theme}}" rel="stylesheet" />
+{% endput %}
+
 {% partial 'test/main' %}
 {% partial 'newHome/main-popular' %}
 
@@ -103,10 +109,26 @@ localeTitle[tm] = "Baş Sahypa"
 
 {% partial 'scripts/getPartners' groupId='1' %}
 
+<main class="rubric-main">
+    <div class="container">
+      <div class="rubric-inner">
+
+        <div class="modal" id="expertFormModal">
+            <div class="modal-content">
+                <h2 id="form-header">{{'Спроси эксперта'|_}}</h2> 
+                {% component 'expertForm' %}
+            </div>
+        </div>
+
+      </div>
+    </div>
+</main>
+
 
 
   {% put scripts %}
        <script src="{{ 'assets/new/scripts/marquee/marquee3k.js'|theme}}"></script>
         <script src="{{ 'assets/new/scripts/core/main.js'|theme}}"></script>
+        <script src="{{'assets/js/form-faq.js'|theme}}"></script>
 
-  {% endput %}
+  {% endput %}

themes/modern2/pages/new/newPost.htm

@@ -21,36 +21,65 @@ categoryPage = 404
 post = "post"
 ==
 <?php
-function onStart(){
-   //dd($this->page->blogPost);
+//function onStart(){
+//   //dd($this->page->blogPost);
    
-    $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);
+//    $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->count() > 0){
+//    if($this->menuItems && $postId && $currentPost && $currentPost->category_groups->count() > 0){
        
         
-        $currentGroup = $currentPost->category_groups[0]->name;
+//        $currentGroup = $currentPost->category_groups[0]->name;
     
-        foreach ($this->menuItems as $menu){
-            //dump($menu->title);
+//        foreach ($this->menuItems as $menu){
+//            //dump($menu->title);
             
-            if($menu->title === $currentGroup){
-                $menu->isActive = true;  
-                break;
-            }
+//            if($menu->title === $currentGroup){
+//                $menu->isActive = true;  
+//                break;
+//            }
             
-        }    
-    }
+//        }    
+//    }
     
     
  
-   // dd($this['posts']);
+//   // dd($this['posts']);
     
 
+//}
+function onStart() {
+    $postId = $this->param('id');
+    $currentPost = RainLab\Blog\Models\Post::where('id', $postId)->with(['category_groups'])->first();
+    
+    
+    if ($currentPost && $currentPost->category_groups->count() > 0) {
+        
+        $this['featuredPosts'] = RainLab\Blog\Models\Post::with(['categories'])
+            ->where('id', $postId)
+            ->paginate(10);
+        
+        
+        if ($this['featuredPosts']->count() > 0 && $this['featuredPosts'][0]->categories->count() > 0) {
+            $catId = $this['featuredPosts'][0]->categories[0]->id;
+            
+            
+            if ($this->menuItems) {
+                $currentGroup = $currentPost->category_groups[0]->name;
+                
+                foreach ($this->menuItems as $menu) {
+                    if ($menu->title === $currentGroup) {
+                        $menu->isActive = true;
+                        break;
+                    }
+                }
+            }
+        }
+    }
 }
 ?>
 ==

themes/modern2/pages/oldpost.htm

@@ -1,96 +0,0 @@
-title = "oldPost"
-url = "/ru/:slug"
-layout = "blog"
-is_hidden = 0
-robot_index = "index"
-robot_follow = "follow"
-
-[viewBag]
-localeUrl[en] = "en/:slug"
-
-[blogPost]
-slug = "{{ :slug }}"
-id = "{{ :id }}"
-categoryPage = "blog/category"
-
-[views]
-slug = "{{ :slug }}"
-
-[SeoBlogPost]
-post = "post"
-==
-{% component 'SeoBlogPost' %}
-<article class="news__content">
-    <header>
-        <div class="news__content-header">
-            <time class="news__date">
-                <span>{{post.published_at|date('d.m.Y')}}</span>
-                <svg xmlns="http://www.w3.org/2000/svg" width="4" height="4" viewBox="0 0 4 4">
-                    <path  data-name="Polygon 1" d="M2,0,4,2,2,4,0,2Z" fill="#a2a2a2" />
-                </svg>
-                <span>{{post.published_at|date('H:i')}}</span>
-            </time>
-            <div class="card__header-view" id="view">
-                <svg xmlns="http://www.w3.org/2000/svg">
-                    <g id="eye" transform="translate(-0.5 -3.5)">
-                        <path id="Path_6489" data-name="Path 6489"
-                            d="M1,11S4.636,4,11,4s10,7,10,7-3.636,7-10,7S1,11,1,11Z" fill="none" stroke=""
-                            stroke-linecap="round" stroke-linejoin="round" stroke-width="1"></path>
-                        <ellipse id="Ellipse_12" data-name="Ellipse 12" cx="4.859" cy="4.791" rx="4.859" ry="4.791"
-                            transform="translate(6.141 6.209)" fill="none" stroke="" stroke-linecap="round"
-                            stroke-linejoin="round" stroke-width="1"></ellipse>
-                    </g>
-                </svg>
-                {% partial 'view' %}
-            </div>
-        </div>
-        <h1 class="news__title">
-            {{post.title}}
-        </h1>
-        {% if post.featured_image %}
-        <picture class="news__image">
-            <img src="{{post.featured_image|media}}" alt="{{post.title}}">
-        </picture>
-        {% endif %}
-    </header>
-    <div class="news__body">
-        {{post.content|md}}
-    </div>
-    <div class="news__footer">
-        <div class="news__footer-social">
-            {% partial 'social' %}
-        </div>
-
-    </div>
-</article>
-<div class="news__sidebar">
-    {% partial 'latest_news'%}
-</div>
-
-{% put scripts %}
-<script>
-    $.request('views::onIncrement', {
-        update: { view: '@#view' },
-
-    })
-    var re = /\[video poster=\"(.+?)\".+?mp4=\"(.+?)\"/g;
-    //  re = /(\S+)=["']?((?:.(?!["']?\s+(?:\S+)=|\s*\/?[>"']))+.)["']?/g
-    var ptags  = document.querySelectorAll('p');
-
-    ptags.forEach(s =>{
-
-        var m;
-        m = re.exec(s.innerText);
-        if (m) {
-            var video =document.createElement('video');
-            video.setAttribute('src',m[2]);
-            video.setAttribute('controls',"")
-            video.setAttribute('width',"100%")
-            video.setAttribute('type',"video/mp4")
-            video.setAttribute('poster',m[1])
-            s.parentNode.replaceChild(video,s);
-
-        }
-    });
-</script>
-{% endput %}

themes/modern2/pages/post.htm

@@ -1,168 +0,0 @@
-title = "Пост"
-url = "/old/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"
-
-[blogPost]
-slug = "{{ :slug }}"
-id = "{{ :id }}"
-categoryPage = 404
-
-[views]
-slug = "{{ :slug }}"
-
-[SeoBlogPost]
-post = "post"
-==
-<?php
-function onStart(){
-   //dd($this->page->blogPost);
-   
-    $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->count() > 0){
-       
-        
-        $currentGroup = $currentPost->category_groups[0]->name;
-    
-        foreach ($this->menuItems as $menu){
-            //dump($menu->title);
-            
-            if($menu->title === $currentGroup){
-                $menu->isActive = true;  
-                break;
-            }
-            
-        }    
-    }
-    
-    
- 
-   // dd($this['posts']);
-    
-
-}
-?>
-==
-{% put styles %}
-    
-    <style>
-        p img {
-            width: 100%;    
-        }
-    </style>
-    
-{% endput %}
-{% component 'SeoBlogPost' %}
-
-
-{% set post = blogPost.post %}  
-
-  <main class="article">
-    <div class="container">
-      <div class="article-inner">
-        <div class="article-content">
-          <div class="article-content-top">
-            <div class="article-head">
-              <h2>
-                {{post.title}}
-              </h2>
-              <span id="view" style="display: flex !important;">{{post.published_at|date('d.m.Y')}} | {{post.published_at|date('H:i')}} |  <div style="padding-left: 10px;padding-right: 10px;"><img src="{{'assets/new/icons/eye.svg'|theme}}" alt="" style="width: 18px;" /></div> {% partial 'view' %}</span> 
-            </div>
-            <div class="article-swiper-wrapper">
-              <div class="swiper articleSwiper">
-                <div class="swiper-wrapper">
-                
-                {% if post.more_photo|length > 0 %}
-                    
-                  {% for img in post.more_photo %}
-                      
-                      <div class="swiper-slide">
-                        <div class="article-item">
-                          <img src="{{img.photoq|media_cdn|resize(692)}}" alt=" {{post.title}}" />
-                        </div>
-                      </div>
-                      
-                  {% endfor %}
-                  
-                {% else %}
-                  <div class="swiper-slide">
-                    <div class="article-item">
-                      <img src="{{post.featured_image|media_cdn|resize(692)}}" alt=" {{post.title}}" />
-                    </div>
-                  </div>
-                {% endif %}
-                  
-                </div>
-                <div class="photo-prev video-prev article-prev">
-                  <img src="{{'assets/new/icons/arrow-left-white.svg'|theme}}" alt="" />
-                </div>
-                <div class="photo-next video-next article-next">
-                  <img src="{{'assets/new/icons/arrow-right-white.svg'|theme}}" alt="" />
-                </div>
-              </div>
-            </div>
-            <div class="article-desc">
-             {{post.content|md}}
-            
-
-             <!--  <h5>ORIENT NEWS</h5>
-             -->
-             {% if post.img_source %}
-                 <h5 style="font-style: italic;text-align: right;">{{ 'Фото'|_ }}: {{ post.img_source }}</h5> 
-             {% endif %}
-            </div>
-             
-             {% partial 'new/social' %}
-         
-          </div>
-          
-          
-        {% partial 'new/post-featured' %}
-        
-      </div>
-      {% partial 'newHome/right-sidebar.htm' class="article-aside" %}
-    </div>
-    </div>
-  </main>
-  
-  {% put scripts %}
-  
-      <script>
-        $.request('views::onIncrement', {
-            update: { view: '@#view' },
-    
-        })
-        var re = /\[video poster=\"(.+?)\".+?mp4=\"(.+?)\"/g;
-        //  re = /(\S+)=["']?((?:.(?!["']?\s+(?:\S+)=|\s*\/?[>"']))+.)["']?/g
-        var ptags = document.querySelectorAll('p');
-    
-        ptags.forEach(s => {
-    
-            var m;
-            m = re.exec(s.innerText);
-            if (m) {
-                var video = document.createElement('video');
-                video.setAttribute('src', m[2]);
-                video.setAttribute('controls', "")
-                video.setAttribute('width', "100%")
-                video.setAttribute('type', "video/mp4")
-                video.setAttribute('poster', m[1])
-                s.parentNode.replaceChild(video, s);
-    
-            }
-        });
-    </script>
-
-       <script src="{{'assets/new/scripts/core/article.js'|theme}}"></script>
-  {% endput %}

themes/modern2/pages/rss.htm

@@ -17,8 +17,8 @@ localeMeta_description[en] = "The main and latest news of politics of Turkmenist
 categoryFilter = "{{ :category }}"
 sortOrder = "published_at desc"
 postsPerPage = 20
-blogPage = "index"
-postPage = "post"
+blogPage = 404
+postPage = 404
 source = "yandex"
 exceptCategories = "obyavlenie,tendery"
-==
+==

themes/modern2/pages/test/home2-new.htm

@@ -1,85 +0,0 @@
-title = "test/home2-new"
-url = "/home2-new"
-layout = "test/test-master"
-is_hidden = 0
-robot_index = "index"
-robot_follow = "follow"
-==
-{% partial 'test/main3' %}
-{% partial 'newHome/main-popular' %}
-
-{% partial 'adv/2adv' adv1Id="19" adv2Id="20" %}
-
-{% partial 'newHome/publication' %}
-
-
-{% partial 'adv/2adv' adv1Id="21" adv2Id="22" %}
-
-{% partial 'newHome/poleznoe' %}
-
-  <section class="media">
-    <div class="container">
-      <div class="media-inner">
-        <div class="media-videos">
-             {% partial 'test/video' %}
-        </div>
-
-        <div class="media-videos media-photos">
-             {% partial 'newHome/photo' %}
-        </div>
-
-
-      </div>
-    </div>
-  </section>
-
-
-  <section class="partners">
-      <div class="container">
-        <div class="partners-inner">
-          <h2 class="partners-head">{{'media_partners'|_}}</h2>
-          <div class="partners-content">
-            <div class="swiper partnerSwiper">
-              <div class="swiper-wrapper">
-
-                 {% partial 'newHome/partners' header="" %}
-
-              </div>
-              <div class="partner-prev photo-prev video-prev">
-                <img src="{{'assets/new/icons/arrow-left-white.svg'|theme}}" alt="" />
-              </div>
-              <div class="partner-next photo-next video-next">
-                <img src="{{'assets/new/icons/arrow-right-white.svg'|theme}}" alt="" />
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </section>
-
-
-  <section class="photo-scroller">
-    <div class="photo-scroller-inner">
-      <div class="swiper photoScrollerSwiper">
-        <div class="swiper-wrapper">
-
-        </div>
-        <div class="photo-scroller-prev video-prev">
-          <img src="{{'assets/new/icons/arrow-left-white.svg'|theme}}" alt="" />
-        </div>
-        <div class="photo-scroller-next video-next">
-          <img src="{{'assets/new/icons/arrow-right-white.svg'|theme}}" alt="" />
-        </div>
-      </div>
-      <div class="photo-scroller-closer">
-        <img src="{{'assets/new/icons/close.svg'|theme}}" alt="" />
-      </div>
-    </div>
-  </section>
-
-    
-  {% put scripts %}
-    <script src="{{ 'assets/new/scripts/marquee/marquee3k.js'|theme}}"></script>
-    <script src="{{ 'assets/new/scripts/core/main.js'|theme}}"></script>
-    
-  {% endput %}

themes/modern2/partials/new/head.htm

@@ -15,4 +15,5 @@
 <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" />
+<meta name="yandex-verification" content="9d83831cdb407bac" />
+<meta name="google-site-verification" content="GEfDQ_LMP4ly0tTnTcuX2Kr7WKri-Ql89FDLmYAKJXg" />

themes/modern2/partials/new/latest-news-mobile.htm

@@ -8,9 +8,7 @@ noPostsMessage = "No posts found"
 sortOrder = "created_at desc"
 categoryPage = 404
 postPage = 404
-
 ==
-
 {% set posts = blogPosts.posts %}
 
 
@@ -35,7 +33,7 @@ postPage = 404
 
         {% endfor %}
         <li>
-          <a href="/new/posts/news" class="aside-mobile-more">{{'new.read.more'|_}}</a>
+          <a href="/posts/news" class="aside-mobile-more">{{'new.read.more'|_}}</a>
         </li>
       </ul>
       <button type="button" class="aside-mobile-open">
@@ -43,4 +41,4 @@ postPage = 404
       </button>
     </div>
   </section>
-  <!-- ASIDE MOBILE end ============ -->
+  <!-- ASIDE MOBILE end ============ -->

themes/modern2/partials/new/pagination.htm

@@ -1,5 +1,16 @@
 [viewBag]
 ==
+{% put styles %}
+    <style>
+        #pagination_input{
+            margin: 0;
+        }
+        #pagination_form{
+            display: contents;
+        }
+    </style>
+{% endput %}
+
 {% if items.total > items.perPage %}
 <div class="video-main-bottom rubric-bottom">
     <a href="{{items.previousPageUrl|default('#')}}{%if filter and items.previousPageUrl  %}{{'&'~filter.0~'='~filter.1}}{% endif %}">
@@ -13,10 +24,10 @@
   </a>
 <!--   <span>1/1000</span> -->
 
-  <form method="get">
+  <form method="get" id="pagination_form">
     <div class="heading__footer-input">
 
-        <input type="text" value="{{items.currentPage|default('1')}}" name="page">
+        <input type="text" value="{{items.currentPage|default('1')}}" name="page" id="pagination_input">
         {%if filter %}
         <input type="hidden" name="{{filter.0}}" value="{{filter.1}}">
         {% endif %}

themes/modern2/partials/newHome/right-sidebar.htm

@@ -40,7 +40,7 @@ exceptPost = "{{ :id }}"
         
         {% endfor %}
         
-        <a href="/new/posts/news" class="aside-content-more">
+        <a href="/posts/news" class="aside-content-more">
           <span>{{'new.read.more'|_}}</span>
           <div class="aside-content-more-img">
             <img src="{{'assets/new/icons/arrow-right-black.svg'|theme}}" alt="" />
@@ -58,7 +58,7 @@ exceptPost = "{{ :id }}"
         {% endfor %}
         
         
-        <a href="/new/posts/news" class="aside-content-more">
+        <a href="/posts/news" class="aside-content-more">
           <span>{{'new.read.more'|_}}</span>
           <div class="aside-content-more-img">
             <img src="{{'assets/new/icons/arrow-right-black.svg'|theme}}" alt="" />

themes/modern2/partials/scripts/getPartners.htm

@@ -22,7 +22,7 @@
                          
                               <div class="swiper-slide" data-swiper-slide-index="`+i+`" role="group" aria-label="`+(i+1)+` / `+ (advs.length) +`" style="width: 284px; margin-right: 60px;">
                                   <div class="partners-item">
-                                    <img src="`+ adv.media +`" alt="`+ adv.title +`" />
+                                    <a href="`+ adv.url +`" target="_blank"><img src="`+ adv.media +`" alt="`+ adv.title +`" /></a>
                                   </div>
                                 </div>
                          `);

themes/modern2/partials/test/special-projects.htm

@@ -8,7 +8,22 @@
              {% partial 'newHome/post-item-img' post = post %}
          {% endfor %}
          
+         
+
+         
+          <div class="btn-wrapper">
+                <a href="{{'new/faq'|page}}" class="btn" style="font-size: 14px;">
+                      <img src="{{'assets/images/faq-icon.svg'|theme}}" alt="faq icon">
+                      <span>{{'Часто задаваемые вопросы'|_}}</span>
+                </a>
+                <button class="btn ask-expert-btn">
+                      <img src="{{'assets/images/question-mark-icon.svg'|theme}}" alt="question mark icon"> 
+                      <span>{{'Спроси эксперта'|_}}</span>
+                </button>
+          </div>
+         
          <a href="{{'new/group'|page({categoryGroup: 'news', slug:'pomosh-eksporteram'})}}" class="aside-content-more" style="margin-top: 25px;">
+         
           <span>{{'new.read.more.usaid'|_}}</span>
           <div class="aside-content-more-img">
             <img src="{{'assets/new/icons/arrow-right-black.svg'|theme}}" alt="" />