@@ -1,9 +1,9 @@ |
||
1 | 1 | <?php |
2 | 2 | Yii::setAlias('common', dirname(__DIR__)); |
3 | -Yii::setAlias('frontend', dirname(dirname(__DIR__)) . '/frontend'); |
|
4 | -Yii::setAlias('backend', dirname(dirname(__DIR__)) . '/backend'); |
|
5 | -Yii::setAlias('console', dirname(dirname(__DIR__)) . '/console'); |
|
6 | -Yii::setAlias('modules', dirname(dirname(__DIR__)) . '/modules'); |
|
7 | -Yii::setAlias('widgets', dirname(dirname(__DIR__)) . '/widgets'); |
|
8 | -Yii::setAlias('themes', dirname(dirname(__DIR__)) . '/themes'); |
|
9 | -Yii::setAlias('public', dirname(dirname(__DIR__)) . '/public'); |
|
3 | +Yii::setAlias('frontend', dirname(dirname(__DIR__)).'/frontend'); |
|
4 | +Yii::setAlias('backend', dirname(dirname(__DIR__)).'/backend'); |
|
5 | +Yii::setAlias('console', dirname(dirname(__DIR__)).'/console'); |
|
6 | +Yii::setAlias('modules', dirname(dirname(__DIR__)).'/modules'); |
|
7 | +Yii::setAlias('widgets', dirname(dirname(__DIR__)).'/widgets'); |
|
8 | +Yii::setAlias('themes', dirname(dirname(__DIR__)).'/themes'); |
|
9 | +Yii::setAlias('public', dirname(dirname(__DIR__)).'/public'); |
@@ -21,13 +21,13 @@ discard block |
||
21 | 21 | <?php if (!Yii::$app->user->isGuest): ?> |
22 | 22 | <p> |
23 | 23 | <?= Yii::t('writesdown', 'Login as {username}, {logout}{cancelReply}', [ |
24 | - 'username' => '<strong>' . Yii::$app->user->identity->username . '</strong>', |
|
24 | + 'username' => '<strong>'.Yii::$app->user->identity->username.'</strong>', |
|
25 | 25 | 'logout' => Html::a( |
26 | 26 | Yii::t('writesdown', '<strong>Sign Out</strong>'), |
27 | 27 | ['/site/logout'], |
28 | 28 | ['data-method' => 'post'] |
29 | 29 | ), |
30 | - 'cancelReply' => Html::a('<strong>' . Yii::t('writesdown', ', Cancel Reply') . '</strong>', '#', [ |
|
30 | + 'cancelReply' => Html::a('<strong>'.Yii::t('writesdown', ', Cancel Reply').'</strong>', '#', [ |
|
31 | 31 | 'id' => 'cancel-reply', |
32 | 32 | 'class' => 'cancel-reply', |
33 | 33 | 'style' => 'display:none;', |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | </p> |
38 | 38 | <?php else: ?> |
39 | 39 | <p> |
40 | - <?= Html::a('<strong>' . Yii::t('writesdown', 'Cancel Reply') . '</strong>', '#', [ |
|
40 | + <?= Html::a('<strong>'.Yii::t('writesdown', 'Cancel Reply').'</strong>', '#', [ |
|
41 | 41 | 'id' => 'cancel-reply', |
42 | 42 | 'class' => 'cancel-reply', |
43 | 43 | 'style' => 'display:none;', |
@@ -18,13 +18,13 @@ discard block |
||
18 | 18 | /* @var $image common\models\Media */ |
19 | 19 | /* @var $pages yii\data\Pagination */ |
20 | 20 | |
21 | -$this->title = Html::encode($term->taxonomy->singular_name . ': ' . $term->name . ' - ' . Option::get('sitetitle')); |
|
21 | +$this->title = Html::encode($term->taxonomy->singular_name.': '.$term->name.' - '.Option::get('sitetitle')); |
|
22 | 22 | $this->params['breadcrumbs'][] = Html::encode($term->name); |
23 | 23 | ?> |
24 | 24 | |
25 | 25 | <div class="archive term-view"> |
26 | 26 | <header id="archive-header" class="archive-header"> |
27 | - <h1><?= Html::encode($term->taxonomy->singular_name . ': ' . $term->name) ?></h1> |
|
27 | + <h1><?= Html::encode($term->taxonomy->singular_name.': '.$term->name) ?></h1> |
|
28 | 28 | |
29 | 29 | <?php if ($term->description): ?> |
30 | 30 | <div class="description term-description"><?= $term->description ?></div> |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | <footer class="footer-meta"> |
83 | 83 | <?php $tags = $post->getTerms() |
84 | 84 | ->innerJoinWith([ |
85 | - 'taxonomy' => function ($query) { |
|
85 | + 'taxonomy' => function($query) { |
|
86 | 86 | /** @var $query \yii\db\ActiveQuery */ |
87 | 87 | return $query->from(['taxonomy' => Taxonomy::tableName()]); |
88 | 88 | }, |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | <?php if ($tags): ?> |
94 | 94 | <h3> |
95 | 95 | <?php foreach ($tags as $tag): ?> |
96 | - <?= Html::a($tag->name, $tag->url, ['class' => 'badge']) . "\n" ?> |
|
96 | + <?= Html::a($tag->name, $tag->url, ['class' => 'badge'])."\n" ?> |
|
97 | 97 | <?php endforeach ?> |
98 | 98 | </h3> |
99 | 99 | <?php endif ?> |
@@ -18,13 +18,13 @@ discard block |
||
18 | 18 | /* @var $image common\models\Media */ |
19 | 19 | /* @var $pages yii\data\Pagination */ |
20 | 20 | |
21 | -$this->title = Html::encode($term->taxonomy->singular_name . ': ' . $term->name . ' - ' . Option::get('sitetitle')); |
|
21 | +$this->title = Html::encode($term->taxonomy->singular_name.': '.$term->name.' - '.Option::get('sitetitle')); |
|
22 | 22 | $this->params['breadcrumbs'][] = Html::encode($term->name); |
23 | 23 | ?> |
24 | 24 | |
25 | 25 | <div class="archive term-view"> |
26 | 26 | <header id="archive-header" class="archive-header"> |
27 | - <h1><?= Html::encode($term->taxonomy->singular_name . ': ' . $term->name) ?></h1> |
|
27 | + <h1><?= Html::encode($term->taxonomy->singular_name.': '.$term->name) ?></h1> |
|
28 | 28 | |
29 | 29 | <?php if ($term->description): ?> |
30 | 30 | <div class="description term-description"><?= $term->description ?></div> |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | <footer class="footer-meta"> |
83 | 83 | <?php $tags = $post->getTerms() |
84 | 84 | ->innerJoinWith([ |
85 | - 'taxonomy' => function ($query) { |
|
85 | + 'taxonomy' => function($query) { |
|
86 | 86 | /** @var $query \yii\db\ActiveQuery */ |
87 | 87 | return $query->from(['taxonomy' => Taxonomy::tableName()]); |
88 | 88 | }, |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | <?php if ($tags): ?> |
94 | 94 | <h3> |
95 | 95 | <?php foreach ($tags as $tag): ?> |
96 | - <?= Html::a($tag->name, $tag->url, ['class' => 'badge']) . "\n" ?> |
|
96 | + <?= Html::a($tag->name, $tag->url, ['class' => 'badge'])."\n" ?> |
|
97 | 97 | <?php endforeach ?> |
98 | 98 | </h3> |
99 | 99 | <?php endif ?> |
@@ -15,7 +15,7 @@ |
||
15 | 15 | /* @var $form yii\bootstrap\ActiveForm */ |
16 | 16 | /* @var $model \frontend\models\ContactForm */ |
17 | 17 | |
18 | -$this->title = Yii::t('writesdown', 'Contact') . ' - ' . Option::get('sitetitle'); |
|
18 | +$this->title = Yii::t('writesdown', 'Contact').' - '.Option::get('sitetitle'); |
|
19 | 19 | $this->params['breadcrumbs'][] = Yii::t('writesdown', 'Contact'); |
20 | 20 | ?> |
21 | 21 | <div class="single site-contact"> |
@@ -12,7 +12,7 @@ |
||
12 | 12 | |
13 | 13 | /* @var $media common\models\Media */ |
14 | 14 | |
15 | -$this->title = Html::encode($media->title . ' - ' . Option::get('sitetitle')); |
|
15 | +$this->title = Html::encode($media->title.' - '.Option::get('sitetitle')); |
|
16 | 16 | |
17 | 17 | if ($media->mediaPost) { |
18 | 18 | $this->params['breadcrumbs'][] = [ |
@@ -21,13 +21,13 @@ discard block |
||
21 | 21 | <?php if (!Yii::$app->user->isGuest): ?> |
22 | 22 | <p> |
23 | 23 | <?= Yii::t('writesdown', 'Login as {username}, {logout}{cancelReply}', [ |
24 | - 'username' => '<strong>' . Yii::$app->user->identity->username . '</strong>', |
|
24 | + 'username' => '<strong>'.Yii::$app->user->identity->username.'</strong>', |
|
25 | 25 | 'logout' => Html::a( |
26 | 26 | Yii::t('writesdown', '<strong>Sign Out</strong>'), |
27 | 27 | ['/site/logout'], |
28 | 28 | ['data-method' => 'post'] |
29 | 29 | ), |
30 | - 'cancelReply' => Html::a('<strong>' . Yii::t('writesdown', ', Cancel Reply') . '</strong>', '#', [ |
|
30 | + 'cancelReply' => Html::a('<strong>'.Yii::t('writesdown', ', Cancel Reply').'</strong>', '#', [ |
|
31 | 31 | 'id' => 'cancel-reply', |
32 | 32 | 'class' => 'cancel-reply', |
33 | 33 | 'style' => 'display:none;', |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | </p> |
38 | 38 | <?php else: ?> |
39 | 39 | <p> |
40 | - <?= Html::a('<strong>' . Yii::t('writesdown', 'Cancel Reply') . '</strong>', '#', [ |
|
40 | + <?= Html::a('<strong>'.Yii::t('writesdown', 'Cancel Reply').'</strong>', '#', [ |
|
41 | 41 | 'id' => 'cancel-reply', |
42 | 42 | 'class' => 'cancel-reply', |
43 | 43 | 'style' => 'display:none;', |
@@ -16,14 +16,14 @@ |
||
16 | 16 | /* @var $comment common\models\PostComment */ |
17 | 17 | /* @var $category common\models\Term */ |
18 | 18 | |
19 | -$this->title = Html::encode($post->title . ' - ' . Option::get('sitetitle')); |
|
19 | +$this->title = Html::encode($post->title.' - '.Option::get('sitetitle')); |
|
20 | 20 | $this->params['breadcrumbs'][] = [ |
21 | 21 | 'label' => Html::encode($post->postType->singular_name), |
22 | 22 | 'url' => ['/post/index', 'id' => $post->postType->id], |
23 | 23 | ]; |
24 | 24 | $category = $post->getTerms() |
25 | 25 | ->innerJoinWith([ |
26 | - 'taxonomy' => function ($query) { |
|
26 | + 'taxonomy' => function($query) { |
|
27 | 27 | /* @var $query \yii\db\ActiveQuery */ |
28 | 28 | $query->from(['taxonomy' => Taxonomy::tableName()]); |
29 | 29 | }, |
@@ -2,16 +2,16 @@ |
||
2 | 2 | defined('YII_DEBUG') or define('YII_DEBUG', true); |
3 | 3 | defined('YII_ENV') or define('YII_ENV', 'dev'); |
4 | 4 | |
5 | -require(__DIR__ . '/../../vendor/autoload.php'); |
|
6 | -require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php'); |
|
7 | -require(__DIR__ . '/../../common/config/bootstrap.php'); |
|
8 | -require(__DIR__ . '/../../backend/config/bootstrap.php'); |
|
5 | +require(__DIR__.'/../../vendor/autoload.php'); |
|
6 | +require(__DIR__.'/../../vendor/yiisoft/yii2/Yii.php'); |
|
7 | +require(__DIR__.'/../../common/config/bootstrap.php'); |
|
8 | +require(__DIR__.'/../../backend/config/bootstrap.php'); |
|
9 | 9 | |
10 | 10 | $config = yii\helpers\ArrayHelper::merge( |
11 | - require(__DIR__ . '/../../common/config/main.php'), |
|
12 | - require(__DIR__ . '/../../common/config/main-local.php'), |
|
13 | - require(__DIR__ . '/../../backend/config/main.php'), |
|
14 | - require(__DIR__ . '/../../backend/config/main-local.php') |
|
11 | + require(__DIR__.'/../../common/config/main.php'), |
|
12 | + require(__DIR__.'/../../common/config/main-local.php'), |
|
13 | + require(__DIR__.'/../../backend/config/main.php'), |
|
14 | + require(__DIR__.'/../../backend/config/main-local.php') |
|
15 | 15 | ); |
16 | 16 | |
17 | 17 | $application = new yii\web\Application($config); |