Passed
Push — master ( dd4450...9a9614 )
by Andrey
05:55
created
views/layouts/base.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -6,8 +6,8 @@  discard block
 block discarded – undo
6 6
 use app\models\Contact;
7 7
 use Itstructure\MultiLevelMenu\MenuWidget;
8 8
 
9
-$contacts = $this->params['contacts'];
10
-$controllerId = $this->params['controllerId'];
9
+$contacts = $this->params[ 'contacts' ];
10
+$controllerId = $this->params[ 'controllerId' ];
11 11
 
12 12
 /* @var \yii\web\View $this */
13 13
 /* @var string $content */
@@ -46,77 +46,77 @@  discard block
 block discarded – undo
46 46
     ]); ?>
47 47
 
48 48
     <ul class="nav navbar-nav navbar-right">
49
-        <li class="nav-item <?php if($controllerId=='home'): ?>active<?php endif; ?>">
50
-            <a class="nav-link" href="/<?php echo $this->params['shortLanguage']; ?>"><?php echo Yii::t('app', 'Home') ?></a>
49
+        <li class="nav-item <?php if ($controllerId == 'home'): ?>active<?php endif; ?>">
50
+            <a class="nav-link" href="/<?php echo $this->params[ 'shortLanguage' ]; ?>"><?php echo Yii::t('app', 'Home') ?></a>
51 51
         </li>
52
-        <li class="nav-item <?php if($controllerId=='about'): ?>active<?php endif; ?>">
53
-            <a class="nav-link" href="/<?php echo $this->params['shortLanguage']; ?>/about"><?php echo Yii::t('about', 'About') ?></a>
52
+        <li class="nav-item <?php if ($controllerId == 'about'): ?>active<?php endif; ?>">
53
+            <a class="nav-link" href="/<?php echo $this->params[ 'shortLanguage' ]; ?>/about"><?php echo Yii::t('about', 'About') ?></a>
54 54
         </li>
55
-        <li class="nav-item dropdown <?php if($controllerId=='page'): ?>active<?php endif; ?>">
55
+        <li class="nav-item dropdown <?php if ($controllerId == 'page'): ?>active<?php endif; ?>">
56 56
             <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
57 57
                 <?php echo Yii::t('pages', 'Pages') ?>
58 58
             </a>
