Commit 34082b1edece34ae7254ff4c74c83ba31c5405de
1 parent
8c596f14
-Comments added
Showing
5 changed files
with
169 additions
and
130 deletions
Show diff stats
composer.json
| ... | ... | @@ -32,7 +32,8 @@ |
| 32 | 32 | "2amigos/yii2-tinymce-widget": "~1.1", |
| 33 | 33 | "kartik-v/yii2-widget-select2": "@dev", |
| 34 | 34 | "artweb/artbox-core": "@dev", |
| 35 | - "artweb/artbox-weblog": "@dev" | |
| 35 | + "artweb/artbox-weblog": "@dev", | |
| 36 | + "artweb/artbox-webcomment": "@dev" | |
| 36 | 37 | }, |
| 37 | 38 | "require-dev": { |
| 38 | 39 | "yiisoft/yii2-debug": "~2.0.0", |
| ... | ... | @@ -58,6 +59,10 @@ |
| 58 | 59 | { |
| 59 | 60 | "type": "vcs", |
| 60 | 61 | "url": "git@gitlab.artweb.com.ua:Alexey/artbox-weblog.git" |
| 62 | + }, | |
| 63 | + { | |
| 64 | + "type": "vcs", | |
| 65 | + "url": "git@gitlab.artweb.com.ua:yarik.nechyporuk/artbox-webcomment.git" | |
| 61 | 66 | } |
| 62 | 67 | ] |
| 63 | 68 | } | ... | ... |
frontend/controllers/BlogController.php
frontend/views/blog/_article.php
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | - ?> | |
| 4 | - | |
| 3 | + use artbox\weblog\models\Article; | |
| 4 | + | |
| 5 | + /** | |
| 6 | + * @var Article $model | |
| 7 | + */ | |
| 8 | +?> | |
| 5 | 9 | |
| 10 | +<section class="post"> | |
| 11 | + <h2><a href="post.htmls">Fashion now</a></h2> | |
| 12 | + <div class="row"> | |
| 13 | + <div class="col-sm-6"> | |
| 14 | + <p class="author-category">By <a href="#">John Snow</a> in <a href="blog.html">Webdesign</a> | |
| 15 | + </p> | |
| 16 | + </div> | |
| 17 | + <div class="col-sm-6"> | |
| 18 | + <p class="date-comments"> | |
| 19 | + <a href="blog-post.html"><i class="fa fa-calendar-o"></i><?=date('d M, Y', $model->created_at)?></a> | |
| 20 | + <a href="blog-post.html"><i class="fa fa-comment-o"></i> 8 Comments</a> | |
| 21 | + </p> | |
| 22 | + </div> | |
| 23 | + </div> | |
| 24 | + <div class="image"> | |
| 25 | + <a href="blog-post.html"> | |
| 26 | + <img src="img/blog2.jpg" class="img-responsive" alt="Example blog post alt"> | |
| 27 | + </a> | |
| 28 | + </div> | |
| 29 | + <p class="intro">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 | |
| 30 | + ultricies mi vitae est. Mauris placerat eleifend leo.</p> | |
| 31 | + <p class="read-more"><a href="blog-post.html" class="btn btn-template-main">Continue reading</a> | |
| 32 | + </p> | |
| 33 | +</section> | ... | ... |
| 1 | +<?php | |
| 2 | + | |
| 3 | + use yii\web\View; | |
| 4 | + | |
| 5 | + /** | |
| 6 | + * @var View $this | |
| 7 | + */ | |
| 8 | + | |
| 9 | + ?> | |
| 10 | + | |
| 11 | +<!-- *** RIGHT COLUMN *** | |
| 12 | +_________________________________________________________ --> | |
| 13 | + | |
| 14 | +<div class="col-md-3"> | |
| 15 | + | |
| 16 | + <!-- *** MENUS AND WIDGETS *** | |
| 17 | +_________________________________________________________ --> | |
| 18 | + | |
| 19 | + <!-- <div class="panel panel-default sidebar-menu">--> | |
| 20 | + <!-- --> | |
| 21 | + <!-- <div class="panel-heading">--> | |
| 22 | + <!-- <h3 class="panel-title">Search</h3>--> | |
| 23 | + <!-- </div>--> | |
| 24 | + <!-- --> | |
| 25 | + <!-- <div class="panel-body">--> | |
| 26 | + <!-- <form role="search">--> | |
| 27 | + <!-- <div class="input-group">--> | |
| 28 | + <!-- <input type="text" class="form-control" placeholder="Search">--> | |
| 29 | + <!-- <span class="input-group-btn">--> | |
| 30 | + <!----> | |
| 31 | + <!-- <button type="submit" class="btn btn-template-main"><i class="fa fa-search"></i></button>--> | |
| 32 | + <!----> | |
| 33 | + <!-- </span>--> | |
| 34 | + <!-- </div>--> | |
| 35 | + <!-- </form>--> | |
| 36 | + <!-- </div>--> | |
| 37 | + <!-- </div>--> | |
| 38 | + | |
| 39 | + <div class="panel panel-default sidebar-menu"> | |
| 40 | + | |
| 41 | + <div class="panel-heading"> | |
| 42 | + <h3 class="panel-title">Categories</h3> | |
| 43 | + </div> | |
| 44 | + | |
| 45 | + <div class="panel-body"> | |
| 46 | + <ul class="nav nav-pills nav-stacked"> | |
| 47 | + <li><a href="blog.html">Webdesign</a> | |
| 48 | + </li> | |
| 49 | + <li class="active"><a href="blog.html">Tutorials</a> | |
| 50 | + </li> | |
| 51 | + <li><a href="blog.html">Print</a> | |
| 52 | + </li> | |
| 53 | + <li><a href="blog.html">Our tips</a> | |
| 54 | + </li> | |
| 55 | + </ul> | |
| 56 | + </div> | |
| 57 | + </div> | |
| 58 | + | |
| 59 | + <div class="panel sidebar-menu"> | |
| 60 | + <div class="panel-heading"> | |
| 61 | + <h3 class="panel-title">Tags</h3> | |
| 62 | + </div> | |
| 63 | + | |
| 64 | + <div class="panel-body"> | |
| 65 | + <ul class="tag-cloud"> | |
| 66 | + <li><a href="#"><i class="fa fa-tags"></i> html5</a> | |
| 67 | + </li> | |
| 68 | + <li><a href="#"><i class="fa fa-tags"></i> css3</a> | |
| 69 | + </li> | |
| 70 | + <li><a href="#"><i class="fa fa-tags"></i> jquery</a> | |
| 71 | + </li> | |
| 72 | + <li><a href="#"><i class="fa fa-tags"></i> ajax</a> | |
| 73 | + </li> | |
| 74 | + <li><a href="#"><i class="fa fa-tags"></i> php</a> | |
| 75 | + </li> | |
| 76 | + <li><a href="#"><i class="fa fa-tags"></i> responsive</a> | |
| 77 | + </li> | |
| 78 | + <li><a href="#"><i class="fa fa-tags"></i> visio</a> | |
| 79 | + </li> | |
| 80 | + <li><a href="#"><i class="fa fa-tags"></i> bootstrap</a> | |
| 81 | + </li> | |
| 82 | + </ul> | |
| 83 | + </div> | |
| 84 | + </div> | |
| 85 | + | |
| 86 | + <!-- *** MENUS AND FILTERS END *** --> | |
| 87 | + | |
| 88 | +</div> | |
| 89 | +<!-- /.col-md-3 --> | |
| 90 | + | |
| 91 | +<!-- *** RIGHT COLUMN END *** --> | |
| 0 | 92 | \ No newline at end of file | ... | ... |
frontend/views/blog/index.php
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | - ?> | |
| 3 | + use yii\data\ActiveDataProvider; | |
| 4 | + use yii\web\View; | |
| 5 | + use yii\widgets\ListView; | |
| 6 | + | |
| 7 | + /** | |
| 8 | + * @var View $this | |
| 9 | + * @var ActiveDataProvider $dataProvider | |
| 10 | + */ | |
| 11 | + | |
| 12 | +?> | |
| 4 | 13 | |
| 5 | - <div id="content"> | |
| 6 | - <div class="container"> | |
| 7 | - <div class="row"> | |
| 8 | - <!-- *** LEFT COLUMN *** | |
| 9 | - _________________________________________________________ --> | |
| 10 | - | |
| 11 | - <div class="col-md-9" id="blog-listing-big"> | |
| 12 | - | |
| 13 | - <section class="post"> | |
| 14 | - <h2><a href="post.htmls">Fashion now</a></h2> | |
| 15 | - <div class="row"> | |
| 16 | - <div class="col-sm-6"> | |
| 17 | - <p class="author-category">By <a href="#">John Snow</a> in <a href="blog.html">Webdesign</a> | |
| 18 | - </p> | |
| 19 | - </div> | |
| 20 | - <div class="col-sm-6"> | |
| 21 | - <p class="date-comments"> | |
| 22 | - <a href="blog-post.html"><i class="fa fa-calendar-o"></i> June 20, 2013</a> | |
| 23 | - <a href="blog-post.html"><i class="fa fa-comment-o"></i> 8 Comments</a> | |
| 24 | - </p> | |
| 25 | - </div> | |
| 26 | - </div> | |
| 27 | - <div class="image"> | |
| 28 | - <a href="blog-post.html"> | |
| 29 | - <img src="img/blog2.jpg" class="img-responsive" alt="Example blog post alt"> | |
| 30 | - </a> | |
| 31 | - </div> | |
| 32 | - <p class="intro">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 | |
| 33 | - ultricies mi vitae est. Mauris placerat eleifend leo.</p> | |
| 34 | - <p class="read-more"><a href="blog-post.html" class="btn btn-template-main">Continue reading</a> | |
| 35 | - </p> | |
| 36 | - </section> | |
| 37 | - | |
| 38 | - </div> | |
| 39 | - <!-- /.col-md-9 --> | |
| 40 | - | |
| 41 | - <!-- *** LEFT COLUMN END *** --> | |
| 42 | - | |
| 43 | - <!-- *** RIGHT COLUMN *** | |
| 44 | - _________________________________________________________ --> | |
| 45 | - | |
| 46 | - <div class="col-md-3"> | |
| 47 | - | |
| 48 | - <!-- *** MENUS AND WIDGETS *** | |
| 49 | - _________________________________________________________ --> | |
| 50 | - | |
| 51 | -<!-- <div class="panel panel-default sidebar-menu">--> | |
| 52 | -<!-- --> | |
| 53 | -<!-- <div class="panel-heading">--> | |
| 54 | -<!-- <h3 class="panel-title">Search</h3>--> | |
| 55 | -<!-- </div>--> | |
| 56 | -<!-- --> | |
| 57 | -<!-- <div class="panel-body">--> | |
| 58 | -<!-- <form role="search">--> | |
| 59 | -<!-- <div class="input-group">--> | |
| 60 | -<!-- <input type="text" class="form-control" placeholder="Search">--> | |
| 61 | -<!-- <span class="input-group-btn">--> | |
| 62 | -<!----> | |
| 63 | -<!-- <button type="submit" class="btn btn-template-main"><i class="fa fa-search"></i></button>--> | |
| 64 | -<!----> | |
| 65 | -<!-- </span>--> | |
| 66 | -<!-- </div>--> | |
| 67 | -<!-- </form>--> | |
| 68 | -<!-- </div>--> | |
| 69 | -<!-- </div>--> | |
| 70 | - | |
| 71 | - <div class="panel panel-default sidebar-menu"> | |
| 72 | - | |
| 73 | - <div class="panel-heading"> | |
| 74 | - <h3 class="panel-title">Categories</h3> | |
| 75 | - </div> | |
| 76 | - | |
| 77 | - <div class="panel-body"> | |
| 78 | - <ul class="nav nav-pills nav-stacked"> | |
| 79 | - <li><a href="blog.html">Webdesign</a> | |
| 80 | - </li> | |
| 81 | - <li class="active"><a href="blog.html">Tutorials</a> | |
| 82 | - </li> | |
| 83 | - <li><a href="blog.html">Print</a> | |
| 84 | - </li> | |
| 85 | - <li><a href="blog.html">Our tips</a> | |
| 86 | - </li> | |
| 87 | - </ul> | |
| 88 | - </div> | |
| 89 | - </div> | |
| 90 | - | |
| 91 | - <div class="panel sidebar-menu"> | |
| 92 | - <div class="panel-heading"> | |
| 93 | - <h3 class="panel-title">Tags</h3> | |
| 94 | - </div> | |
| 95 | - | |
| 96 | - <div class="panel-body"> | |
| 97 | - <ul class="tag-cloud"> | |
| 98 | - <li><a href="#"><i class="fa fa-tags"></i> html5</a> | |
| 99 | - </li> | |
| 100 | - <li><a href="#"><i class="fa fa-tags"></i> css3</a> | |
| 101 | - </li> | |
| 102 | - <li><a href="#"><i class="fa fa-tags"></i> jquery</a> | |
| 103 | - </li> | |
| 104 | - <li><a href="#"><i class="fa fa-tags"></i> ajax</a> | |
| 105 | - </li> | |
| 106 | - <li><a href="#"><i class="fa fa-tags"></i> php</a> | |
| 107 | - </li> | |
| 108 | - <li><a href="#"><i class="fa fa-tags"></i> responsive</a> | |
| 109 | - </li> | |
| 110 | - <li><a href="#"><i class="fa fa-tags"></i> visio</a> | |
| 111 | - </li> | |
| 112 | - <li><a href="#"><i class="fa fa-tags"></i> bootstrap</a> | |
| 113 | - </li> | |
| 114 | - </ul> | |
| 115 | - </div> | |
| 116 | - </div> | |
| 117 | - | |
| 118 | - <!-- *** MENUS AND FILTERS END *** --> | |
| 119 | - | |
| 120 | - </div> | |
| 121 | - <!-- /.col-md-3 --> | |
| 122 | - | |
| 123 | - <!-- *** RIGHT COLUMN END *** --> | |
| 124 | - | |
| 125 | - </div> | |
| 126 | - <!-- /.row --> | |
| 127 | - </div> | |
| 128 | - <!-- /.container --> | |
| 129 | - </div> | |
| 130 | 14 | \ No newline at end of file |
| 15 | +<div id="content"> | |
| 16 | + <div class="container"> | |
| 17 | + <div class="row"> | |
| 18 | + <!-- *** LEFT COLUMN *** | |
| 19 | +_________________________________________________________ --> | |
| 20 | + | |
| 21 | + <div class="col-md-9" id="blog-listing-big"> | |
| 22 | + | |
| 23 | + <?= ListView::widget( | |
| 24 | + [ | |
| 25 | + 'dataProvider' => $dataProvider, | |
| 26 | + 'itemView' => '_article', | |
| 27 | + 'layout' => '{items}{pager}', | |
| 28 | + ] | |
| 29 | + ) ?> | |
| 30 | + | |
| 31 | + </div> | |
| 32 | + <!-- /.col-md-9 --> | |
| 33 | + | |
| 34 | + <!-- *** LEFT COLUMN END *** --> | |
| 35 | + | |
| 36 | + <?= $this->render('_sidebar') ?> | |
| 37 | + | |
| 38 | + </div> | |
| 39 | + <!-- /.row --> | |
| 40 | + </div> | |
| 41 | + <!-- /.container --> | |
| 42 | +</div> | |
| 131 | 43 | \ No newline at end of file | ... | ... |