Commit 110087c289881d0aaeef39e792fcb588a35e2e64
1 parent
225c5168
test
Showing
6 changed files
with
280 additions
and
426 deletions
Show diff stats
common/widgets/views/education_field.php
| @@ -59,11 +59,11 @@ | @@ -59,11 +59,11 @@ | ||
| 59 | .parent ('fieldset'); | 59 | .parent ('fieldset'); |
| 60 | var sub_block = '<div class="form-group" >' + | 60 | var sub_block = '<div class="form-group" >' + |
| 61 | '<div class="input-blocks">'+ | 61 | '<div class="input-blocks">'+ |
| 62 | - '<input id="edu-name-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="Название" class="form-control custom-input-2" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][0][name]" />' + | 62 | + '<input id="edu-name-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="Название" class="form-control custom-input-2" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][0][name]" required />' + |
| 63 | '<label for="edu-name-' + start_label_<?=$this->context->id?> +'">Название ВУЗа</label>'+ | 63 | '<label for="edu-name-' + start_label_<?=$this->context->id?> +'">Название ВУЗа</label>'+ |
| 64 | '</div>'+ | 64 | '</div>'+ |
| 65 | '<div class="input-blocks">'+ | 65 | '<div class="input-blocks">'+ |
| 66 | - '<input id="edu-to-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][1][year_from]" min="1950" max="<?=date('Y')?>" />' + | 66 | + '<input id="edu-to-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][1][year_from]" min="1950" max="<?=date('Y')?>" required />' + |
| 67 | '<label for="edu-to-' + start_label_<?=$this->context->id?> +'">год начала</label>'+ | 67 | '<label for="edu-to-' + start_label_<?=$this->context->id?> +'">год начала</label>'+ |
| 68 | '</div>'+ | 68 | '</div>'+ |
| 69 | '<div class="input-blocks">'+ | 69 | '<div class="input-blocks">'+ |
composer.lock
| @@ -363,12 +363,12 @@ | @@ -363,12 +363,12 @@ | ||
| 363 | "source": { | 363 | "source": { |
| 364 | "type": "git", | 364 | "type": "git", |
| 365 | "url": "https://github.com/cebe/markdown.git", | 365 | "url": "https://github.com/cebe/markdown.git", |
| 366 | - "reference": "e4499350d8a94c4c693a7e784295eff7a717ae67" | 366 | + "reference": "e2a490ceec590bf5bfd1b43bd424fb9dceceb7c5" |
| 367 | }, | 367 | }, |
| 368 | "dist": { | 368 | "dist": { |
| 369 | "type": "zip", | 369 | "type": "zip", |
| 370 | - "url": "https://api.github.com/repos/cebe/markdown/zipball/e4499350d8a94c4c693a7e784295eff7a717ae67", | ||
| 371 | - "reference": "e4499350d8a94c4c693a7e784295eff7a717ae67", | 370 | + "url": "https://api.github.com/repos/cebe/markdown/zipball/e2a490ceec590bf5bfd1b43bd424fb9dceceb7c5", |
| 371 | + "reference": "e2a490ceec590bf5bfd1b43bd424fb9dceceb7c5", | ||
| 372 | "shasum": "" | 372 | "shasum": "" |
| 373 | }, | 373 | }, |
| 374 | "require": { | 374 | "require": { |
| @@ -415,7 +415,7 @@ | @@ -415,7 +415,7 @@ | ||
| 415 | "markdown", | 415 | "markdown", |
| 416 | "markdown-extra" | 416 | "markdown-extra" |
| 417 | ], | 417 | ], |
| 418 | - "time": "2016-02-09 22:09:46" | 418 | + "time": "2016-03-18 13:28:11" |
| 419 | }, | 419 | }, |
| 420 | { | 420 | { |
| 421 | "name": "cebe/yii2-gravatar", | 421 | "name": "cebe/yii2-gravatar", |
| @@ -503,16 +503,16 @@ | @@ -503,16 +503,16 @@ | ||
| 503 | }, | 503 | }, |
| 504 | { | 504 | { |
| 505 | "name": "dmstr/yii2-adminlte-asset", | 505 | "name": "dmstr/yii2-adminlte-asset", |
| 506 | - "version": "2.2.4", | 506 | + "version": "2.3.0", |
| 507 | "source": { | 507 | "source": { |
| 508 | "type": "git", | 508 | "type": "git", |
| 509 | "url": "https://github.com/dmstr/yii2-adminlte-asset.git", | 509 | "url": "https://github.com/dmstr/yii2-adminlte-asset.git", |
| 510 | - "reference": "c842a15ceef4e903f70ac927ec3246e6d53e1148" | 510 | + "reference": "73eca05cf04d70f169a88b430d2c03c3b54d623a" |
| 511 | }, | 511 | }, |
| 512 | "dist": { | 512 | "dist": { |
| 513 | "type": "zip", | 513 | "type": "zip", |
| 514 | - "url": "https://api.github.com/repos/dmstr/yii2-adminlte-asset/zipball/c842a15ceef4e903f70ac927ec3246e6d53e1148", | ||
| 515 | - "reference": "c842a15ceef4e903f70ac927ec3246e6d53e1148", | 514 | + "url": "https://api.github.com/repos/dmstr/yii2-adminlte-asset/zipball/73eca05cf04d70f169a88b430d2c03c3b54d623a", |
| 515 | + "reference": "73eca05cf04d70f169a88b430d2c03c3b54d623a", | ||
| 516 | "shasum": "" | 516 | "shasum": "" |
| 517 | }, | 517 | }, |
| 518 | "require": { | 518 | "require": { |
| @@ -553,20 +553,20 @@ | @@ -553,20 +553,20 @@ | ||
| 553 | "extension", | 553 | "extension", |
| 554 | "yii2" | 554 | "yii2" |
| 555 | ], | 555 | ], |
| 556 | - "time": "2015-11-06 10:35:36" | 556 | + "time": "2016-03-23 04:18:15" |
| 557 | }, | 557 | }, |
| 558 | { | 558 | { |
| 559 | "name": "ezyang/htmlpurifier", | 559 | "name": "ezyang/htmlpurifier", |
| 560 | - "version": "v4.6.0", | 560 | + "version": "v4.7.0", |
| 561 | "source": { | 561 | "source": { |
| 562 | "type": "git", | 562 | "type": "git", |
| 563 | "url": "https://github.com/ezyang/htmlpurifier.git", | 563 | "url": "https://github.com/ezyang/htmlpurifier.git", |
| 564 | - "reference": "6f389f0f25b90d0b495308efcfa073981177f0fd" | 564 | + "reference": "ae1828d955112356f7677c465f94f7deb7d27a40" |
| 565 | }, | 565 | }, |
| 566 | "dist": { | 566 | "dist": { |
| 567 | "type": "zip", | 567 | "type": "zip", |
| 568 | - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/6f389f0f25b90d0b495308efcfa073981177f0fd", | ||
| 569 | - "reference": "6f389f0f25b90d0b495308efcfa073981177f0fd", | 568 | + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/ae1828d955112356f7677c465f94f7deb7d27a40", |
| 569 | + "reference": "ae1828d955112356f7677c465f94f7deb7d27a40", | ||
| 570 | "shasum": "" | 570 | "shasum": "" |
| 571 | }, | 571 | }, |
| 572 | "require": { | 572 | "require": { |
| @@ -597,7 +597,7 @@ | @@ -597,7 +597,7 @@ | ||
| 597 | "keywords": [ | 597 | "keywords": [ |
| 598 | "html" | 598 | "html" |
| 599 | ], | 599 | ], |
| 600 | - "time": "2013-11-30 08:25:19" | 600 | + "time": "2015-08-05 01:03:42" |
| 601 | }, | 601 | }, |
| 602 | { | 602 | { |
| 603 | "name": "imagine/imagine", | 603 | "name": "imagine/imagine", |
| @@ -658,22 +658,27 @@ | @@ -658,22 +658,27 @@ | ||
| 658 | }, | 658 | }, |
| 659 | { | 659 | { |
| 660 | "name": "kartik-v/yii2-krajee-base", | 660 | "name": "kartik-v/yii2-krajee-base", |
| 661 | - "version": "1.8.2", | 661 | + "version": "dev-master", |
| 662 | "source": { | 662 | "source": { |
| 663 | "type": "git", | 663 | "type": "git", |
| 664 | "url": "https://github.com/kartik-v/yii2-krajee-base.git", | 664 | "url": "https://github.com/kartik-v/yii2-krajee-base.git", |
| 665 | - "reference": "0c274e31e4392cbafc5fe158eae81738794e02ce" | 665 | + "reference": "3e491e51ed742663b239cd6e0b7f76d403bed7e1" |
| 666 | }, | 666 | }, |
| 667 | "dist": { | 667 | "dist": { |
| 668 | "type": "zip", | 668 | "type": "zip", |
| 669 | - "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/0c274e31e4392cbafc5fe158eae81738794e02ce", | ||
| 670 | - "reference": "0c274e31e4392cbafc5fe158eae81738794e02ce", | 669 | + "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/3e491e51ed742663b239cd6e0b7f76d403bed7e1", |
| 670 | + "reference": "3e491e51ed742663b239cd6e0b7f76d403bed7e1", | ||
| 671 | "shasum": "" | 671 | "shasum": "" |
| 672 | }, | 672 | }, |
| 673 | "require": { | 673 | "require": { |
| 674 | "yiisoft/yii2-bootstrap": "@dev" | 674 | "yiisoft/yii2-bootstrap": "@dev" |
| 675 | }, | 675 | }, |
| 676 | "type": "yii2-extension", | 676 | "type": "yii2-extension", |
| 677 | + "extra": { | ||
| 678 | + "branch-alias": { | ||
| 679 | + "dev-master": "1.8.x-dev" | ||
| 680 | + } | ||
| 681 | + }, | ||
| 677 | "autoload": { | 682 | "autoload": { |
| 678 | "psr-4": { | 683 | "psr-4": { |
| 679 | "kartik\\base\\": "" | 684 | "kartik\\base\\": "" |
| @@ -700,7 +705,7 @@ | @@ -700,7 +705,7 @@ | ||
| 700 | "widget", | 705 | "widget", |
| 701 | "yii2" | 706 | "yii2" |
| 702 | ], | 707 | ], |
| 703 | - "time": "2016-01-10 12:26:29" | 708 | + "time": "2016-03-03 12:24:13" |
| 704 | }, | 709 | }, |
| 705 | { | 710 | { |
| 706 | "name": "kartik-v/yii2-widget-colorinput", | 711 | "name": "kartik-v/yii2-widget-colorinput", |
| @@ -762,12 +767,12 @@ | @@ -762,12 +767,12 @@ | ||
| 762 | "source": { | 767 | "source": { |
| 763 | "type": "git", | 768 | "type": "git", |
| 764 | "url": "https://github.com/kartik-v/yii2-widget-select2.git", | 769 | "url": "https://github.com/kartik-v/yii2-widget-select2.git", |
| 765 | - "reference": "4d03239c1e28ef8d3b96ab7fe360f5cbda34fb69" | 770 | + "reference": "cb2a5992cb96bd2939e30ec1c76eba418d6a30af" |
| 766 | }, | 771 | }, |
| 767 | "dist": { | 772 | "dist": { |
| 768 | "type": "zip", | 773 | "type": "zip", |
| 769 | - "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/4d03239c1e28ef8d3b96ab7fe360f5cbda34fb69", | ||
| 770 | - "reference": "4d03239c1e28ef8d3b96ab7fe360f5cbda34fb69", | 774 | + "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/cb2a5992cb96bd2939e30ec1c76eba418d6a30af", |
| 775 | + "reference": "cb2a5992cb96bd2939e30ec1c76eba418d6a30af", | ||
| 771 | "shasum": "" | 776 | "shasum": "" |
| 772 | }, | 777 | }, |
| 773 | "require": { | 778 | "require": { |
| @@ -807,7 +812,7 @@ | @@ -807,7 +812,7 @@ | ||
| 807 | "widget", | 812 | "widget", |
| 808 | "yii2" | 813 | "yii2" |
| 809 | ], | 814 | ], |
| 810 | - "time": "2016-02-17 11:49:30" | 815 | + "time": "2016-03-10 11:33:59" |
| 811 | }, | 816 | }, |
| 812 | { | 817 | { |
| 813 | "name": "lusitanian/oauth", | 818 | "name": "lusitanian/oauth", |
| @@ -1073,16 +1078,16 @@ | @@ -1073,16 +1078,16 @@ | ||
| 1073 | }, | 1078 | }, |
| 1074 | { | 1079 | { |
| 1075 | "name": "rmrevin/yii2-comments", | 1080 | "name": "rmrevin/yii2-comments", |
| 1076 | - "version": "1.4.0", | 1081 | + "version": "1.4.2", |
| 1077 | "source": { | 1082 | "source": { |
| 1078 | "type": "git", | 1083 | "type": "git", |
| 1079 | "url": "https://github.com/rmrevin/yii2-comments.git", | 1084 | "url": "https://github.com/rmrevin/yii2-comments.git", |
| 1080 | - "reference": "9aaf46b0a5c2c3d71b9dafd669ef78810729951f" | 1085 | + "reference": "c68ddf276fe24ece0173781a8f7391a2cf7e6a12" |
| 1081 | }, | 1086 | }, |
| 1082 | "dist": { | 1087 | "dist": { |
| 1083 | "type": "zip", | 1088 | "type": "zip", |
| 1084 | - "url": "https://api.github.com/repos/rmrevin/yii2-comments/zipball/9aaf46b0a5c2c3d71b9dafd669ef78810729951f", | ||
| 1085 | - "reference": "9aaf46b0a5c2c3d71b9dafd669ef78810729951f", | 1089 | + "url": "https://api.github.com/repos/rmrevin/yii2-comments/zipball/c68ddf276fe24ece0173781a8f7391a2cf7e6a12", |
| 1090 | + "reference": "c68ddf276fe24ece0173781a8f7391a2cf7e6a12", | ||
| 1086 | "shasum": "" | 1091 | "shasum": "" |
| 1087 | }, | 1092 | }, |
| 1088 | "require": { | 1093 | "require": { |
| @@ -1120,7 +1125,7 @@ | @@ -1120,7 +1125,7 @@ | ||
| 1120 | "widget", | 1125 | "widget", |
| 1121 | "yii" | 1126 | "yii" |
| 1122 | ], | 1127 | ], |
| 1123 | - "time": "2015-10-05 17:48:21" | 1128 | + "time": "2016-03-01 13:18:41" |
| 1124 | }, | 1129 | }, |
| 1125 | { | 1130 | { |
| 1126 | "name": "rmrevin/yii2-fontawesome", | 1131 | "name": "rmrevin/yii2-fontawesome", |
| @@ -1233,12 +1238,12 @@ | @@ -1233,12 +1238,12 @@ | ||
| 1233 | "source": { | 1238 | "source": { |
| 1234 | "type": "git", | 1239 | "type": "git", |
| 1235 | "url": "https://github.com/yiisoft/yii2-framework.git", | 1240 | "url": "https://github.com/yiisoft/yii2-framework.git", |
| 1236 | - "reference": "c47257db05de10b0924b1e47c855212b457c69a3" | 1241 | + "reference": "18c78d7d1c81cbb5722a8afb5940bc82eb45faab" |
| 1237 | }, | 1242 | }, |
| 1238 | "dist": { | 1243 | "dist": { |
| 1239 | "type": "zip", | 1244 | "type": "zip", |
| 1240 | - "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/c47257db05de10b0924b1e47c855212b457c69a3", | ||
| 1241 | - "reference": "c47257db05de10b0924b1e47c855212b457c69a3", | 1245 | + "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/18c78d7d1c81cbb5722a8afb5940bc82eb45faab", |
| 1246 | + "reference": "18c78d7d1c81cbb5722a8afb5940bc82eb45faab", | ||
| 1242 | "shasum": "" | 1247 | "shasum": "" |
| 1243 | }, | 1248 | }, |
| 1244 | "require": { | 1249 | "require": { |
| @@ -1319,7 +1324,7 @@ | @@ -1319,7 +1324,7 @@ | ||
| 1319 | "framework", | 1324 | "framework", |
| 1320 | "yii2" | 1325 | "yii2" |
| 1321 | ], | 1326 | ], |
| 1322 | - "time": "2016-02-21 17:08:31" | 1327 | + "time": "2016-03-23 07:31:27" |
| 1323 | }, | 1328 | }, |
| 1324 | { | 1329 | { |
| 1325 | "name": "yiisoft/yii2-bootstrap", | 1330 | "name": "yiisoft/yii2-bootstrap", |
| @@ -1327,12 +1332,12 @@ | @@ -1327,12 +1332,12 @@ | ||
| 1327 | "source": { | 1332 | "source": { |
| 1328 | "type": "git", | 1333 | "type": "git", |
| 1329 | "url": "https://github.com/yiisoft/yii2-bootstrap.git", | 1334 | "url": "https://github.com/yiisoft/yii2-bootstrap.git", |
| 1330 | - "reference": "ef941bc83ea63326e44769b922476dc1035ea551" | 1335 | + "reference": "e64170ffa5678be6cb8c3decf92feac8142aa523" |
| 1331 | }, | 1336 | }, |
| 1332 | "dist": { | 1337 | "dist": { |
| 1333 | "type": "zip", | 1338 | "type": "zip", |
| 1334 | - "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/ef941bc83ea63326e44769b922476dc1035ea551", | ||
| 1335 | - "reference": "ef941bc83ea63326e44769b922476dc1035ea551", | 1339 | + "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/e64170ffa5678be6cb8c3decf92feac8142aa523", |
| 1340 | + "reference": "e64170ffa5678be6cb8c3decf92feac8142aa523", | ||
| 1336 | "shasum": "" | 1341 | "shasum": "" |
| 1337 | }, | 1342 | }, |
| 1338 | "require": { | 1343 | "require": { |
| @@ -1369,7 +1374,7 @@ | @@ -1369,7 +1374,7 @@ | ||
| 1369 | "bootstrap", | 1374 | "bootstrap", |
| 1370 | "yii2" | 1375 | "yii2" |
| 1371 | ], | 1376 | ], |
| 1372 | - "time": "2016-01-24 17:03:09" | 1377 | + "time": "2016-03-21 19:11:20" |
| 1373 | }, | 1378 | }, |
| 1374 | { | 1379 | { |
| 1375 | "name": "yiisoft/yii2-composer", | 1380 | "name": "yiisoft/yii2-composer", |
| @@ -1377,12 +1382,12 @@ | @@ -1377,12 +1382,12 @@ | ||
| 1377 | "source": { | 1382 | "source": { |
| 1378 | "type": "git", | 1383 | "type": "git", |
| 1379 | "url": "https://github.com/yiisoft/yii2-composer.git", | 1384 | "url": "https://github.com/yiisoft/yii2-composer.git", |
| 1380 | - "reference": "d33d1046a5951f2f7823fe343f28ddc58b3421a4" | 1385 | + "reference": "348122de0b2c2e343b579f93fcda1da78cab4912" |
| 1381 | }, | 1386 | }, |
| 1382 | "dist": { | 1387 | "dist": { |
| 1383 | "type": "zip", | 1388 | "type": "zip", |
| 1384 | - "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/d33d1046a5951f2f7823fe343f28ddc58b3421a4", | ||
| 1385 | - "reference": "d33d1046a5951f2f7823fe343f28ddc58b3421a4", | 1389 | + "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/348122de0b2c2e343b579f93fcda1da78cab4912", |
| 1390 | + "reference": "348122de0b2c2e343b579f93fcda1da78cab4912", | ||
| 1386 | "shasum": "" | 1391 | "shasum": "" |
| 1387 | }, | 1392 | }, |
| 1388 | "require": { | 1393 | "require": { |
| @@ -1416,7 +1421,7 @@ | @@ -1416,7 +1421,7 @@ | ||
| 1416 | "extension installer", | 1421 | "extension installer", |
| 1417 | "yii2" | 1422 | "yii2" |
| 1418 | ], | 1423 | ], |
| 1419 | - "time": "2016-02-06 01:03:32" | 1424 | + "time": "2016-03-21 19:11:44" |
| 1420 | }, | 1425 | }, |
| 1421 | { | 1426 | { |
| 1422 | "name": "yiisoft/yii2-imagine", | 1427 | "name": "yiisoft/yii2-imagine", |
| @@ -1424,12 +1429,12 @@ | @@ -1424,12 +1429,12 @@ | ||
| 1424 | "source": { | 1429 | "source": { |
| 1425 | "type": "git", | 1430 | "type": "git", |
| 1426 | "url": "https://github.com/yiisoft/yii2-imagine.git", | 1431 | "url": "https://github.com/yiisoft/yii2-imagine.git", |
| 1427 | - "reference": "d87e6a0d1adfd6fa5ef49c18228b2fc9bca04299" | 1432 | + "reference": "a6c34ef6b69fb4670ba987ce4b9cfdb2131a8b99" |
| 1428 | }, | 1433 | }, |
| 1429 | "dist": { | 1434 | "dist": { |
| 1430 | "type": "zip", | 1435 | "type": "zip", |
| 1431 | - "url": "https://api.github.com/repos/yiisoft/yii2-imagine/zipball/d87e6a0d1adfd6fa5ef49c18228b2fc9bca04299", | ||
| 1432 | - "reference": "d87e6a0d1adfd6fa5ef49c18228b2fc9bca04299", | 1436 | + "url": "https://api.github.com/repos/yiisoft/yii2-imagine/zipball/a6c34ef6b69fb4670ba987ce4b9cfdb2131a8b99", |
| 1437 | + "reference": "a6c34ef6b69fb4670ba987ce4b9cfdb2131a8b99", | ||
| 1433 | "shasum": "" | 1438 | "shasum": "" |
| 1434 | }, | 1439 | }, |
| 1435 | "require": { | 1440 | "require": { |
| @@ -1464,7 +1469,7 @@ | @@ -1464,7 +1469,7 @@ | ||
| 1464 | "imagine", | 1469 | "imagine", |
| 1465 | "yii2" | 1470 | "yii2" |
| 1466 | ], | 1471 | ], |
| 1467 | - "time": "2016-02-21 23:09:41" | 1472 | + "time": "2016-03-21 19:13:31" |
| 1468 | }, | 1473 | }, |
| 1469 | { | 1474 | { |
| 1470 | "name": "yiisoft/yii2-jui", | 1475 | "name": "yiisoft/yii2-jui", |
| @@ -1472,12 +1477,12 @@ | @@ -1472,12 +1477,12 @@ | ||
| 1472 | "source": { | 1477 | "source": { |
| 1473 | "type": "git", | 1478 | "type": "git", |
| 1474 | "url": "https://github.com/yiisoft/yii2-jui.git", | 1479 | "url": "https://github.com/yiisoft/yii2-jui.git", |
| 1475 | - "reference": "1425ab29929dd195f468d3c4eb340ab509f28b83" | 1480 | + "reference": "226ffd897b26965a357e187cdf67f6c2e43e3139" |
| 1476 | }, | 1481 | }, |
| 1477 | "dist": { | 1482 | "dist": { |
| 1478 | "type": "zip", | 1483 | "type": "zip", |
| 1479 | - "url": "https://api.github.com/repos/yiisoft/yii2-jui/zipball/1425ab29929dd195f468d3c4eb340ab509f28b83", | ||
| 1480 | - "reference": "1425ab29929dd195f468d3c4eb340ab509f28b83", | 1484 | + "url": "https://api.github.com/repos/yiisoft/yii2-jui/zipball/226ffd897b26965a357e187cdf67f6c2e43e3139", |
| 1485 | + "reference": "226ffd897b26965a357e187cdf67f6c2e43e3139", | ||
| 1481 | "shasum": "" | 1486 | "shasum": "" |
| 1482 | }, | 1487 | }, |
| 1483 | "require": { | 1488 | "require": { |
| @@ -1514,7 +1519,7 @@ | @@ -1514,7 +1519,7 @@ | ||
| 1514 | "jQuery UI", | 1519 | "jQuery UI", |
| 1515 | "yii2" | 1520 | "yii2" |
| 1516 | ], | 1521 | ], |
| 1517 | - "time": "2015-12-24 06:23:53" | 1522 | + "time": "2016-03-21 19:14:08" |
| 1518 | }, | 1523 | }, |
| 1519 | { | 1524 | { |
| 1520 | "name": "yiisoft/yii2-swiftmailer", | 1525 | "name": "yiisoft/yii2-swiftmailer", |
| @@ -1522,12 +1527,12 @@ | @@ -1522,12 +1527,12 @@ | ||
| 1522 | "source": { | 1527 | "source": { |
| 1523 | "type": "git", | 1528 | "type": "git", |
| 1524 | "url": "https://github.com/yiisoft/yii2-swiftmailer.git", | 1529 | "url": "https://github.com/yiisoft/yii2-swiftmailer.git", |
| 1525 | - "reference": "2cca1bb86444a6438b0720f8c60120a400982366" | 1530 | + "reference": "20775fef1047cd927908270a8d7983580304eb57" |
| 1526 | }, | 1531 | }, |
| 1527 | "dist": { | 1532 | "dist": { |
| 1528 | "type": "zip", | 1533 | "type": "zip", |
| 1529 | - "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/2cca1bb86444a6438b0720f8c60120a400982366", | ||
| 1530 | - "reference": "2cca1bb86444a6438b0720f8c60120a400982366", | 1534 | + "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/20775fef1047cd927908270a8d7983580304eb57", |
| 1535 | + "reference": "20775fef1047cd927908270a8d7983580304eb57", | ||
| 1531 | "shasum": "" | 1536 | "shasum": "" |
| 1532 | }, | 1537 | }, |
| 1533 | "require": { | 1538 | "require": { |
| @@ -1564,7 +1569,7 @@ | @@ -1564,7 +1569,7 @@ | ||
| 1564 | "swiftmailer", | 1569 | "swiftmailer", |
| 1565 | "yii2" | 1570 | "yii2" |
| 1566 | ], | 1571 | ], |
| 1567 | - "time": "2015-12-07 11:40:31" | 1572 | + "time": "2016-03-21 19:16:09" |
| 1568 | } | 1573 | } |
| 1569 | ], | 1574 | ], |
| 1570 | "packages-dev": [ | 1575 | "packages-dev": [ |
| @@ -1601,12 +1606,12 @@ | @@ -1601,12 +1606,12 @@ | ||
| 1601 | "source": { | 1606 | "source": { |
| 1602 | "type": "git", | 1607 | "type": "git", |
| 1603 | "url": "https://github.com/fzaninotto/Faker.git", | 1608 | "url": "https://github.com/fzaninotto/Faker.git", |
| 1604 | - "reference": "2585edbef8b0e7a44c695217c35b16720203d8ee" | 1609 | + "reference": "bb09cf8982f89b50bb8bc6c0f9e451353ad17065" |
| 1605 | }, | 1610 | }, |
| 1606 | "dist": { | 1611 | "dist": { |
| 1607 | "type": "zip", | 1612 | "type": "zip", |
| 1608 | - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/2585edbef8b0e7a44c695217c35b16720203d8ee", | ||
| 1609 | - "reference": "2585edbef8b0e7a44c695217c35b16720203d8ee", | 1613 | + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/bb09cf8982f89b50bb8bc6c0f9e451353ad17065", |
| 1614 | + "reference": "bb09cf8982f89b50bb8bc6c0f9e451353ad17065", | ||
| 1610 | "shasum": "" | 1615 | "shasum": "" |
| 1611 | }, | 1616 | }, |
| 1612 | "require": { | 1617 | "require": { |
| @@ -1643,7 +1648,7 @@ | @@ -1643,7 +1648,7 @@ | ||
| 1643 | "faker", | 1648 | "faker", |
| 1644 | "fixtures" | 1649 | "fixtures" |
| 1645 | ], | 1650 | ], |
| 1646 | - "time": "2016-02-23 12:35:04" | 1651 | + "time": "2016-03-22 20:16:49" |
| 1647 | }, | 1652 | }, |
| 1648 | { | 1653 | { |
| 1649 | "name": "phpspec/php-diff", | 1654 | "name": "phpspec/php-diff", |
| @@ -1685,12 +1690,12 @@ | @@ -1685,12 +1690,12 @@ | ||
| 1685 | "source": { | 1690 | "source": { |
| 1686 | "type": "git", | 1691 | "type": "git", |
| 1687 | "url": "https://github.com/yiisoft/yii2-codeception.git", | 1692 | "url": "https://github.com/yiisoft/yii2-codeception.git", |
| 1688 | - "reference": "ee239c244fd011f11c8827f97ebe7600d03f1841" | 1693 | + "reference": "e01b3c46917b3f00c42f6a4aabf612cc36d792e6" |
| 1689 | }, | 1694 | }, |
| 1690 | "dist": { | 1695 | "dist": { |
| 1691 | "type": "zip", | 1696 | "type": "zip", |
| 1692 | - "url": "https://api.github.com/repos/yiisoft/yii2-codeception/zipball/ee239c244fd011f11c8827f97ebe7600d03f1841", | ||
| 1693 | - "reference": "ee239c244fd011f11c8827f97ebe7600d03f1841", | 1697 | + "url": "https://api.github.com/repos/yiisoft/yii2-codeception/zipball/e01b3c46917b3f00c42f6a4aabf612cc36d792e6", |
| 1698 | + "reference": "e01b3c46917b3f00c42f6a4aabf612cc36d792e6", | ||
| 1694 | "shasum": "" | 1699 | "shasum": "" |
| 1695 | }, | 1700 | }, |
| 1696 | "require": { | 1701 | "require": { |
| @@ -1722,7 +1727,7 @@ | @@ -1722,7 +1727,7 @@ | ||
| 1722 | "codeception", | 1727 | "codeception", |
| 1723 | "yii2" | 1728 | "yii2" |
| 1724 | ], | 1729 | ], |
| 1725 | - "time": "2015-11-20 08:52:21" | 1730 | + "time": "2016-03-21 19:11:26" |
| 1726 | }, | 1731 | }, |
| 1727 | { | 1732 | { |
| 1728 | "name": "yiisoft/yii2-debug", | 1733 | "name": "yiisoft/yii2-debug", |
| @@ -1730,12 +1735,12 @@ | @@ -1730,12 +1735,12 @@ | ||
| 1730 | "source": { | 1735 | "source": { |
| 1731 | "type": "git", | 1736 | "type": "git", |
| 1732 | "url": "https://github.com/yiisoft/yii2-debug.git", | 1737 | "url": "https://github.com/yiisoft/yii2-debug.git", |
| 1733 | - "reference": "e30ded9067f595b5e6d3536ec1365353b826b300" | 1738 | + "reference": "081795536b31d29106b0d1de0cb3aefa3e05e995" |
| 1734 | }, | 1739 | }, |
| 1735 | "dist": { | 1740 | "dist": { |
| 1736 | "type": "zip", | 1741 | "type": "zip", |
| 1737 | - "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/e30ded9067f595b5e6d3536ec1365353b826b300", | ||
| 1738 | - "reference": "e30ded9067f595b5e6d3536ec1365353b826b300", | 1742 | + "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/081795536b31d29106b0d1de0cb3aefa3e05e995", |
| 1743 | + "reference": "081795536b31d29106b0d1de0cb3aefa3e05e995", | ||
| 1739 | "shasum": "" | 1744 | "shasum": "" |
| 1740 | }, | 1745 | }, |
| 1741 | "require": { | 1746 | "require": { |
| @@ -1769,7 +1774,7 @@ | @@ -1769,7 +1774,7 @@ | ||
| 1769 | "debugger", | 1774 | "debugger", |
| 1770 | "yii2" | 1775 | "yii2" |
| 1771 | ], | 1776 | ], |
| 1772 | - "time": "2016-02-16 08:23:57" | 1777 | + "time": "2016-03-21 19:12:39" |
| 1773 | }, | 1778 | }, |
| 1774 | { | 1779 | { |
| 1775 | "name": "yiisoft/yii2-faker", | 1780 | "name": "yiisoft/yii2-faker", |
| @@ -1777,12 +1782,12 @@ | @@ -1777,12 +1782,12 @@ | ||
| 1777 | "source": { | 1782 | "source": { |
| 1778 | "type": "git", | 1783 | "type": "git", |
| 1779 | "url": "https://github.com/yiisoft/yii2-faker.git", | 1784 | "url": "https://github.com/yiisoft/yii2-faker.git", |
| 1780 | - "reference": "186c77214e0a4b75f10380b4e6e5f82788922cb7" | 1785 | + "reference": "a8daa97749e7154d91676405a1c59ed81e1ca999" |
| 1781 | }, | 1786 | }, |
| 1782 | "dist": { | 1787 | "dist": { |
| 1783 | "type": "zip", | 1788 | "type": "zip", |
| 1784 | - "url": "https://api.github.com/repos/yiisoft/yii2-faker/zipball/186c77214e0a4b75f10380b4e6e5f82788922cb7", | ||
| 1785 | - "reference": "186c77214e0a4b75f10380b4e6e5f82788922cb7", | 1789 | + "url": "https://api.github.com/repos/yiisoft/yii2-faker/zipball/a8daa97749e7154d91676405a1c59ed81e1ca999", |
| 1790 | + "reference": "a8daa97749e7154d91676405a1c59ed81e1ca999", | ||
| 1786 | "shasum": "" | 1791 | "shasum": "" |
| 1787 | }, | 1792 | }, |
| 1788 | "require": { | 1793 | "require": { |
| @@ -1816,7 +1821,7 @@ | @@ -1816,7 +1821,7 @@ | ||
| 1816 | "faker", | 1821 | "faker", |
| 1817 | "yii2" | 1822 | "yii2" |
| 1818 | ], | 1823 | ], |
| 1819 | - "time": "2015-12-18 01:52:12" | 1824 | + "time": "2016-03-21 19:13:03" |
| 1820 | }, | 1825 | }, |
| 1821 | { | 1826 | { |
| 1822 | "name": "yiisoft/yii2-gii", | 1827 | "name": "yiisoft/yii2-gii", |
| @@ -1824,12 +1829,12 @@ | @@ -1824,12 +1829,12 @@ | ||
| 1824 | "source": { | 1829 | "source": { |
| 1825 | "type": "git", | 1830 | "type": "git", |
| 1826 | "url": "https://github.com/yiisoft/yii2-gii.git", | 1831 | "url": "https://github.com/yiisoft/yii2-gii.git", |
| 1827 | - "reference": "ce42838abcbef076ebaf46147671d518ae69d028" | 1832 | + "reference": "989d6c52c92e51f0d562729c329ee1012191cba2" |
| 1828 | }, | 1833 | }, |
| 1829 | "dist": { | 1834 | "dist": { |
| 1830 | "type": "zip", | 1835 | "type": "zip", |
| 1831 | - "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/ce42838abcbef076ebaf46147671d518ae69d028", | ||
| 1832 | - "reference": "ce42838abcbef076ebaf46147671d518ae69d028", | 1836 | + "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/989d6c52c92e51f0d562729c329ee1012191cba2", |
| 1837 | + "reference": "989d6c52c92e51f0d562729c329ee1012191cba2", | ||
| 1833 | "shasum": "" | 1838 | "shasum": "" |
| 1834 | }, | 1839 | }, |
| 1835 | "require": { | 1840 | "require": { |
| @@ -1869,7 +1874,7 @@ | @@ -1869,7 +1874,7 @@ | ||
| 1869 | "gii", | 1874 | "gii", |
| 1870 | "yii2" | 1875 | "yii2" |
| 1871 | ], | 1876 | ], |
| 1872 | - "time": "2016-02-21 20:39:29" | 1877 | + "time": "2016-03-21 19:13:26" |
| 1873 | } | 1878 | } |
| 1874 | ], | 1879 | ], |
| 1875 | "aliases": [], | 1880 | "aliases": [], |
frontend/controllers/CompanyController.php
| @@ -87,7 +87,9 @@ | @@ -87,7 +87,9 @@ | ||
| 87 | ]); | 87 | ]); |
| 88 | 88 | ||
| 89 | $commentProvider = new ActiveDataProvider([ | 89 | $commentProvider = new ActiveDataProvider([ |
| 90 | - 'query' => $company->getComments(), | 90 | + 'query' => $company->getComments() |
| 91 | + ->with('rating') | ||
| 92 | + ->with('author'), | ||
| 91 | 'sort' => new Sort([ | 93 | 'sort' => new Sort([ |
| 92 | 'defaultOrder' => [ | 94 | 'defaultOrder' => [ |
| 93 | 'date_add' => SORT_DESC, | 95 | 'date_add' => SORT_DESC, |
| 1 | +<?php | ||
| 2 | + /** | ||
| 3 | + * @var Blog $model | ||
| 4 | + */ | ||
| 5 | + use common\models\Blog; | ||
| 6 | + use yii\helpers\Html; | ||
| 7 | + | ||
| 8 | +?> | ||
| 9 | +<?php | ||
| 10 | + echo Html::a(Html::img($model->cover), [ | ||
| 11 | + 'company/blog-view', | ||
| 12 | + 'company_id' => $model->user_id, | ||
| 13 | + 'link' => $model->link, | ||
| 14 | + ]); | ||
| 15 | +?> | ||
| 16 | +<div class="min-post-txt"> | ||
| 17 | + <div class="blog-post-icons-wr style"> | ||
| 18 | + <div class="blog-post-date"> | ||
| 19 | + <span></span> | ||
| 20 | + <p><?= \Yii::$app->formatter->asDate($model->date_add, 'php:d.m.Y') ?></p> | ||
| 21 | + </div> | ||
| 22 | + <div class="blog-post-views"> | ||
| 23 | + <span></span> | ||
| 24 | + <p><?= $model->view_count ?></p> | ||
| 25 | + </div> | ||
| 26 | + <div class="blog-post-comm-num"> | ||
| 27 | + <span></span> | ||
| 28 | + <p><?= count($model->comments) ?></p> | ||
| 29 | + </div> | ||
| 30 | + </div> | ||
| 31 | + <?= Html::a($model->name, [ | ||
| 32 | + 'company/blog-view', | ||
| 33 | + 'company_id' => $model->user_id, | ||
| 34 | + 'link' => $model->link, | ||
| 35 | + ]) ?> | ||
| 36 | +</div> | ||
| 0 | \ No newline at end of file | 37 | \ No newline at end of file |
frontend/views/company/_company_common_review.php
| 1 | <?php | 1 | <?php |
| 2 | /** | 2 | /** |
| 3 | - * @var Blog $model | 3 | + * @var Comment $model |
| 4 | */ | 4 | */ |
| 5 | - use common\models\Blog; | ||
| 6 | - use yii\helpers\Html; | 5 | + use common\modules\comment\models\Comment; |
| 7 | 6 | ||
| 8 | ?> | 7 | ?> |
| 9 | <?php | 8 | <?php |
| 10 | - echo Html::a(Html::img($model->cover), [ | ||
| 11 | - 'company/blog-view', | ||
| 12 | - 'company_id' => $model->user_id, | ||
| 13 | - 'link' => $model->link, | ||
| 14 | - ]); | ||
| 15 | -?> | ||
| 16 | -<div class="min-post-txt"> | ||
| 17 | - <div class="blog-post-icons-wr style"> | ||
| 18 | - <div class="blog-post-date"> | ||
| 19 | - <span></span> | ||
| 20 | - <p><?= \Yii::$app->formatter->asDate($model->date_add, 'php:d.m.Y') ?></p> | ||
| 21 | - </div> | ||
| 22 | - <div class="blog-post-views"> | ||
| 23 | - <span></span> | ||
| 24 | - <p><?= $model->view_count ?></p> | 9 | + if(!empty( $model->rating )) { |
| 10 | + ?> | ||
| 11 | + <div class="rating"> | ||
| 12 | + <!--оценка--> | ||
| 13 | + <input type="hidden" class="val" value="<?=$model->rating->value?>" /> | ||
| 14 | + <!--количество голосов--> | ||
| 15 | + <input type="hidden" class="votes" value="1"/> | ||
| 25 | </div> | 16 | </div> |
| 26 | - <div class="blog-post-comm-num"> | ||
| 27 | - <span></span> | ||
| 28 | - <p><?= count($model->comments) ?></p> | ||
| 29 | - </div> | ||
| 30 | - </div> | ||
| 31 | - <?= Html::a($model->name, [ | ||
| 32 | - 'company/blog-view', | ||
| 33 | - 'company_id' => $model->user_id, | ||
| 34 | - 'link' => $model->link, | ||
| 35 | - ]) ?> | ||
| 36 | -</div> | ||
| 37 | \ No newline at end of file | 17 | \ No newline at end of file |
| 18 | + <?php | ||
| 19 | + } | ||
| 20 | +?> | ||
| 21 | +<div class="company-performer-comments-autor"> | ||
| 22 | + Отзыв от: | ||
| 23 | + <?php | ||
| 24 | + if(!empty( $model->author )) { | ||
| 25 | + echo $model->author->name; | ||
| 26 | + } else { | ||
| 27 | + echo $model->user_name; | ||
| 28 | + } | ||
| 29 | + ?> | ||
| 30 | +</div> | ||
| 31 | +<div class="company-performer-comments-txt"><?= $model->text ?></div> | ||
| 32 | +<a href="#" class="company-comm-see-all"><span>Развернуть</span></a> | ||
| 38 | \ No newline at end of file | 33 | \ No newline at end of file |
frontend/views/company/common.php
| 1 | <?php | 1 | <?php |
| 2 | /** | 2 | /** |
| 3 | - * @var View $this | ||
| 4 | - * @var User $company | 3 | + * @var View $this |
| 4 | + * @var User $company | ||
| 5 | * @var ActiveDataProvider $projectProvider | 5 | * @var ActiveDataProvider $projectProvider |
| 6 | * @var ActiveDataProvider $blogProvider | 6 | * @var ActiveDataProvider $blogProvider |
| 7 | * @var ActiveDataProvider $commentProvider | 7 | * @var ActiveDataProvider $commentProvider |
| @@ -9,6 +9,7 @@ | @@ -9,6 +9,7 @@ | ||
| 9 | use common\models\User; | 9 | use common\models\User; |
| 10 | use yii\data\ActiveDataProvider; | 10 | use yii\data\ActiveDataProvider; |
| 11 | use yii\helpers\ArrayHelper; | 11 | use yii\helpers\ArrayHelper; |
| 12 | + use yii\helpers\Html; | ||
| 12 | use yii\web\View; | 13 | use yii\web\View; |
| 13 | use yii\widgets\ListView; | 14 | use yii\widgets\ListView; |
| 14 | 15 | ||
| @@ -220,17 +221,17 @@ | @@ -220,17 +221,17 @@ | ||
| 220 | <div class="box-wr"> | 221 | <div class="box-wr"> |
| 221 | <div class="box-all"> | 222 | <div class="box-all"> |
| 222 | <?php | 223 | <?php |
| 223 | - echo ListView::widget([ | ||
| 224 | - 'dataProvider' => $blogProvider, | ||
| 225 | - 'options' => [ | ||
| 226 | - 'class' => 'min-post-wr', | ||
| 227 | - ], | ||
| 228 | - 'itemView' => '_company_common_review', | ||
| 229 | - 'itemOptions' => [ | ||
| 230 | - 'class' => 'min-post-block', | ||
| 231 | - ], | ||
| 232 | - 'layout' => '{items}', | ||
| 233 | - ]); | 224 | + echo ListView::widget([ |
| 225 | + 'dataProvider' => $blogProvider, | ||
| 226 | + 'options' => [ | ||
| 227 | + 'class' => 'min-post-wr', | ||
| 228 | + ], | ||
| 229 | + 'itemView' => '_company_common_blog', | ||
| 230 | + 'itemOptions' => [ | ||
| 231 | + 'class' => 'min-post-block', | ||
| 232 | + ], | ||
| 233 | + 'layout' => '{items}', | ||
| 234 | + ]); | ||
| 234 | ?> | 235 | ?> |
| 235 | </div> | 236 | </div> |
| 236 | </div> | 237 | </div> |
| @@ -241,267 +242,120 @@ | @@ -241,267 +242,120 @@ | ||
| 241 | /* | 242 | /* |
| 242 | * User preloaded $company->teams models | 243 | * User preloaded $company->teams models |
| 243 | */ | 244 | */ |
| 244 | - $teams = ArrayHelper::index($company->teams, 'department.name'); // Group team members according to their department | 245 | + $teams = ArrayHelper::index($company->teams, 'team_id', 'department.name'); // Group team members according to their department |
| 245 | ?> | 246 | ?> |
| 246 | <div class="section-box-233"> | 247 | <div class="section-box-233"> |
| 247 | <div class="box-wr"> | 248 | <div class="box-wr"> |
| 248 | <div class="box-all"> | 249 | <div class="box-all"> |
| 249 | <div class="table-team-title style">Состав команды</div> | 250 | <div class="table-team-title style">Состав команды</div> |
| 250 | <div class="table-team-wr style"> | 251 | <div class="table-team-wr style"> |
| 251 | - <?php | ||
| 252 | - /** | ||
| 253 | - * @todo BEGIN HERE | ||
| 254 | - */ | ||
| 255 | - for($i = 0; $i < count($teams); $i = $i+2) { | ||
| 256 | - var_dump(array_keys($teams)[$i]); | ||
| 257 | - } | ||
| 258 | - ?> | ||
| 259 | <div class="table-team-left"> | 252 | <div class="table-team-left"> |
| 260 | - <div class="tb-team-wr"> | ||
| 261 | - <table class="title-table" cellspacing="0" cellpadding="0" border="0"> | ||
| 262 | - <tr> | ||
| 263 | - <td width="337">Административный</td> | ||
| 264 | - <td align="center">(26 лет)</td> | ||
| 265 | - </tr> | ||
| 266 | - </table> | ||
| 267 | - | ||
| 268 | - <table class="all-table-first" cellspacing="0" cellpadding="0" border="0"> | ||
| 269 | - <tr> | ||
| 270 | - <td align="center" width="32"></td> | ||
| 271 | - <td align="center" width="323">Ф.И.О.</td> | ||
| 272 | - <td align="center" width="91">Опыт, лет</td> | ||
| 273 | - </tr> | ||
| 274 | - </table> | ||
| 275 | - | ||
| 276 | - <table class="all-table" cellspacing="0" cellpadding="0" border="0"> | ||
| 277 | - <tr> | ||
| 278 | - <td align="center" width="32"> | ||
| 279 | - <img src="/images/portfolio-project/flag-img-1.jpg" alt=""/> | ||
| 280 | - </td> | ||
| 281 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 282 | - <td align="center" width="91">22</td> | ||
| 283 | - </tr> | ||
| 284 | - | ||
| 285 | - <tr> | ||
| 286 | - <td align="center" width="32"> | ||
| 287 | - <img src="/images/portfolio-project/flag-img-2.jpg" alt=""/> | ||
| 288 | - </td> | ||
| 289 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 290 | - <td align="center" width="91">1</td> | ||
| 291 | - </tr> | ||
| 292 | - | ||
| 293 | - <tr> | ||
| 294 | - <td align="center" width="32"> | ||
| 295 | - <img src="/images/portfolio-project/flag-img-3.jpg" alt=""/> | ||
| 296 | - </td> | ||
| 297 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 298 | - <td align="center" width="91">3</td> | ||
| 299 | - </tr> | ||
| 300 | - </table> | ||
| 301 | - </div> | ||
| 302 | - <div class="tb-team-wr"> | ||
| 303 | - <table class="title-table" cellspacing="0" cellpadding="0" border="0"> | ||
| 304 | - <tr> | ||
| 305 | - <td width="337">Административный</td> | ||
| 306 | - <td align="center">(26 лет)</td> | ||
| 307 | - </tr> | ||
| 308 | - </table> | ||
| 309 | - | ||
| 310 | - <table class="all-table-first" cellspacing="0" cellpadding="0" border="0"> | ||
| 311 | - <tr> | ||
| 312 | - <td align="center" width="32"></td> | ||
| 313 | - <td align="center" width="323">Ф.И.О.</td> | ||
| 314 | - <td align="center" width="91">Опыт, лет</td> | ||
| 315 | - </tr> | ||
| 316 | - </table> | ||
| 317 | - | ||
| 318 | - <table class="all-table" cellspacing="0" cellpadding="0" border="0"> | ||
| 319 | - <tr> | ||
| 320 | - <td align="center" width="32"> | ||
| 321 | - <img src="/images/portfolio-project/flag-img-1.jpg" alt=""/> | ||
| 322 | - </td> | ||
| 323 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 324 | - <td align="center" width="91">22</td> | ||
| 325 | - </tr> | ||
| 326 | - | ||
| 327 | - <tr> | ||
| 328 | - <td align="center" width="32"> | ||
| 329 | - <img src="/images/portfolio-project/flag-img-2.jpg" alt=""/> | ||
| 330 | - </td> | ||
| 331 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 332 | - <td align="center" width="91">1</td> | ||
| 333 | - </tr> | ||
| 334 | - | ||
| 335 | - <tr> | ||
| 336 | - <td align="center" width="32"> | ||
| 337 | - <img src="/images/portfolio-project/flag-img-3.jpg" alt=""/> | ||
| 338 | - </td> | ||
| 339 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 340 | - <td align="center" width="91">3</td> | ||
| 341 | - </tr> | ||
| 342 | - | ||
| 343 | - <tr> | ||
| 344 | - <td align="center" width="32"> | ||
| 345 | - <img src="/images/portfolio-project/flag-img-1.jpg" alt=""/> | ||
| 346 | - </td> | ||
| 347 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 348 | - <td align="center" width="91">10</td> | ||
| 349 | - </tr> | ||
| 350 | - | ||
| 351 | - <tr> | ||
| 352 | - <td align="center" width="32"> | ||
| 353 | - <img src="/images/portfolio-project/flag-img-2.jpg" alt=""/> | ||
| 354 | - </td> | ||
| 355 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 356 | - <td align="center" width="91">1</td> | ||
| 357 | - </tr> | ||
| 358 | - </table> | ||
| 359 | - </div> | ||
| 360 | - <div class="tb-team-wr"> | ||
| 361 | - <table class="title-table" cellspacing="0" cellpadding="0" border="0"> | ||
| 362 | - <tr> | ||
| 363 | - <td width="337">Административный</td> | ||
| 364 | - <td align="center">(26 лет)</td> | ||
| 365 | - </tr> | ||
| 366 | - </table> | ||
| 367 | - | ||
| 368 | - <table class="all-table-first" cellspacing="0" cellpadding="0" border="0"> | ||
| 369 | - <tr> | ||
| 370 | - <td align="center" width="32"></td> | ||
| 371 | - <td align="center" width="323">Ф.И.О.</td> | ||
| 372 | - <td align="center" width="91">Опыт, лет</td> | ||
| 373 | - </tr> | ||
| 374 | - </table> | ||
| 375 | - | ||
| 376 | - <table class="all-table" cellspacing="0" cellpadding="0" border="0"> | ||
| 377 | - <tr> | ||
| 378 | - <td align="center" width="32"> | ||
| 379 | - <img src="/images/portfolio-project/flag-img-1.jpg" alt=""/> | ||
| 380 | - </td> | ||
| 381 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 382 | - <td align="center" width="91">22</td> | ||
| 383 | - </tr> | ||
| 384 | - | ||
| 385 | - <tr> | ||
| 386 | - <td align="center" width="32"> | ||
| 387 | - <img src="/images/portfolio-project/flag-img-2.jpg" alt=""/> | ||
| 388 | - </td> | ||
| 389 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 390 | - <td align="center" width="91">1</td> | ||
| 391 | - </tr> | ||
| 392 | - | ||
| 393 | - <tr> | ||
| 394 | - <td align="center" width="32"> | ||
| 395 | - <img src="/images/portfolio-project/flag-img-3.jpg" alt=""/> | ||
| 396 | - </td> | ||
| 397 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 398 | - <td align="center" width="91">3</td> | ||
| 399 | - </tr> | ||
| 400 | - </table> | ||
| 401 | - </div> | 253 | + <?php |
| 254 | + for($i = 0; $i < count($teams); $i = $i + 2) { | ||
| 255 | + ?> | ||
| 256 | + <div class="tb-team-wr"> | ||
| 257 | + <table class="title-table" cellspacing="0" cellpadding="0" border="0"> | ||
| 258 | + <tr> | ||
| 259 | + <td width="337"> | ||
| 260 | + <?php | ||
| 261 | + if(!empty( array_keys($teams)[ $i ] )) { | ||
| 262 | + echo array_keys($teams)[ $i ]; | ||
| 263 | + } else { | ||
| 264 | + echo 'Не определен'; | ||
| 265 | + } | ||
| 266 | + ?> | ||
| 267 | + </td> | ||
| 268 | + <td align="center"></td> | ||
| 269 | + </tr> | ||
| 270 | + </table> | ||
| 271 | + <table class="all-table-first" cellspacing="0" cellpadding="0" border="0"> | ||
| 272 | + <tr> | ||
| 273 | + <td align="center" width="32"></td> | ||
| 274 | + <td align="center" width="323">Ф.И.О.</td> | ||
| 275 | + <td align="center" width="91">Опыт, лет</td> | ||
| 276 | + </tr> | ||
| 277 | + </table> | ||
| 278 | + <table class="all-table" cellspacing="0" cellpadding="0" border="0"> | ||
| 279 | + <?php | ||
| 280 | + foreach($teams[ array_keys($teams)[ $i ] ] as $team) { | ||
| 281 | + ?> | ||
| 282 | + <tr> | ||
| 283 | + <td align="center" width="32"> | ||
| 284 | + <?= Html::img('/images/portfolio-project/flag-img-1.jpg') ?> | ||
| 285 | + </td> | ||
| 286 | + <td align="center" width="323"><?= $team->lastname . ' ' . $team->firstname ?></td> | ||
| 287 | + <td align="center" width="91"> | ||
| 288 | + <?php | ||
| 289 | + if(!empty( $team->experience_from )) { | ||
| 290 | + echo date('Y') - $team->experience_from; | ||
| 291 | + } else { | ||
| 292 | + echo 'Не указан'; | ||
| 293 | + } | ||
| 294 | + ?> | ||
| 295 | + </td> | ||
| 296 | + </tr> | ||
| 297 | + <?php | ||
| 298 | + } | ||
| 299 | + ?> | ||
| 300 | + </table> | ||
| 301 | + </div> | ||
| 302 | + <?php | ||
| 303 | + } | ||
| 304 | + ?> | ||
| 402 | </div> | 305 | </div> |
| 403 | <div class="table-team-right"> | 306 | <div class="table-team-right"> |
| 404 | - <div class="tb-team-wr"> | ||
| 405 | - <table class="title-table" cellspacing="0" cellpadding="0" border="0"> | ||
| 406 | - <tr> | ||
| 407 | - <td width="337">Административный</td> | ||
| 408 | - <td align="center">(26 лет)</td> | ||
| 409 | - </tr> | ||
| 410 | - </table> | ||
| 411 | - | ||
| 412 | - <table class="all-table-first" cellspacing="0" cellpadding="0" border="0"> | ||
| 413 | - <tr> | ||
| 414 | - <td align="center" width="32"></td> | ||
| 415 | - <td align="center" width="323">Ф.И.О.</td> | ||
| 416 | - <td align="center" width="91">Опыт, лет</td> | ||
| 417 | - </tr> | ||
| 418 | - </table> | ||
| 419 | - | ||
| 420 | - <table class="all-table" cellspacing="0" cellpadding="0" border="0"> | ||
| 421 | - <tr> | ||
| 422 | - <td align="center" width="32"> | ||
| 423 | - <img src="/images/portfolio-project/flag-img-1.jpg" alt=""/> | ||
| 424 | - </td> | ||
| 425 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 426 | - <td align="center" width="91">22</td> | ||
| 427 | - </tr> | ||
| 428 | - | ||
| 429 | - <tr> | ||
| 430 | - <td align="center" width="32"> | ||
| 431 | - <img src="/images/portfolio-project/flag-img-2.jpg" alt=""/> | ||
| 432 | - </td> | ||
| 433 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 434 | - <td align="center" width="91">1</td> | ||
| 435 | - </tr> | ||
| 436 | - | ||
| 437 | - <tr> | ||
| 438 | - <td align="center" width="32"> | ||
| 439 | - <img src="/images/portfolio-project/flag-img-3.jpg" alt=""/> | ||
| 440 | - </td> | ||
| 441 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 442 | - <td align="center" width="91">3</td> | ||
| 443 | - </tr> | ||
| 444 | - | ||
| 445 | - <tr> | ||
| 446 | - <td align="center" width="32"> | ||
| 447 | - <img src="/images/portfolio-project/flag-img-3.jpg" alt=""/> | ||
| 448 | - </td> | ||
| 449 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 450 | - <td align="center" width="91">3</td> | ||
| 451 | - </tr> | ||
| 452 | - </table> | ||
| 453 | - </div> | ||
| 454 | - | ||
| 455 | - <div class="tb-team-wr"> | ||
| 456 | - <table class="title-table" cellspacing="0" cellpadding="0" border="0"> | ||
| 457 | - <tr> | ||
| 458 | - <td width="337">Административный</td> | ||
| 459 | - <td align="center">(26 лет)</td> | ||
| 460 | - </tr> | ||
| 461 | - </table> | ||
| 462 | - | ||
| 463 | - <table class="all-table-first" cellspacing="0" cellpadding="0" border="0"> | ||
| 464 | - <tr> | ||
| 465 | - <td align="center" width="32"></td> | ||
| 466 | - <td align="center" width="323">Ф.И.О.</td> | ||
| 467 | - <td align="center" width="91">Опыт, лет</td> | ||
| 468 | - </tr> | ||
| 469 | - </table> | ||
| 470 | - | ||
| 471 | - <table class="all-table" cellspacing="0" cellpadding="0" border="0"> | ||
| 472 | - <tr> | ||
| 473 | - <td align="center" width="32"> | ||
| 474 | - <img src="/images/portfolio-project/flag-img-1.jpg" alt=""/> | ||
| 475 | - </td> | ||
| 476 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 477 | - <td align="center" width="91">22</td> | ||
| 478 | - </tr> | ||
| 479 | - | ||
| 480 | - <tr> | ||
| 481 | - <td align="center" width="32"> | ||
| 482 | - <img src="/images/portfolio-project/flag-img-2.jpg" alt=""/> | ||
| 483 | - </td> | ||
| 484 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 485 | - <td align="center" width="91">1</td> | ||
| 486 | - </tr> | ||
| 487 | - | ||
| 488 | - <tr> | ||
| 489 | - <td align="center" width="32"> | ||
| 490 | - <img src="/images/portfolio-project/flag-img-3.jpg" alt=""/> | ||
| 491 | - </td> | ||
| 492 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 493 | - <td align="center" width="91">3</td> | ||
| 494 | - </tr> | ||
| 495 | - | ||
| 496 | - <tr> | ||
| 497 | - <td align="center" width="32"> | ||
| 498 | - <img src="/images/portfolio-project/flag-img-3.jpg" alt=""/> | ||
| 499 | - </td> | ||
| 500 | - <td align="center" width="323">Петриченко Дмитрий Николаевич</td> | ||
| 501 | - <td align="center" width="91">3</td> | ||
| 502 | - </tr> | ||
| 503 | - </table> | ||
| 504 | - </div> | 307 | + <?php |
| 308 | + for($i = 1; $i < count($teams); $i = $i + 2) { | ||
| 309 | + ?> | ||
| 310 | + <div class="tb-team-wr"> | ||
| 311 | + <table class="title-table" cellspacing="0" cellpadding="0" border="0"> | ||
| 312 | + <tr> | ||
| 313 | + <td width="337"> | ||
| 314 | + <?php | ||
| 315 | + if(!empty( array_keys($teams)[ $i ] )) { | ||
| 316 | + echo array_keys($teams)[ $i ]; | ||
| 317 | + } else { | ||
| 318 | + echo 'Не определен'; | ||
| 319 | + } | ||
| 320 | + ?> | ||
| 321 | + </td> | ||
| 322 | + <td align="center"></td> | ||
| 323 | + </tr> | ||
| 324 | + </table> | ||
| 325 | + <table class="all-table-first" cellspacing="0" cellpadding="0" border="0"> | ||
| 326 | + <tr> | ||
| 327 | + <td align="center" width="32"></td> | ||
| 328 | + <td align="center" width="323">Ф.И.О.</td> | ||
| 329 | + <td align="center" width="91">Опыт, лет</td> | ||
| 330 | + </tr> | ||
| 331 | + </table> | ||
| 332 | + <table class="all-table" cellspacing="0" cellpadding="0" border="0"> | ||
| 333 | + <?php | ||
| 334 | + foreach($teams[ array_keys($teams)[ $i ] ] as $team) { | ||
| 335 | + ?> | ||
| 336 | + <tr> | ||
| 337 | + <td align="center" width="32"> | ||
| 338 | + <?= Html::img('/images/portfolio-project/flag-img-1.jpg') ?> | ||
| 339 | + </td> | ||
| 340 | + <td align="center" width="323"><?= $team->lastname . ' ' . $team->firstname ?></td> | ||
| 341 | + <td align="center" width="91"> | ||
| 342 | + <?php | ||
| 343 | + if(!empty( $team->experience_from )) { | ||
| 344 | + echo date('Y') - $team->experience_from; | ||
| 345 | + } else { | ||
| 346 | + echo 'Не указан'; | ||
| 347 | + } | ||
| 348 | + ?> | ||
| 349 | + </td> | ||
| 350 | + </tr> | ||
| 351 | + <?php | ||
| 352 | + } | ||
| 353 | + ?> | ||
| 354 | + </table> | ||
| 355 | + </div> | ||
| 356 | + <?php | ||
| 357 | + } | ||
| 358 | + ?> | ||
| 505 | </div> | 359 | </div> |
| 506 | </div> | 360 | </div> |
| 507 | </div> | 361 | </div> |
| @@ -514,64 +368,26 @@ | @@ -514,64 +368,26 @@ | ||
| 514 | <div class="section-box-19"> | 368 | <div class="section-box-19"> |
| 515 | <div class="box-wr"> | 369 | <div class="box-wr"> |
| 516 | <div class="box-all"> | 370 | <div class="box-all"> |
| 517 | - <div class="company-performer-comm-title style">Отзывов: 54</div> | ||
| 518 | - <div class="company-performer-comments-wr style"> | ||
| 519 | - <div class="company-performer-comments-bl"> | ||
| 520 | - <div class="rating"> | ||
| 521 | - <!--оценка--> | ||
| 522 | - <input type="hidden" class="val" value="3"/> | ||
| 523 | - <!--количество голосов--> | ||
| 524 | - <input type="hidden" class="votes" value="12"/> | ||
| 525 | - </div> | ||
| 526 | - | ||
| 527 | - <div class="company-performer-comments-autor">Отзыв от: Евгения</div> | ||
| 528 | - <div class="company-performer-comments-txt"></div> | ||
| 529 | - <a href="#" class="company-comm-see-all"><span>Развернуть</span></a> | ||
| 530 | - </div> | ||
| 531 | - | ||
| 532 | - <div class="company-performer-comments-bl"> | ||
| 533 | - <div class="rating"> | ||
| 534 | - <!--оценка--> | ||
| 535 | - <input type="hidden" class="val" value="2"/> | ||
| 536 | - <!--количество голосов--> | ||
| 537 | - <input type="hidden" class="votes" value="12"/> | ||
| 538 | - </div> | ||
| 539 | - | ||
| 540 | - <div class="company-performer-comments-autor">Отзыв от: Евгения</div> | ||
| 541 | - <div class="company-performer-comments-txt">2Петер, очень понравились Ваши работы. Замечательный вкус!!! Тонкое сочетание стиля, цвета и формы! Очень нравится. Успехов в работе и вдохновения.</div> | ||
| 542 | - <a href="#" class="company-comm-see-all"><span>Развернуть</span></a> | ||
| 543 | - </div> | ||
| 544 | - | ||
| 545 | - <div class="company-performer-comments-bl"> | ||
| 546 | - <div class="rating"> | ||
| 547 | - <!--оценка--> | ||
| 548 | - <input type="hidden" class="val" value="4"/> | ||
| 549 | - <!--количество голосов--> | ||
| 550 | - <input type="hidden" class="votes" value="12"/> | ||
| 551 | - </div> | ||
| 552 | - | ||
| 553 | - <div class="company-performer-comments-autor">Отзыв от: Евгения</div> | ||
| 554 | - <div class="company-performer-comments-txt">3Петер, очень понравились Ваши работы. Замечательный вкус!!! Тонкое сочетание стиля, цвета и формы! Очень нравится. Успехов в работе и вдохновения. Петер, очень понравились Ваши работы. Замечательный вкус!!! Тонкое сочетание стиля, цвета и формы! Очень нравится. Успехов в работе и вдохновения. | ||
| 555 | - </div> | ||
| 556 | - <a href="#" class="company-comm-see-all"><span>Развернуть</span></a> | ||
| 557 | - </div> | ||
| 558 | - | ||
| 559 | - <div class="company-performer-comments-bl"> | ||
| 560 | - <div class="rating"> | ||
| 561 | - <!--оценка--> | ||
| 562 | - <input type="hidden" class="val" value="5"/> | ||
| 563 | - <!--количество голосов--> | ||
| 564 | - <input type="hidden" class="votes" value="12"/> | ||
| 565 | - </div> | ||
| 566 | - | ||
| 567 | - <div class="company-performer-comments-autor">Отзыв от: Евгения</div> | ||
| 568 | - <div class="company-performer-comments-txt">4Петер, очень понравились Ваши работы. Замечательный вкус!!! Тонкое сочетание стиля, цвета и формы! Очень нравится. Успехов в работе и вдохновения. | ||
| 569 | - </div> | ||
| 570 | - <a href="#" class="company-comm-see-all"><span>Развернуть</span></a> | ||
| 571 | - </div> | ||
| 572 | - </div> | 371 | + <div class="company-performer-comm-title style">Отзывов: <?= $commentProvider->totalCount ?></div> |
| 372 | + <?php | ||
| 373 | + echo ListView::widget([ | ||
| 374 | + 'dataProvider' => $commentProvider, | ||
| 375 | + 'options' => [ | ||
| 376 | + 'class' => 'company-performer-comments-wr style', | ||
| 377 | + ], | ||
| 378 | + 'itemView' => '_company_common_review', | ||
| 379 | + 'itemOptions' => [ | ||
| 380 | + 'class' => 'company-performer-comments-bl', | ||
| 381 | + ], | ||
| 382 | + 'layout' => '{items}', | ||
| 383 | + ]); | ||
| 384 | + ?> | ||
| 573 | <div class="company-performer-comm-see-all-butt style"> | 385 | <div class="company-performer-comm-see-all-butt style"> |
| 574 | - <a href="#">Читать все отзывы</a></div> | 386 | + <?= Html::a('Читать все отзывы', [ |
| 387 | + 'company/review', | ||
| 388 | + 'company_id' => $company->id, | ||
| 389 | + ]) ?> | ||
| 390 | + </div> | ||
| 575 | </div> | 391 | </div> |
| 576 | </div> | 392 | </div> |
| 577 | </div> | 393 | </div> |