59 59
             <?php echo MenuWidget::widget([
60
-                'data' => $this->params['pages'],
60
+                'data' => $this->params[ 'pages' ],
61 61
                 'itemTemplate' => '@app/views/menu/pageItem.php',
62
-                'itemTemplateParams' => function ($level, $item) {
62
+                'itemTemplateParams' => function($level, $item) {
63 63
                     return [
64
-                        'shortLanguage' => $this->params['shortLanguage'],
65
-                        'linkOptions' => isset($item['items']) && count($item['items']) > 0 ? [
64
+                        'shortLanguage' => $this->params[ 'shortLanguage' ],
65
+                        'linkOptions' => isset($item[ 'items' ]) && count($item[ 'items' ]) > 0 ? [
66 66
                             'class' => 'dropdown-toggle',
67 67
                             'data-toggle' => 'dropdown',
68 68
                             'aria-haspopup' => 'true',
69 69
                             'aria-expanded' => 'false',
70
-                        ] : [],
70
+                        ] : [ ],
71 71
                     ];
72 72
                 },
73 73
                 'mainContainerOptions' => [
74 74
                     'class' => 'dropdown-menu'
75 75
                 ],
76
-                'itemContainerOptions' => function ($level, $item) {
76
+                'itemContainerOptions' => function($level, $item) {
77 77
                     return [
78
-                        'class' => isset($item['items']) && count($item['items']) > 0 ? 'dropdown-item dropdown' : 'dropdown-item'
78
+                        'class' => isset($item[ 'items' ]) && count($item[ 'items' ]) > 0 ? 'dropdown-item dropdown' : 'dropdown-item'
79 79
                     ];
80 80
                 }
81 81
             ]) ?>
82 82
         </li>
83
-        <li class="nav-item dropdown <?php if($controllerId=='category'): ?>active<?php endif; ?>">
83
+        <li class="nav-item dropdown <?php if ($controllerId == 'category'): ?>active<?php endif; ?>">
84 84
             <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
85 85
                 <?php echo Yii::t('categories', 'Categories') ?>
86 86
             </a>
87 87
             <?php echo MenuWidget::widget([
88
-                'data' => $this->params['categories'],
88
+                'data' => $this->params[ 'categories' ],
89 89
                 'itemTemplate' => '@app/views/menu/categoryItem.php',
90
-                'itemTemplateParams' => function ($level, $item) {
90
+                'itemTemplateParams' => function($level, $item) {
91 91
                     return [
92
-                        'shortLanguage' => $this->params['shortLanguage'],
93
-                        'linkOptions' => isset($item['items']) && count($item['items']) > 0 ? [
92
+                        'shortLanguage' => $this->params[ 'shortLanguage' ],
93
+                        'linkOptions' => isset($item[ 'items' ]) && count($item[ 'items' ]) > 0 ? [
94 94
                             'class' => 'dropdown-toggle',
95 95
                             'data-toggle' => 'dropdown',
96 96
                             'aria-haspopup' => 'true',
97 97
                             'aria-expanded' => 'false',
98
-                        ] : [],
98
+                        ] : [ ],
99 99
                     ];
100 100
                 },
101 101
                 'mainContainerOptions' => [
102 102
                     'class' => 'dropdown-menu'
103 103
                 ],
104
-                'itemContainerOptions' => function ($level, $item) {
104
+                'itemContainerOptions' => function($level, $item) {
105 105
                     return [
106
-                        'class' => isset($item['items']) && count($item['items']) > 0 ? 'dropdown-item dropdown' : 'dropdown-item'
106
+                        'class' => isset($item[ 'items' ]) && count($item[ 'items' ]) > 0 ? 'dropdown-item dropdown' : 'dropdown-item'
107 107
                     ];
108 108
                 }
109 109
             ]) ?>
110 110
         </li>
111
-        <li class="nav-item <?php if($controllerId=='contact'): ?>active<?php endif; ?>">
112
-            <a class="nav-link" href="/<?php echo $this->params['shortLanguage']; ?>/contact" ><?php echo Yii::t('contacts', 'Contacts') ?></a>
111
+        <li class="nav-item <?php if ($controllerId == 'contact'): ?>active<?php endif; ?>">
112
+            <a class="nav-link" href="/<?php echo $this->params[ 'shortLanguage' ]; ?>/contact" ><?php echo Yii::t('contacts', 'Contacts') ?></a>
113 113
         </li>
114 114
         <li class="nav-item dropdown">
115 115
             <a href="#" class="nav-link dropdown-toggle" id="dropdown_languages" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
116 116
                 <?php echo Yii::t('site', 'Languages') ?>
117 117
             </a>
118 118
             <?php echo MenuWidget::widget([
119
-                'data' => $this->params['languages'],
119
+                'data' => $this->params[ 'languages' ],
120 120
                 'itemTemplate' => '@app/views/menu/languageItem.php',
121 121
                 'mainContainerOptions' => [
122 122
                     'class' => 'dropdown-menu',
@@ -134,10 +134,10 @@  discard block
 block discarded – undo
134 134
                 </a>
135 135
                 <ul class="dropdown-menu">
136 136
                     <li class="dropdown-item">
137
-                        <a href="/<?php echo $this->params['shortLanguage']; ?>/reg" ><?php echo Yii::t('site', 'Register') ?></a>
137
+                        <a href="/<?php echo $this->params[ 'shortLanguage' ]; ?>/reg" ><?php echo Yii::t('site', 'Register') ?></a>
138 138
                     </li>
139 139
                     <li class="dropdown-item">
140
-                        <a href="/<?php echo $this->params['shortLanguage']; ?>/login" ><?php echo Yii::t('site', 'Login') ?></a>
140
+                        <a href="/<?php echo $this->params[ 'shortLanguage' ]; ?>/login" ><?php echo Yii::t('site', 'Login') ?></a>
141 141
                     </li>
142 142
                 </ul>
143 143
             </li>
@@ -148,10 +148,10 @@  discard block
 block discarded – undo
148 148
                 </a>
149 149
                 <ul class="dropdown-menu">
150 150
                     <li class="dropdown-item">
151
-                        <a href="/<?php echo $this->params['shortLanguage']; ?>/admin" ><?php echo Yii::t('site', 'Dashboard') ?></a>
151
+                        <a href="/<?php echo $this->params[ 'shortLanguage' ]; ?>/admin" ><?php echo Yii::t('site', 'Dashboard') ?></a>
152 152
                     </li>
153 153
                     <li class="dropdown-item">
154
-                        <a href="/<?php echo $this->params['shortLanguage']; ?>/logout" ><?php echo Yii::t('site', 'Sign out') ?></a>
154
+                        <a href="/<?php echo $this->params[ 'shortLanguage' ]; ?>/logout" ><?php echo Yii::t('site', 'Sign out') ?></a>
155 155
                     </li>
156 156
                 </ul>
157 157
             </li>
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
     <?php NavBar::end(); ?>
162 162
 
163 163
     <div class="container">
164
-        <?php if (isset($this->params['breadcrumbs'])): ?>
164
+        <?php if (isset($this->params[ 'breadcrumbs' ])): ?>
165 165
             <section class="full_width breadcrumbs_block clearfix">
166 166
                 <div class="container">
167 167
                     <div class="breadcrumbs_content">
@@ -171,10 +171,10 @@  discard block
 block discarded – undo
171 171
                             'options' => [
172 172
                                 'class' => 'pull-right breadcrumb'
173 173
                             ],
174
-                            'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
174
+                            'links' => isset($this->params[ 'breadcrumbs' ]) ? $this->params[ 'breadcrumbs' ] : [ ],
175 175
                             'homeLink' => [
176 176
                                 'label' => Yii::t('yii', 'Home'),
177
-                                'url' => rtrim(Yii::$app->homeUrl, '/') . '/' . $this->params['shortLanguage'],
177
+                                'url' => rtrim(Yii::$app->homeUrl, '/').'/'.$this->params[ 'shortLanguage' ],
178 178
                             ]
179 179
                         ]) ?>
180 180
                     </div>
@@ -193,27 +193,27 @@  discard block
 block discarded – undo
193 193
         <div class="row" data-animated="fadeInUp">
194 194
             <div class="col-lg-7 col-md-8 col-sm-8 padbot30">
195 195
                 <ul class="foot_menu">
196
-                    <li <?php if($controllerId=='home'): ?>class="active"<?php endif; ?> >
197
-                        <a href="/<?php echo $this->params['shortLanguage']; ?>" alt=""><?php echo Yii::t('app', 'Home') ?></a>
196
+                    <li <?php if ($controllerId == 'home'): ?>class="active"<?php endif; ?> >
197
+                        <a href="/<?php echo $this->params[ 'shortLanguage' ]; ?>" alt=""><?php echo Yii::t('app', 'Home') ?></a>
198 198
                     </li>
199
-                    <li <?php if($controllerId=='about'): ?>class="active"<?php endif; ?> >
200
-                        <a href="/<?php echo $this->params['shortLanguage']; ?>/about" ><?php echo Yii::t('about', 'About me') ?></a>
199
+                    <li <?php if ($controllerId == 'about'): ?>class="active"<?php endif; ?> >
200
+                        <a href="/<?php echo $this->params[ 'shortLanguage' ]; ?>/about" ><?php echo Yii::t('about', 'About me') ?></a>
201 201
                     </li>
202
-                    <li <?php if($controllerId=='contact'): ?>class="active"<?php endif; ?> >
203
-                        <a href="/<?php echo $this->params['shortLanguage']; ?>/contact" ><?php echo Yii::t('contacts', 'Contacts') ?></a>
202
+                    <li <?php if ($controllerId == 'contact'): ?>class="active"<?php endif; ?> >
203
+                        <a href="/<?php echo $this->params[ 'shortLanguage' ]; ?>/contact" ><?php echo Yii::t('contacts', 'Contacts') ?></a>
204 204
                     </li>
205 205
                 </ul>
206 206
                 <hr>
207 207
                 <?php if (null !== $contacts): ?>
208 208
                     <ul class="foot_info">
209
-                        <?php if (!empty($contacts->{'address_'.$this->params['shortLanguage']})): ?>
210
-                            <li><i class="fa fa-home"></i><?php echo $contacts->{'address_'.$this->params['shortLanguage']} ?></li>
209
+                        <?php if (!empty($contacts->{'address_'.$this->params[ 'shortLanguage' ]})): ?>
210
+                            <li><i class="fa fa-home"></i><?php echo $contacts->{'address_'.$this->params[ 'shortLanguage' ]} ?></li>
211 211
                         <?php endif; ?>
212
-                        <?php if (!empty($contacts->{'phone_'.$this->params['shortLanguage']})): ?>
213
-                            <li><i class="fa fa-phone"></i><?php echo $contacts->{'phone_'.$this->params['shortLanguage']} ?></li>
212
+                        <?php if (!empty($contacts->{'phone_'.$this->params[ 'shortLanguage' ]})): ?>
213
+                            <li><i class="fa fa-phone"></i><?php echo $contacts->{'phone_'.$this->params[ 'shortLanguage' ]} ?></li>
214 214
                         <?php endif; ?>
215
-                        <?php if (!empty($contacts->{'email_'.$this->params['shortLanguage']})): ?>
216
-                            <li><i class="fa fa-envelope-o"></i><a href="mailto:<?php echo $contacts->{'email_'.$this->params['shortLanguage']} ?>"><?php echo $contacts->{'email_'.$this->params['shortLanguage']} ?></a></li>
215
+                        <?php if (!empty($contacts->{'email_'.$this->params[ 'shortLanguage' ]})): ?>
216
+                            <li><i class="fa fa-envelope-o"></i><a href="mailto:<?php echo $contacts->{'email_'.$this->params[ 'shortLanguage' ]} ?>"><?php echo $contacts->{'email_'.$this->params[ 'shortLanguage' ]} ?></a></li>
217 217
                         <?php endif; ?>
218 218
                     </ul>
219 219
                 <?php endif; ?>
Please login to merge, or discard this patch.
views/page/view.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -8,17 +8,17 @@  discard block
 block discarded – undo
8 8
 /* @var Article[] $articles */
9 9
 /* @var Pagination $pagination */
10 10
 
11
-$this->params['breadcrumbs'][] = $model->{'title_'.$this->params['shortLanguage']};
11
+$this->params[ 'breadcrumbs' ][ ] = $model->{'title_'.$this->params[ 'shortLanguage' ]};
12 12
 ?>
13 13
 
14
-<?php if (!empty($model->{'content_'.$this->params['shortLanguage']})): ?>
14
+<?php if (!empty($model->{'content_'.$this->params[ 'shortLanguage' ]})): ?>
15 15
     <section class="inform_block">
16 16
 
17 17
         <div class="container">
18 18
 
19 19
             <div class="row" data-animated="fadeIn">
20 20
                 <div class="col-lg-12 col-md-12 col-sm-10">
21
-                    <?php echo $model->{'content_'.$this->params['shortLanguage']} ?>
21
+                    <?php echo $model->{'content_'.$this->params[ 'shortLanguage' ]} ?>
22 22
                 </div>
23 23
             </div>
24 24
         </div>
@@ -36,15 +36,15 @@  discard block
 block discarded – undo
36 36
                         <div class="post">
37 37
                             <h2>
38 38
                                 <span class="<?php echo $article->icon ?>"></span>
39
-                                <a href="<?php echo '/'.$this->params['shortLanguage'].'/article/'.$article->alias ?>" alt="<?php echo $article->{'title_'.$this->params['shortLanguage']} ?>">
40
-                                    <?php echo $article->{'title_'.$this->params['shortLanguage']} ?>
39
+                                <a href="<?php echo '/'.$this->params[ 'shortLanguage' ].'/article/'.$article->alias ?>" alt="<?php echo $article->{'title_'.$this->params[ 'shortLanguage' ]} ?>">
40
+                                    <?php echo $article->{'title_'.$this->params[ 'shortLanguage' ]} ?>
41 41
                                 </a>
42 42
                             </h2>
43 43
                             <div class="post_meta"><?php echo Yii::t('articles', 'Posted').' '.BaseHelper::getDateAt($article->updated_at) ?></div>
44
-                            <?php echo $article->{'description_'.$this->params['shortLanguage']} ?>
44
+                            <?php echo $article->{'description_'.$this->params[ 'shortLanguage' ]} ?>
45 45
                         </div>
46
-                    <?php endforeach;?>
47
-                    <?php echo LinkPager::widget(['pagination' => $pagination]); ?>
46
+                    <?php endforeach; ?>
47
+                    <?php echo LinkPager::widget([ 'pagination' => $pagination ]); ?>
48 48
                 </div>
49 49
             </div>
50 50
         </div>
Please login to merge, or discard this patch.