Alexey Boroda / openeurope

Commit 8e33baf92c8596a4c22b34b3fb795be7b54f3cc7

Authored by Anastasia
2 parents 083b028f 4b8bc815

Merge remote-tracking branch 'origin/master'

Showing 12 changed files with 115 additions and 101 deletions   Show diff stats
Inline Side-by-side
common/messages/en/app.php
  Show/Hide comments   View file @8e33baf
@@ -21,22 +21,23 @@ @@ -21,22 +21,23 @@
21 "Search by article" => 'Search by article', 21 "Search by article" => 'Search by article',
22 'Send' => 'Send', 22 'Send' => 'Send',
23 'Send message' => 'Send message', 23 'Send message' => 'Send message',
24 - 'Events' => 'Events',  
25 - 'You question' => 'You question',  
26 - 'News' => 'News',  
27 - 'Media' => 'Media',  
28 - 'More' => 'More',  
29 - 'Form sends success' => 'Form sends success',  
30 - 'Message' => 'Message',  
31 - 'Name' => 'Name',  
32 - 'Phone' => 'Phone', 24 + 'Events' => 'Events',
  25 + 'You question' => 'You question',
  26 + 'News' => 'News',
  27 + 'Media' => 'Media',
  28 + 'More' => 'More',
  29 + 'Form sends success' => 'Form sends success',
  30 + 'Message' => 'Message',
  31 + 'Name' => 'Name',
  32 + 'Phone' => 'Phone',
33 'Form sends success Header' => 'Success', 33 'Form sends success Header' => 'Success',
34 'Empty field' => 'This field is required.Please fill it', 34 'Empty field' => 'This field is required.Please fill it',
  35 + 'Empty dataProvider' => 'No results found',
35 'Wrong email' => 'Field Email is not valid', 36 'Wrong email' => 'Field Email is not valid',
36 'phone' => 'phone', 37 'phone' => 'phone',
37 'Without category' =>'Without category', 38 'Without category' =>'Without category',
38 'Our advantages' => 'Our advantages', 39 'Our advantages' => 'Our advantages',
39 'Читать далее' => 'Read more', 40 'Читать далее' => 'Read more',
40 - 41 + 'Close' => 'Close',
41 42
42 ]; 43 ];
43 \ No newline at end of file 44 \ No newline at end of file
common/messages/ru/app.php
  Show/Hide comments   View file @8e33baf
