diff --git a/plugins/rainlab/blog/Plugin.php b/plugins/rainlab/blog/Plugin.php
index 2780ee04d..7deb5b9d9 100644
--- a/plugins/rainlab/blog/Plugin.php
+++ b/plugins/rainlab/blog/Plugin.php
@@ -145,7 +145,7 @@ class Plugin extends PluginBase
return [
'blog-category' => 'rainlab.blog::lang.menuitem.blog_category',
'all-blog-categories' => 'rainlab.blog::lang.menuitem.all_blog_categories',
- 'blog-post' => 'rainlab.blog::lang.menuitem.blog_post',
+// 'blog-post' => 'rainlab.blog::lang.menuitem.blog_post',
'all-blog-posts' => 'rainlab.blog::lang.menuitem.all_blog_posts',
'category-blog-posts' => 'rainlab.blog::lang.menuitem.category_blog_posts',
];
diff --git a/plugins/rainlab/blog/components/Posts.php b/plugins/rainlab/blog/components/Posts.php
index 85ff2f953..82fddac57 100644
--- a/plugins/rainlab/blog/components/Posts.php
+++ b/plugins/rainlab/blog/components/Posts.php
@@ -88,7 +88,8 @@ class Posts extends ComponentBase
'featured' => [
'title' => 'Featured posts',
'description' => 'Filter featured posts',
- 'type' => 'checkbox',
+ 'type' => 'dropdown',
+ 'options' => ['yes' => 'Yes', 'not' => 'Not']
],
'postsPerPage' => [
@@ -208,11 +209,13 @@ class Posts extends ComponentBase
*/
$isPublished = !$this->checkEditor();
+ $featured = $this->property('featured') ? $this->property('featured')=='yes':null;
+
$posts = BlogPost::with(['categories'])->listFrontEnd([
'page' => $this->property('pageNumber'),
'sort' => $this->property('sortOrder'),
'perPage' => $this->property('postsPerPage'),
- 'featured' => $this->property('featured'),
+ 'featured' => $featured,
'search' => trim(input('q')),
'category' => $category,
'date' => input('date'),
diff --git a/plugins/rainlab/blog/models/Post.php b/plugins/rainlab/blog/models/Post.php
index ffad5e2fd..54e6bfb0c 100644
--- a/plugins/rainlab/blog/models/Post.php
+++ b/plugins/rainlab/blog/models/Post.php
@@ -282,8 +282,8 @@ class Post extends Model
$query->isPublished();
}
- if($featured){
- $query-> where('featured',1);
+ if(isset($featured)){
+ $query-> where('featured',$featured);
}
$date = trim($date);
@@ -399,7 +399,7 @@ class Post extends Model
$q->whereIn('id', $categories);
});
}
-
+
public function scopeFilterLocale($query, array $types) {
foreach ($types as $type) {
switch ($type) {
@@ -411,8 +411,8 @@ class Post extends Model
break;
}
}
-
-
+
+
}
//
diff --git a/plugins/rainlab/blog/models/post/columns.yaml b/plugins/rainlab/blog/models/post/columns.yaml
index 987fd983e..d54f24f45 100644
--- a/plugins/rainlab/blog/models/post/columns.yaml
+++ b/plugins/rainlab/blog/models/post/columns.yaml
@@ -1,40 +1,31 @@
-# ===================================
-# Column Definitions
-# ===================================
-
columns:
-
title:
- label: rainlab.blog::lang.post.title
+ label: 'rainlab.blog::lang.post.title'
+ type: text
searchable: true
-
- # author:
- # label: Author
- # relation: user
- # select: login
- # searchable: true
-
categories:
- label: rainlab.blog::lang.post.categories
- relation: categories
- select: name
+ label: 'rainlab.blog::lang.post.categories'
+ type: text
searchable: true
- sortable: false
+ select: name
+ relation: categories
locale:
label: Language
-
+ type: text
views:
label: Views
+ type: number
created_at:
- label: rainlab.blog::lang.post.created
+ label: 'rainlab.blog::lang.post.created'
type: date
invisible: true
-
updated_at:
- label: rainlab.blog::lang.post.updated
+ label: 'rainlab.blog::lang.post.updated'
type: date
invisible: true
-
published_at:
- label: rainlab.blog::lang.post.published
+ label: 'rainlab.blog::lang.post.published'
type: date
+ featured:
+ label: Featured
+ type: switch
diff --git a/plugins/tps/reklama/components/advertisement/carousel.htm b/plugins/tps/reklama/components/advertisement/carousel.htm
index 977fd0393..88fed663e 100644
--- a/plugins/tps/reklama/components/advertisement/carousel.htm
+++ b/plugins/tps/reklama/components/advertisement/carousel.htm
@@ -36,6 +36,7 @@
dots: false,
infinite: true,
speed: 300,
+ autoplay: true,
slidesToShow: 5,
arrows: true,
prevArrow: $(".p1"),
@@ -81,6 +82,7 @@
speed: 300,
slidesToShow: 5,
arrows: true,
+ autoplay: true,
prevArrow: $(".p1"),
nextArrow: $(".n1"),
slidesToScroll: 1,
diff --git a/plugins/tps/reklama/components/advertisement/slider.htm b/plugins/tps/reklama/components/advertisement/slider.htm
index ee1b31a2f..5d0994212 100644
--- a/plugins/tps/reklama/components/advertisement/slider.htm
+++ b/plugins/tps/reklama/components/advertisement/slider.htm
@@ -11,7 +11,7 @@
>
-
+
{% endfor %}
diff --git a/plugins/vdlp/rssfetcher/models/item/fields.yaml b/plugins/vdlp/rssfetcher/models/item/fields.yaml
index a65892e7e..1209bb804 100644
--- a/plugins/vdlp/rssfetcher/models/item/fields.yaml
+++ b/plugins/vdlp/rssfetcher/models/item/fields.yaml
@@ -1,45 +1,41 @@
fields:
title:
- label: vdlp.rssfetcher::lang.item.title
+ label: 'vdlp.rssfetcher::lang.item.title'
type: text
span: left
link:
- label: vdlp.rssfetcher::lang.item.link
+ label: 'vdlp.rssfetcher::lang.item.link'
type: text
span: right
description:
- label: vdlp.rssfetcher::lang.item.description
+ label: 'vdlp.rssfetcher::lang.item.description'
type: textarea
size: small
+ span: auto
+ source:
+ label: Source
+ nameFrom: name
+ descriptionFrom: description
+ span: auto
+ type: relation
author:
- label: vdlp.rssfetcher::lang.item.author
+ label: 'vdlp.rssfetcher::lang.item.author'
type: text
span: left
category:
- label: vdlp.rssfetcher::lang.item.category
- type: text
- span: right
- comments:
- label: vdlp.rssfetcher::lang.item.comments
- type: text
- enclosure_url:
- label: vdlp.rssfetcher::lang.item.enclosure_url
- type: text
- enclosure_length:
- label: vdlp.rssfetcher::lang.item.enclosure_length
- type: number
- span: left
- enclosure_type:
- label: vdlp.rssfetcher::lang.item.enclosure_type
+ label: 'vdlp.rssfetcher::lang.item.category'
type: text
span: right
pub_date:
- label: vdlp.rssfetcher::lang.item.published_at
+ label: 'vdlp.rssfetcher::lang.item.published_at'
type: datepicker
mode: datetime
- span: left
+ span: auto
+ comments:
+ label: 'vdlp.rssfetcher::lang.item.comments'
+ type: text
is_published:
- label: vdlp.rssfetcher::lang.item.is_published
+ label: 'vdlp.rssfetcher::lang.item.is_published'
type: switch
- comment: vdlp.rssfetcher::lang.item.is_published_comment
+ comment: 'vdlp.rssfetcher::lang.item.is_published_comment'
span: left
diff --git a/themes/modern2/layouts/blog.htm b/themes/modern2/layouts/blog.htm
index 1411a5756..bddc7f550 100644
--- a/themes/modern2/layouts/blog.htm
+++ b/themes/modern2/layouts/blog.htm
@@ -28,6 +28,15 @@ post = "post"
+
+
+