diff --git a/composer.json b/composer.json index 09e2ba7..58aff4a 100755 --- a/composer.json +++ b/composer.json @@ -32,7 +32,8 @@ "2amigos/yii2-tinymce-widget": "~1.1", "kartik-v/yii2-widget-select2": "@dev", "artweb/artbox-core": "@dev", - "artweb/artbox-weblog": "@dev" + "artweb/artbox-weblog": "@dev", + "artweb/artbox-webcomment": "@dev" }, "require-dev": { "yiisoft/yii2-debug": "~2.0.0", @@ -58,6 +59,10 @@ { "type": "vcs", "url": "git@gitlab.artweb.com.ua:Alexey/artbox-weblog.git" + }, + { + "type": "vcs", + "url": "git@gitlab.artweb.com.ua:yarik.nechyporuk/artbox-webcomment.git" } ] } diff --git a/frontend/controllers/BlogController.php b/frontend/controllers/BlogController.php index 9c9362a..cd3810f 100644 --- a/frontend/controllers/BlogController.php +++ b/frontend/controllers/BlogController.php @@ -22,7 +22,10 @@ $dataProvider = new ActiveDataProvider( [ - 'query' => $query, + 'query' => $query, + 'pagination' => [ + 'pageSize' => 3, + ], ] ); diff --git a/frontend/views/blog/_article.php b/frontend/views/blog/_article.php index 3a2c17f..1b6fcde 100644 --- a/frontend/views/blog/_article.php +++ b/frontend/views/blog/_article.php @@ -1,5 +1,33 @@ - + use artbox\weblog\models\Article; + + /** + * @var Article $model + */ +?> +
+

Fashion now

+
+
+

By John Snow in Webdesign +

+
+
+

+ created_at)?> + 8 Comments +

+
+
+
+ + Example blog post alt + +
+

Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean + ultricies mi vitae est. Mauris placerat eleifend leo.

+

Continue reading +

+
diff --git a/frontend/views/blog/_sidebar.php b/frontend/views/blog/_sidebar.php new file mode 100644 index 0000000..5084ad4 --- /dev/null +++ b/frontend/views/blog/_sidebar.php @@ -0,0 +1,91 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+

Categories

+
+ +
+ +
+
+ +
+
+

Tags

+
+ +
+ +
+
+ + + +
+ + + \ No newline at end of file diff --git a/frontend/views/blog/index.php b/frontend/views/blog/index.php index c2baff0..5b89399 100644 --- a/frontend/views/blog/index.php +++ b/frontend/views/blog/index.php @@ -1,129 +1,41 @@ + use yii\data\ActiveDataProvider; + use yii\web\View; + use yii\widgets\ListView; + + /** + * @var View $this + * @var ActiveDataProvider $dataProvider + */ + +?> -
-
-
- - -
- -
-

Fashion now

-
-
-

By John Snow in Webdesign -

-
-
-

- June 20, 2013 - 8 Comments -

-
-
-
- - Example blog post alt - -
-

Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean - ultricies mi vitae est. Mauris placerat eleifend leo.

-

Continue reading -

-
- -
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- -
-

Categories

-
- -
- -
-
- -
-
-

Tags

-
- -
- -
-
- - - -
- - - - -
- -
- -
\ No newline at end of file +
+
+
+ + +
+ + $dataProvider, + 'itemView' => '_article', + 'layout' => '{items}{pager}', + ] + ) ?> + +
+ + + + + render('_sidebar') ?> + +
+ +
+ +
\ No newline at end of file -- libgit2 0.21.4