1 <?php 1 <?php
2 return [ 2 return [
3 - 'Home' => 'Главная',  
4 - 'Contacts' => 'Контакты',  
5 - 'About' => 'О нас',  
6 - 'Blog' => 'Блог',  
7 - 'Events' => 'Мероприятия',  
8 - 'You question' => 'Ваш вопрос',  
9 - 'Contact us!' => 'Свяжитесь с нами',  
10 - 'Go to contact page' => 'Перейти на страницу контактов',  
11 - 'Send message' => 'Отправить сообщение',  
12 - 'Contact form' => "Форма для связи",  
13 - 'News' => 'Новости',  
14 - 'Media' => 'Медиа',  
15 - 'More' => 'Подробнее',  
16 - 'Company Blog' => 'Блог компании',  
17 -  
18 - 'Name' => 'Имя',  
19 - 'Phone' => 'Телефон',  
20 - 'blog-txt' => ' Мы собираем полезные материалы по тематике бытовой техники и электроники',  
21 - 'Continue reading' => 'Продолжить чтение',  
22 - 'Address' => 'Адрес',  
23 - 'phone' => 'Телефон',  
24 - 'Form sends success' => 'Форма успешно отправлена',  
25 - 'Gallery' =>'Галерея',  
26 - 'Categories' => 'Категории',  
27 - 'Without category' =>'Без категории',  
28 - 'No results found' =>'Ничего не найдено', 3 + 'Home' => 'Главная',
  4 + 'Contacts' => 'Контакты',
  5 + 'About' => 'О нас',
  6 + 'Blog' => 'Блог',
  7 + 'Events' => 'Мероприятия',
  8 + 'You question' => 'Сообщение',
  9 + 'Contact us!' => 'Свяжитесь с нами',
  10 + 'Go to contact page' => 'Перейти на страницу контактов',
  11 + 'Send message' => 'Отправить сообщение',
  12 + 'Contact form' => "Форма для связи",
  13 + 'News' => 'Новости',
  14 + 'Media' => 'Медиа',
  15 + 'More' => 'Подробнее',
  16 + 'Company Blog' => 'Блог компании',
  17 + 'Close' => 'Закрыть',
  18 + 'Name' => 'Имя',
  19 + 'Phone' => 'Телефон',
  20 + 'blog-txt' => ' Мы собираем полезные материалы по тематике бытовой техники и электроники',
  21 + 'Continue reading' => 'Продолжить чтение',
  22 + 'Address' => 'Адрес',
  23 + 'phone' => 'Телефон',
  24 + 'Form sends success' => 'Форма успешно отправлена',
  25 + 'Gallery' =>'Галерея',
  26 + 'Categories' => 'Категории',
  27 + 'Without category' =>'Без категории',
  28 + 'No results found' =>'Ничего не найдено',
29 'Form sends success Header' => 'Форма успешно отправлена ', 29 'Form sends success Header' => 'Форма успешно отправлена ',
30 'Our advantages' => 'Наши преимущества', 30 'Our advantages' => 'Наши преимущества',
31 'Our clients' =>'Наши клиенты', 31 'Our clients' =>'Наши клиенты',
@@ -37,5 +37,5 @@ return [ @@ -37,5 +37,5 @@ return [
37 'Wrong email' => 'Поле Email не валидное', 37 'Wrong email' => 'Поле Email не валидное',
38 'Message' => 'Сообщение', 38 'Message' => 'Сообщение',
39 '<i class="fa fa-envelope-o"></i>Send Message' => 'Отправить сообщение', 39 '<i class="fa fa-envelope-o"></i>Send Message' => 'Отправить сообщение',
40 - 40 + 'Empty dataProvider' => 'Ничего не найдено',
41 ]; 41 ];
42 \ No newline at end of file 42 \ No newline at end of file
common/messages/ua/app.php
  Show/Hide comments   View file @8e33baf
@@ -9,7 +9,7 @@ return [ @@ -9,7 +9,7 @@ return [
9 'Name' => 'Ім\'я', 9 'Name' => 'Ім\'я',
10 'Phone' => 'Телефон', 10 'Phone' => 'Телефон',
11 'Message' => 'Повідомленя', 11 'Message' => 'Повідомленя',
12 - 'You question' => 'Ваше питання', 12 + 'You question' => 'Повідомленя',
13 'Send' => 'Відправити', 13 'Send' => 'Відправити',
14 'Contact us!' => 'Зв\'яжіться з нами', 14 'Contact us!' => 'Зв\'яжіться з нами',
15 'Go to contact page' => 'Перейти до сторінки контактів', 15 'Go to contact page' => 'Перейти до сторінки контактів',
@@ -28,13 +28,13 @@ return [ @@ -28,13 +28,13 @@ return [
28 'Gallery' =>'Галерея', 28 'Gallery' =>'Галерея',
29 'Without category' =>'Без категорії', 29 'Without category' =>'Без категорії',
30 'No results found' =>'Нічого не знайдено', 30 'No results found' =>'Нічого не знайдено',
31 -  
32 - 'Our advantages' => 'Наші переваги',  
33 - 'Our clients'=>'Наші клієнти',  
34 -  
35 - 'Search'=>'Пошук',  
36 - 'Search by tag' => 'Пошук по тегам',  
37 - "Search by article"=>'Поиск по статтям', 31 + 'Close' => 'Закрити',
  32 + 'Our advantages' => 'Наші переваги',
  33 + 'Our clients' =>'Наші клієнти',
  34 + 'Empty dataProvider' => 'Нічого не знайдено',
  35 + 'Search' =>'Пошук',
  36 + 'Search by tag' => 'Пошук по тегам',
  37 + "Search by article" =>'Поиск по статтям',
38 38
39 'Form sends success Header' => 'Форма успішно відправлена', 39 'Form sends success Header' => 'Форма успішно відправлена',
40 'name' => 'Ім\'я', 40 'name' => 'Ім\'я',
@@ -186,16 +186,16 @@ @@ -186,16 +186,16 @@
186 }, 186 },
187 { 187 {
188 "name": "bower-asset/bootstrap-daterangepicker", 188 "name": "bower-asset/bootstrap-daterangepicker",
189 - "version": "v3.0.1", 189 + "version": "v3.0.2",
190 "source": { 190 "source": {
191 "type": "git", 191 "type": "git",
192 "url": "https://github.com/dangrossman/daterangepicker.git", 192 "url": "https://github.com/dangrossman/daterangepicker.git",
193 - "reference": "b17e061234bf80df062cd9f83ce2f422b15c3006" 193 + "reference": "fba7dc416be6b38a6b2051cf6bdc84920f8cd6f7"
194 }, 194 },
195 "dist": { 195 "dist": {
196 "type": "zip", 196 "type": "zip",
197 - "url": "https://api.github.com/repos/dangrossman/daterangepicker/zipball/b17e061234bf80df062cd9f83ce2f422b15c3006",  
198 - "reference": "b17e061234bf80df062cd9f83ce2f422b15c3006", 197 + "url": "https://api.github.com/repos/dangrossman/daterangepicker/zipball/fba7dc416be6b38a6b2051cf6bdc84920f8cd6f7",
  198 + "reference": "fba7dc416be6b38a6b2051cf6bdc84920f8cd6f7",
199 "shasum": null 199 "shasum": null
200 }, 200 },
201 "require": { 201 "require": {
@@ -883,16 +883,16 @@ @@ -883,16 +883,16 @@
883 }, 883 },
884 { 884 {
885 "name": "google/apiclient-services", 885 "name": "google/apiclient-services",
886 - "version": "v0.58", 886 + "version": "v0.60",
887 "source": { 887 "source": {
888 "type": "git", 888 "type": "git",
889 "url": "https://github.com/google/google-api-php-client-services.git", 889 "url": "https://github.com/google/google-api-php-client-services.git",
890 - "reference": "e21760a34daea7bc29e2866b62f8c8db4e91228d" 890 + "reference": "80404044884da8ed7e6fcbd4fa96e2ad7db46e94"
891 }, 891 },
892 "dist": { 892 "dist": {
893 "type": "zip", 893 "type": "zip",
894 - "url": "https://api.github.com/repos/google/google-api-php-client-services/zipball/e21760a34daea7bc29e2866b62f8c8db4e91228d",  
895 - "reference": "e21760a34daea7bc29e2866b62f8c8db4e91228d", 894 + "url": "https://api.github.com/repos/google/google-api-php-client-services/zipball/80404044884da8ed7e6fcbd4fa96e2ad7db46e94",
  895 + "reference": "80404044884da8ed7e6fcbd4fa96e2ad7db46e94",
896 "shasum": "" 896 "shasum": ""
897 }, 897 },
898 "require": { 898 "require": {
@@ -916,7 +916,7 @@ @@ -916,7 +916,7 @@
916 "keywords": [ 916 "keywords": [
917 "google" 917 "google"
918 ], 918 ],
919 - "time": "2018-05-06T00:22:52+00:00" 919 + "time": "2018-05-19T00:23:51+00:00"
920 }, 920 },
921 { 921 {
922 "name": "google/auth", 922 "name": "google/auth",
@@ -2643,16 +2643,16 @@ @@ -2643,16 +2643,16 @@
2643 }, 2643 },
2644 { 2644 {
2645 "name": "tinymce/tinymce", 2645 "name": "tinymce/tinymce",
2646 - "version": "4.7.12", 2646 + "version": "4.7.13",
2647 "source": { 2647 "source": {
2648 "type": "git", 2648 "type": "git",
2649 "url": "https://github.com/tinymce/tinymce-dist.git", 2649 "url": "https://github.com/tinymce/tinymce-dist.git",
2650 - "reference": "914887eeeb9a28034045879defa09defccf7c68a" 2650 + "reference": "2d2cd37932279723b4a5e4d259bc94123acbe666"
2651 }, 2651 },
2652 "dist": { 2652 "dist": {
2653 "type": "zip", 2653 "type": "zip",
2654 - "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/914887eeeb9a28034045879defa09defccf7c68a",  
2655 - "reference": "914887eeeb9a28034045879defa09defccf7c68a", 2654 + "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/2d2cd37932279723b4a5e4d259bc94123acbe666",
  2655 + "reference": "2d2cd37932279723b4a5e4d259bc94123acbe666",
2656 "shasum": "" 2656 "shasum": ""
2657 }, 2657 },
2658 "type": "component", 2658 "type": "component",
@@ -2685,7 +2685,7 @@ @@ -2685,7 +2685,7 @@
2685 "tinymce", 2685 "tinymce",
2686 "wysiwyg" 2686 "wysiwyg"
2687 ], 2687 ],
2688 - "time": "2018-05-03T13:38:00+00:00" 2688 + "time": "2018-05-16T04:27:27+00:00"
2689 }, 2689 },
2690 { 2690 {
2691 "name": "tubalmartin/cssmin", 2691 "name": "tubalmartin/cssmin",
@@ -3576,22 +3576,22 @@ @@ -3576,22 +3576,22 @@
3576 }, 3576 },
3577 { 3577 {
3578 "name": "codeception/phpunit-wrapper", 3578 "name": "codeception/phpunit-wrapper",
3579 - "version": "7.1.1", 3579 + "version": "7.1.2",
3580 "source": { 3580 "source": {
3581 "type": "git", 3581 "type": "git",
3582 "url": "https://github.com/Codeception/phpunit-wrapper.git", 3582 "url": "https://github.com/Codeception/phpunit-wrapper.git",
3583 - "reference": "33e8ccf2f7abf5c031eeae9802b821d30ec0f7fc" 3583 + "reference": "374dd623668a0028e29c95b362e20d03f8c4e65b"
3584 }, 3584 },
3585 "dist": { 3585 "dist": {
3586 "type": "zip", 3586 "type": "zip",
3587 - "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/33e8ccf2f7abf5c031eeae9802b821d30ec0f7fc",  
3588 - "reference": "33e8ccf2f7abf5c031eeae9802b821d30ec0f7fc", 3587 + "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/374dd623668a0028e29c95b362e20d03f8c4e65b",
  3588 + "reference": "374dd623668a0028e29c95b362e20d03f8c4e65b",
3589 "shasum": "" 3589 "shasum": ""
3590 }, 3590 },
3591 "require": { 3591 "require": {
3592 "phpunit/php-code-coverage": "^6.0", 3592 "phpunit/php-code-coverage": "^6.0",
3593 "phpunit/phpunit": "^7.1", 3593 "phpunit/phpunit": "^7.1",
3594 - "sebastian/comparator": "^2.0", 3594 + "sebastian/comparator": "^3.0",
3595 "sebastian/diff": "^3.0" 3595 "sebastian/diff": "^3.0"
3596 }, 3596 },
3597 "require-dev": { 3597 "require-dev": {
@@ -3615,20 +3615,20 @@ @@ -3615,20 +3615,20 @@
3615 } 3615 }
3616 ], 3616 ],
3617 "description": "PHPUnit classes used by Codeception", 3617 "description": "PHPUnit classes used by Codeception",
3618 - "time": "2018-04-20T10:17:13+00:00" 3618 + "time": "2018-05-17T08:30:48+00:00"
3619 }, 3619 },
3620 { 3620 {
3621 "name": "codeception/stub", 3621 "name": "codeception/stub",
3622 - "version": "1.0.2", 3622 + "version": "1.0.4",
3623 "source": { 3623 "source": {
3624 "type": "git", 3624 "type": "git",
3625 "url": "https://github.com/Codeception/Stub.git", 3625 "url": "https://github.com/Codeception/Stub.git",
3626 - "reference": "95fb7a36b81890dd2e5163e7ab31310df6f1bb99" 3626 + "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805"
3627 }, 3627 },
3628 "dist": { 3628 "dist": {
3629 "type": "zip", 3629 "type": "zip",
3630 - "url": "https://api.github.com/repos/Codeception/Stub/zipball/95fb7a36b81890dd2e5163e7ab31310df6f1bb99",  
3631 - "reference": "95fb7a36b81890dd2e5163e7ab31310df6f1bb99", 3630 + "url": "https://api.github.com/repos/Codeception/Stub/zipball/681b62348837a5ef07d10d8a226f5bc358cc8805",
  3631 + "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805",
3632 "shasum": "" 3632 "shasum": ""
3633 }, 3633 },
3634 "require": { 3634 "require": {
@@ -3648,7 +3648,7 @@ @@ -3648,7 +3648,7 @@
3648 "MIT" 3648 "MIT"
3649 ], 3649 ],
3650 "description": "Flexible Stub wrapper for PHPUnit's Mock Builder", 3650 "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
3651 - "time": "2018-02-18T13:56:56+00:00" 3651 + "time": "2018-05-17T09:31:08+00:00"
3652 }, 3652 },
3653 { 3653 {
3654 "name": "codeception/verify", 3654 "name": "codeception/verify",
@@ -4441,16 +4441,16 @@ @@ -4441,16 +4441,16 @@
4441 }, 4441 },
4442 { 4442 {
4443 "name": "phpunit/phpunit", 4443 "name": "phpunit/phpunit",
4444 - "version": "7.1.4", 4444 + "version": "7.1.5",
4445 "source": { 4445 "source": {
4446 "type": "git", 4446 "type": "git",
4447 "url": "https://github.com/sebastianbergmann/phpunit.git", 4447 "url": "https://github.com/sebastianbergmann/phpunit.git",
4448 - "reference": "6d51299e307dc510149e0b7cd1931dd11770e1cb" 4448 + "reference": "ca64dba53b88aba6af32aebc6b388068db95c435"
4449 }, 4449 },
4450 "dist": { 4450 "dist": {
4451 "type": "zip", 4451 "type": "zip",
4452 - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6d51299e307dc510149e0b7cd1931dd11770e1cb",  
4453 - "reference": "6d51299e307dc510149e0b7cd1931dd11770e1cb", 4452 + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ca64dba53b88aba6af32aebc6b388068db95c435",
  4453 + "reference": "ca64dba53b88aba6af32aebc6b388068db95c435",
4454 "shasum": "" 4454 "shasum": ""
4455 }, 4455 },
4456 "require": { 4456 "require": {
@@ -4469,7 +4469,7 @@ @@ -4469,7 +4469,7 @@
4469 "phpunit/php-text-template": "^1.2.1", 4469 "phpunit/php-text-template": "^1.2.1",
4470 "phpunit/php-timer": "^2.0", 4470 "phpunit/php-timer": "^2.0",
4471 "phpunit/phpunit-mock-objects": "^6.1.1", 4471 "phpunit/phpunit-mock-objects": "^6.1.1",
4472 - "sebastian/comparator": "^2.1 || ^3.0", 4472 + "sebastian/comparator": "^3.0",
4473 "sebastian/diff": "^3.0", 4473 "sebastian/diff": "^3.0",
4474 "sebastian/environment": "^3.1", 4474 "sebastian/environment": "^3.1",
4475 "sebastian/exporter": "^3.1", 4475 "sebastian/exporter": "^3.1",
@@ -4517,7 +4517,7 @@ @@ -4517,7 +4517,7 @@
4517 "testing", 4517 "testing",
4518 "xunit" 4518 "xunit"
4519 ], 4519 ],
4520 - "time": "2018-04-18T13:41:53+00:00" 4520 + "time": "2018-04-29T15:09:19+00:00"
4521 }, 4521 },
4522 { 4522 {
4523 "name": "phpunit/phpunit-mock-objects", 4523 "name": "phpunit/phpunit-mock-objects",
@@ -4622,30 +4622,30 @@ @@ -4622,30 +4622,30 @@
4622 }, 4622 },
4623 { 4623 {
4624 "name": "sebastian/comparator", 4624 "name": "sebastian/comparator",
4625 - "version": "2.1.3", 4625 + "version": "3.0.0",
4626 "source": { 4626 "source": {
4627 "type": "git", 4627 "type": "git",
4628 "url": "https://github.com/sebastianbergmann/comparator.git", 4628 "url": "https://github.com/sebastianbergmann/comparator.git",
4629 - "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9" 4629 + "reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5"
4630 }, 4630 },
4631 "dist": { 4631 "dist": {
4632 "type": "zip", 4632 "type": "zip",
4633 - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",  
4634 - "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9", 4633 + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/ed5fd2281113729f1ebcc64d101ad66028aeb3d5",
  4634 + "reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5",
4635 "shasum": "" 4635 "shasum": ""
4636 }, 4636 },
4637 "require": { 4637 "require": {
4638 - "php": "^7.0",  
4639 - "sebastian/diff": "^2.0 || ^3.0", 4638 + "php": "^7.1",
  4639 + "sebastian/diff": "^3.0",
4640 "sebastian/exporter": "^3.1" 4640 "sebastian/exporter": "^3.1"
4641 }, 4641 },
4642 "require-dev": { 4642 "require-dev": {
4643 - "phpunit/phpunit": "^6.4" 4643 + "phpunit/phpunit": "^7.1"
4644 }, 4644 },
4645 "type": "library", 4645 "type": "library",
4646 "extra": { 4646 "extra": {
4647 "branch-alias": { 4647 "branch-alias": {
4648 - "dev-master": "2.1.x-dev" 4648 + "dev-master": "3.0-dev"
4649 } 4649 }
4650 }, 4650 },
4651 "autoload": { 4651 "autoload": {
@@ -4682,7 +4682,7 @@ @@ -4682,7 +4682,7 @@
4682 "compare", 4682 "compare",
4683 "equality" 4683 "equality"
4684 ], 4684 ],
4685 - "time": "2018-02-01T13:46:46+00:00" 4685 + "time": "2018-04-18T13:33:00+00:00"
4686 }, 4686 },
4687 { 4687 {
4688 "name": "sebastian/diff", 4688 "name": "sebastian/diff",
frontend/views/blog/tag.php
  Show/Hide comments   View file @8e33baf
@@ -18,10 +18,9 @@ @@ -18,10 +18,9 @@
18 $seo = \Yii::$app->get('seo'); 18 $seo = \Yii::$app->get('seo');
19 19
20 $this->params[ 'breadcrumbs' ][] = [ 20 $this->params[ 'breadcrumbs' ][] = [
21 - 'label' => \Yii::t('app', 'Блог'), 21 + 'label' => \Yii::t('app', 'Blog'),
22 'url' => [ 'blog/index' ], 22 'url' => [ 'blog/index' ],
23 ]; 23 ];
24 -  
25 $this->params[ 'breadcrumbs' ][] = $seo->title; 24 $this->params[ 'breadcrumbs' ][] = $seo->title;
26 25
27 ?> 26 ?>
@@ -88,7 +87,7 @@ _________________________________________________________ --&gt; @@ -88,7 +87,7 @@ _________________________________________________________ --&gt;
88 87
89 <div class="panel sidebar-menu"> 88 <div class="panel sidebar-menu">
90 <div class="panel-heading"> 89 <div class="panel-heading">
91 - <h3 class="panel-title">Поиск по тегам</h3> 90 + <h3 class="panel-title"><?= \Yii::t('app', 'Search by tag'); ?></h3>
92 </div> 91 </div>
93 92
94 <div class="panel-body"> 93 <div class="panel-body">
frontend/views/blog/view.php
  Show/Hide comments   View file @8e33baf
@@ -51,7 +51,8 @@ _________________________________________________________ --&gt; @@ -51,7 +51,8 @@ _________________________________________________________ --&gt;
51 <?php } ?> 51 <?php } ?>
52 52
53 <p class="text-muted text-uppercase mb-small text-left"><?= \Yii::$app->formatter->asDate( 53 <p class="text-muted text-uppercase mb-small text-left"><?= \Yii::$app->formatter->asDate(
54 - $model->created_at 54 + $model->created_at,
  55 + 'short'
55 ); ?></p> 56 ); ?></p>
56 57
57 <div id="post-content"> 58 <div id="post-content">
frontend/views/event/tag.php
  Show/Hide comments   View file @8e33baf
@@ -51,6 +51,7 @@ _________________________________________________________ --&gt; @@ -51,6 +51,7 @@ _________________________________________________________ --&gt;
51 'id' => 'blog-listing-medium', 51 'id' => 'blog-listing-medium',
52 ], 52 ],
53 'layout' => '{items}{pager}', 53 'layout' => '{items}{pager}',
  54 + 'emptyText' => \Yii::t('app', 'Empty dataProvider'),
54 ] 55 ]
55 ); ?> 56 ); ?>
56 57
frontend/views/event/view.php
  Show/Hide comments   View file @8e33baf
