Administrator / realy_old_artbox

Commit b6558af1106fbce423c5d7f877ecedc9e4463c43

Authored by Yarik
1 parent d9b4a7e9

Устранен баг с флагами

Showing 2 changed files with 1 additions and 9 deletions   Show diff stats
Inline Side-by-side
backend/views/language/create.php
  Show/Hide comments   View file @b6558af
... ... @@ -24,11 +24,7 @@ echo $this->render('layout');
24 24 [
25 25 'class' => Column::className(),
26 26 'content' => function($model, $key, $index, $column) {
27   -<<<<<<< 1fd2bdb43fc5cfdcf100cac8b72e67fd81e7f0fa
28   - return '<span class="f32"><span class="flag '.$model->lang_code.'"></span></span>';
29   -=======
30   - return '<span class="f32"><span class="flag '.$model->country_code.'"></span></span>';
31   ->>>>>>> 0e0edb85a79343e4d020ff05378179e2323b21bd
  27 + return '<span class="f32"><span class="flag '.$model->country_code.'"></span></span>';
32 28 }
33 29 ],
34 30 'language_name',
... ...
backend/views/language/index.php
  Show/Hide comments   View file @b6558af
... ... @@ -24,11 +24,7 @@ echo $this-&gt;render(&#39;layout&#39;);
24 24 [
25 25 'class' => Column::className(),
26 26 'content' => function($model, $key, $index, $column) {
27   -<<<<<<< 1fd2bdb43fc5cfdcf100cac8b72e67fd81e7f0fa
28   - return '<span class="f32"><span class="flag '.$model->lang_code.'"></span></span>';
29   -=======
30 27 return '<span class="f32"><span class="flag '.$model->country_code.'"></span></span>';
31   ->>>>>>> 0e0edb85a79343e4d020ff05378179e2323b21bd
32 28 }
33 29 ],
34 30 'language_name',
... ...