@@ -50,7 +50,8 @@ _________________________________________________________ --&gt; @@ -50,7 +50,8 @@ _________________________________________________________ --&gt;
50 <?php } ?> 50 <?php } ?>
51 51
52 <p class="text-muted text-uppercase mb-small text-left"><?= \Yii::$app->formatter->asDate( 52 <p class="text-muted text-uppercase mb-small text-left"><?= \Yii::$app->formatter->asDate(
53 - $model->created_at 53 + $model->created_at,
  54 + 'short'
54 ); ?></p> 55 ); ?></p>
55 56
56 <div id="post-content"> 57 <div id="post-content">
@@ -173,7 +174,7 @@ _________________________________________________________ --&gt; @@ -173,7 +174,7 @@ _________________________________________________________ --&gt;
173 174
174 <div class="panel sidebar-menu"> 175 <div class="panel sidebar-menu">
175 <div class="panel-heading"> 176 <div class="panel-heading">
176 - <h3 class="panel-title"><?=\Yii::t('app', 'Поиск по тегам')?></h3> 177 + <h3 class="panel-title"><?= \Yii::t('app', 'Search by tag') ?></h3>
177 </div> 178 </div>
178 179
179 <div class="panel-body"> 180 <div class="panel-body">
frontend/views/layouts/main.php
  Show/Hide comments   View file @8e33baf
@@ -111,10 +111,6 @@ _________________________________________________________ --&gt; @@ -111,10 +111,6 @@ _________________________________________________________ --&gt;
111 if (!empty($settings->phone)) { 111 if (!empty($settings->phone)) {
112 echo \Yii::t('app', 'Contact us on '); 112 echo \Yii::t('app', 'Contact us on ');
113 echo Html::a($settings->phone, "tel: {$settings->phone}"); 113 echo Html::a($settings->phone, "tel: {$settings->phone}");
114 - if (!empty( $settings->phone2 )) {  
115 - echo '&nbsp;';  
116 - echo Html::a($settings->phone2, "tel: {$settings->phone2}");  
117 - }  
118 if (!empty($settings->email)) { 114 if (!empty($settings->email)) {
119 echo \Yii::t('app', ' or '); 115 echo \Yii::t('app', ' or ');
120 echo Html::a($settings->email, "mailto:$settings->email"); 116 echo Html::a($settings->email, "mailto:$settings->email");
@@ -399,7 +395,10 @@ _________________________________________________________ --&gt; @@ -399,7 +395,10 @@ _________________________________________________________ --&gt;
399 395
400 <p><?= \Yii::t('app', 'Form sends success') ?></p> 396 <p><?= \Yii::t('app', 'Form sends success') ?></p>
401 <p class="text-center"> 397 <p class="text-center">
402 - <button type="button" class="btn btn-template-primary" data-dismiss="modal">Close</button> 398 + <button type="button" class="btn btn-template-primary" data-dismiss="modal"><?= \Yii::t(
  399 + 'app',
  400 + 'Close'
  401 + ); ?></button>
403 </p> 402 </p>
404 </div> 403 </div>
405 </div> 404 </div>
frontend/views/site/contact.php
  Show/Hide comments   View file @8e33baf
@@ -62,6 +62,13 @@ JS; @@ -62,6 +62,13 @@ JS;
62 <p> 62 <p>
63 <?php 63 <?php
64 echo Html::a(Html::tag('strong', $settings->phone), 'tel:' . $settings->phone); 64 echo Html::a(Html::tag('strong', $settings->phone), 'tel:' . $settings->phone);
  65 + if (!empty( $settings->phone2 )) {
  66 + echo '<br>';
  67 + echo Html::a(
  68 + Html::tag('strong', $settings->phone2),
  69 + "tel:" . $settings->phone2
  70 + );
  71 + }
65 ?> 72 ?>
66 </p> 73 </p>
67 </div> 74 </div>
frontend/views/site/index.php
  Show/Hide comments   View file @8e33baf
@@ -16,8 +16,9 @@ @@ -16,8 +16,9 @@
16 <!-- *** HOMEPAGE CAROUSEL *** 16 <!-- *** HOMEPAGE CAROUSEL ***
17 _________________________________________________________ --> 17 _________________________________________________________ -->
18 18
19 - <div class="home-carousel" <?=$slides[0]->background !== null ? ' style="background: url('.$slides[0]->background->getUrl().') center center repeat;"' : ''?>>  
20 - 19 +<!-- <div class="home-carousel" --><?//=$slides[0]->background !== null ? ' style="background: url('.$slides[0]->background->getUrl().') center center repeat;"' : ''?><!-->
  20 + <div class="home-carousel">
  21 +
21 <div class="dark-mask"></div> 22 <div class="dark-mask"></div>
22 23
23 <div class="container"> 24 <div class="container">
@@ -31,10 +32,14 @@ _________________________________________________________ --&gt; @@ -31,10 +32,14 @@ _________________________________________________________ --&gt;
31 <h1><?=$slide->title?></h1> 32 <h1><?=$slide->title?></h1>
32 <p><?=$slide->description?></p> 33 <p><?=$slide->description?></p>
33 <p style="margin-top:25px;"> </p> 34 <p style="margin-top:25px;"> </p>
34 - <p><a href="<?=$slide->link?>" class="btn btn-template-transparent-primary"><?=\Yii::t('app', 'More')?></a></p> 35 + <p class="text-right">
  36 + <a href="<?= $slide->link ?>" class="btn btn-template-transparent-primary "><?= \Yii::t(
  37 + 'app',
  38 + 'More'
  39 + ) ?></a></p>
35 </div> 40 </div>
36 <?php if ($slide->language->image !== null){?> 41 <?php if ($slide->language->image !== null){?>
37 - <div class="col-sm-7 <?=($key % 2 != 0) ? 'text-center': ''?>"> 42 + <div class="col-sm-7">
38 <a href="<?=$slide->link?>"><?=ImageHelper::set($slide->language->image->getPath()) 43 <a href="<?=$slide->link?>"><?=ImageHelper::set($slide->language->image->getPath())
39 ->cropResize(650, 380) 44 ->cropResize(650, 380)
40 ->quality(84) 45 ->quality(84)
frontend/web/css/style.blue.css
  Show/Hide comments   View file @8e33baf
@@ -3,4 +3,4 @@ @@ -3,4 +3,4 @@
3 * http://geedmo.github.com/yamm3 3 * http://geedmo.github.com/yamm3
4 * 4 *
5 * @geedmo - Licensed under the MIT license 5 * @geedmo - Licensed under the MIT license
6 - */.yamm .nav,.yamm .collapse,.yamm .dropup.use-yamm,.yamm .dropdown.use-yamm{position:static}.yamm .container{position:relative}.yamm .dropdown-menu{left:auto}.yamm .nav.navbar-right .dropdown-menu{left:auto;right:0}.yamm .yamm-content{padding:20px 30px}.yamm .dropdown.yamm-fw .dropdown-menu{left:15px;right:15px}#back-to-top{background-color:#294d76;}#back-to-top:hover{background-color:#2e6a98;}  
7 \ No newline at end of file 6 \ No newline at end of file
  7 + */.yamm .nav,.yamm .collapse,.yamm .dropup.use-yamm,.yamm .dropdown.use-yamm{position:static}.yamm .container{position:relative}.yamm .dropdown-menu{left:auto}.yamm .nav.navbar-right .dropdown-menu{left:auto;right:0}.yamm .yamm-content{padding:20px 30px}.yamm .dropdown.yamm-fw .dropdown-menu{left:15px;right:15px}#back-to-top{background-color:#294d76;}#back-to-top:hover{background-color:#2e6a98;}.home-carousel{background:none !important;}.home-carousel .dark-mask {background:#578bc5;opacity:1;}#top .social a,#top .social {color:#fff}#top {background: #999;}.contact a {font-weight:700;color:#2f5a89;}
8 \ No newline at end of file 8 \ No newline at end of file