Administrator / test_3

Commit 522469800613383f675f78823dd8da195e94e239

Authored by Eugeny Galkovskiy
2 parents e0d13b71 a1e44ddb

Merge remote-tracking branch 'origin/master'

Showing 35 changed files with 560 additions and 264 deletions   Show diff stats
Inline Side-by-side
backend/config/main.php
  Show/Hide comments   View file @5224698
@@ -13,7 +13,14 @@ return [ @@ -13,7 +13,14 @@ return [
13 'id' => 'app-backend', 13 'id' => 'app-backend',
14 'basePath' => dirname(__DIR__), 14 'basePath' => dirname(__DIR__),
15 'controllerNamespace' => 'backend\controllers', 15 'controllerNamespace' => 'backend\controllers',
16 - 'bootstrap' => ['log'], 16 + 'bootstrap' => [
  17 + 'log',
  18 + function() {
  19 + if(!\Yii::$app->user->can('viewAdmin')) {
  20 + return \Yii::$app->response->redirect('/');
  21 + }
  22 + }
  23 + ],
17 'modules' => [ 24 'modules' => [
18 'permit' => [ 25 'permit' => [
19 'class' => 'developeruz\db_rbac\Yii2DbRbac', 26 'class' => 'developeruz\db_rbac\Yii2DbRbac',
common/config/main.php
  Show/Hide comments   View file @5224698
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 'disabledCommands' => ['netmount'], //отключение ненужных команд https://github.com/Studio-42/elFinder/wiki/Client-configuration-options#commands 12 'disabledCommands' => ['netmount'], //отключение ненужных команд https://github.com/Studio-42/elFinder/wiki/Client-configuration-options#commands
13 'roots' => [ 13 'roots' => [
14 [ 14 [
15 - 'class' => 'mihaildev\elfinder\UserPath', 15 + 'class' => 'mihaildev\elfinder\volume\UserPath',
16 'path' => '../../storage/user_{id}', 16 'path' => '../../storage/user_{id}',
17 'name' => 'My Documents' 17 'name' => 'My Documents'
18 ], 18 ],
common/models/CustomerSearch.php
  Show/Hide comments   View file @5224698
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 [ 'rating' ], 40 [ 'rating' ],
41 'number', 41 'number',
42 'min' => 0, 42 'min' => 0,
43 - 'max' => 5, 43 + 'max' => 10,
44 ], 44 ],
45 [ 45 [
46 [ 'rating' ], 46 [ 'rating' ],
common/models/Job.php
  Show/Hide comments   View file @5224698
@@ -40,7 +40,9 @@ @@ -40,7 +40,9 @@
40 40
41 public function beforeSave($insert) 41 public function beforeSave($insert)
42 { 42 {
43 - $this->date_start = \Yii::$app->formatter->asDatetime($this->date_start, 'Y-MM-d HH:mm:ss'); 43 + if($this->date_start) {
  44 + $this->date_start = \Yii::$app->formatter->asDatetime($this->date_start, 'Y-MM-d HH:mm:ss');
  45 + }
44 46
45 if($this->date_end) { 47 if($this->date_end) {
46 $this->date_end = \Yii::$app->formatter->asDatetime($this->date_end, 'Y-MM-d HH:mm:ss'); 48 $this->date_end = \Yii::$app->formatter->asDatetime($this->date_end, 'Y-MM-d HH:mm:ss');
@@ -173,16 +175,6 @@ @@ -173,16 +175,6 @@
173 return false; 175 return false;
174 } 176 }
175 return $result; 177 return $result;
176 -// if($this->date_end && $this->date_start) {  
177 -// $date = new \DateTime(date('Y-m-d H:i:s', $this->date_start));  
178 -// return \Yii::$app->formatter->asRelativeTime($date->diff(new \DateTime(date('Y-m-d H:i:s', $this->date_end))));  
179 -// } elseif($this->date_start) {  
180 -// $now = new \DateTime();  
181 -// $date = new \DateTime(date('Y-m-d H:i:s', strtotime($this->date_start)));  
182 -// return \Yii::$app->formatter->asRelativeTime($date->diff(new \DateTime()));  
183 -// } else {  
184 -// return 'неизвестна дата начала';  
185 -// }  
186 } 178 }
187 179
188 180
common/modules/comment/widgets/views/_project_comment_view.php
  Show/Hide comments   View file @5224698
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 ], 100 ],
101 ]); 101 ]);
102 ?> 102 ?>
103 - <?= Html::a(count($user->comments) . ' отзывов', $user->getLink('review'), [ 'class' => 'link-to-comm' ]) ?> 103 + <?= Html::a(count($user->comments) . ' мнений', $user->getLink('review'), [ 'class' => 'link-to-comm' ]) ?>
104 </div> 104 </div>
105 <div class="tender-offer-proj-txt"> 105 <div class="tender-offer-proj-txt">
106 <?= $model->text ?> 106 <?= $model->text ?>
@@ -215,43 +215,6 @@ @@ -215,43 +215,6 @@
215 "type": "bower-asset-library" 215 "type": "bower-asset-library"
216 }, 216 },
217 { 217 {
218 - "name": "bower-asset/fontawesome",  
219 - "version": "v4.6.1",  
220 - "source": {  
221 - "type": "git",  
222 - "url": "https://github.com/FortAwesome/Font-Awesome.git",  
223 - "reference": "6535013c330e801ecf0b23c437865a7fb344486d"  
224 - },  
225 - "dist": {  
226 - "type": "zip",  
227 - "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/6535013c330e801ecf0b23c437865a7fb344486d",  
228 - "reference": "6535013c330e801ecf0b23c437865a7fb344486d",  
229 - "shasum": ""  
230 - },  
231 - "type": "bower-asset-library",  
232 - "extra": {  
233 - "bower-asset-main": [  
234 - "less/font-awesome.less",  
235 - "scss/font-awesome.scss"  
236 - ],  
237 - "bower-asset-ignore": [  
238 - "*/.*",  
239 - "*.json",  
240 - "src",  
241 - "*.yml",  
242 - "Gemfile",  
243 - "Gemfile.lock",  
244 - "*.md"  
245 - ]  
246 - },  
247 - "license": [  
248 - "OFL-1.1",  
249 - "MIT",  
250 - "CC-BY-3.0"  
251 - ],  
252 - "description": "Font Awesome"  
253 - },  
254 - {  
255 "name": "bower-asset/jquery", 218 "name": "bower-asset/jquery",
256 "version": "1.11.3", 219 "version": "1.11.3",
257 "source": { 220 "source": {
@@ -429,7 +392,8 @@ @@ -429,7 +392,8 @@
429 }, 392 },
430 "license": [ 393 "license": [
431 "MIT" 394 "MIT"
432 - ] 395 + ],
  396 + "time": "2015-12-31 08:33:51"
433 }, 397 },
434 { 398 {
435 "name": "cebe/markdown", 399 "name": "cebe/markdown",
@@ -540,12 +504,12 @@ @@ -540,12 +504,12 @@
540 "source": { 504 "source": {
541 "type": "git", 505 "type": "git",
542 "url": "https://github.com/Codeception/Codeception.git", 506 "url": "https://github.com/Codeception/Codeception.git",
543 - "reference": "099d101299e8ab43413b4787189d5da1927ec6a2" 507 + "reference": "c5bcdcb32ec7031c9aa1a36058e5cddbb53ce2b2"
544 }, 508 },
545 "dist": { 509 "dist": {
546 "type": "zip", 510 "type": "zip",
547 - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/099d101299e8ab43413b4787189d5da1927ec6a2",  
548 - "reference": "099d101299e8ab43413b4787189d5da1927ec6a2", 511 + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/c5bcdcb32ec7031c9aa1a36058e5cddbb53ce2b2",
  512 + "reference": "c5bcdcb32ec7031c9aa1a36058e5cddbb53ce2b2",
549 "shasum": "" 513 "shasum": ""
550 }, 514 },
551 "require": { 515 "require": {
@@ -558,6 +522,7 @@ @@ -558,6 +522,7 @@
558 "php": ">=5.4.0 <8.0", 522 "php": ">=5.4.0 <8.0",
559 "phpunit/php-code-coverage": ">=2.1.3", 523 "phpunit/php-code-coverage": ">=2.1.3",
560 "phpunit/phpunit": ">4.8.20 <6.0", 524 "phpunit/phpunit": ">4.8.20 <6.0",
  525 + "predis/predis": "^1.0",
561 "symfony/browser-kit": ">=2.7 <3.1", 526 "symfony/browser-kit": ">=2.7 <3.1",
562 "symfony/console": ">=2.7 <3.1", 527 "symfony/console": ">=2.7 <3.1",
563 "symfony/css-selector": ">=2.7 <3.1", 528 "symfony/css-selector": ">=2.7 <3.1",
@@ -568,10 +533,12 @@ @@ -568,10 +533,12 @@
568 }, 533 },
569 "require-dev": { 534 "require-dev": {
570 "codeception/specify": "~0.3", 535 "codeception/specify": "~0.3",
  536 + "ext-mongodb": "*",
571 "facebook/php-sdk-v4": "~5.0", 537 "facebook/php-sdk-v4": "~5.0",
572 "flow/jsonpath": "~0.2", 538 "flow/jsonpath": "~0.2",
573 "league/factory-muffin": "^3.0", 539 "league/factory-muffin": "^3.0",
574 "league/factory-muffin-faker": "^1.0", 540 "league/factory-muffin-faker": "^1.0",
  541 + "mongodb/mongodb": "^1.0",
575 "monolog/monolog": "~1.8", 542 "monolog/monolog": "~1.8",
576 "pda/pheanstalk": "~3.0", 543 "pda/pheanstalk": "~3.0",
577 "php-amqplib/php-amqplib": "~2.4" 544 "php-amqplib/php-amqplib": "~2.4"
@@ -582,7 +549,8 @@ @@ -582,7 +549,8 @@
582 "flow/jsonpath": "For using JSONPath in REST module", 549 "flow/jsonpath": "For using JSONPath in REST module",
583 "league/factory-muffin": "For DataFactory module", 550 "league/factory-muffin": "For DataFactory module",
584 "league/factory-muffin-faker": "For Faker support in DataFactory module", 551 "league/factory-muffin-faker": "For Faker support in DataFactory module",
585 - "phpseclib/phpseclib": "for SFTP option in FTP Module" 552 + "phpseclib/phpseclib": "for SFTP option in FTP Module",
  553 + "symfony/phpunit-bridge": "For phpunit-bridge support"
586 }, 554 },
587 "bin": [ 555 "bin": [
588 "codecept" 556 "codecept"
@@ -617,7 +585,7 @@ @@ -617,7 +585,7 @@
617 "functional testing", 585 "functional testing",
618 "unit testing" 586 "unit testing"
619 ], 587 ],
620 - "time": "2016-04-26 21:38:53" 588 + "time": "2016-05-30 00:01:09"
621 }, 589 },
622 { 590 {
623 "name": "developeruz/yii2-db-rbac", 591 "name": "developeruz/yii2-db-rbac",
@@ -861,12 +829,12 @@ @@ -861,12 +829,12 @@
861 "source": { 829 "source": {
862 "type": "git", 830 "type": "git",
863 "url": "https://github.com/guzzle/guzzle.git", 831 "url": "https://github.com/guzzle/guzzle.git",
864 - "reference": "85cb758d7367f3aaaa8ffc9269e777919c5f68bb" 832 + "reference": "b1a96f6134f69cb41f8538d3a6491f4bb1dbab78"
865 }, 833 },
866 "dist": { 834 "dist": {
867 "type": "zip", 835 "type": "zip",
868 - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/85cb758d7367f3aaaa8ffc9269e777919c5f68bb",  
869 - "reference": "85cb758d7367f3aaaa8ffc9269e777919c5f68bb", 836 + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b1a96f6134f69cb41f8538d3a6491f4bb1dbab78",
  837 + "reference": "b1a96f6134f69cb41f8538d3a6491f4bb1dbab78",
870 "shasum": "" 838 "shasum": ""
871 }, 839 },
872 "require": { 840 "require": {
@@ -915,20 +883,20 @@ @@ -915,20 +883,20 @@
915 "rest", 883 "rest",
916 "web service" 884 "web service"
917 ], 885 ],
918 - "time": "2016-04-06 17:59:33" 886 + "time": "2016-05-08 19:39:56"
919 }, 887 },
920 { 888 {
921 "name": "guzzlehttp/promises", 889 "name": "guzzlehttp/promises",
922 - "version": "1.1.0", 890 + "version": "1.2.0",
923 "source": { 891 "source": {
924 "type": "git", 892 "type": "git",
925 "url": "https://github.com/guzzle/promises.git", 893 "url": "https://github.com/guzzle/promises.git",
926 - "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8" 894 + "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579"
927 }, 895 },
928 "dist": { 896 "dist": {
929 "type": "zip", 897 "type": "zip",
930 - "url": "https://api.github.com/repos/guzzle/promises/zipball/bb9024c526b22f3fe6ae55a561fd70653d470aa8",  
931 - "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8", 898 + "url": "https://api.github.com/repos/guzzle/promises/zipball/c10d860e2a9595f8883527fa0021c7da9e65f579",
  899 + "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579",
932 "shasum": "" 900 "shasum": ""
933 }, 901 },
934 "require": { 902 "require": {
@@ -966,7 +934,7 @@ @@ -966,7 +934,7 @@
966 "keywords": [ 934 "keywords": [
967 "promise" 935 "promise"
968 ], 936 ],
969 - "time": "2016-03-08 01:15:46" 937 + "time": "2016-05-18 16:56:05"
970 }, 938 },
971 { 939 {
972 "name": "guzzlehttp/psr7", 940 "name": "guzzlehttp/psr7",
@@ -1089,12 +1057,12 @@ @@ -1089,12 +1057,12 @@
1089 "source": { 1057 "source": {
1090 "type": "git", 1058 "type": "git",
1091 "url": "https://github.com/kartik-v/bootstrap-star-rating.git", 1059 "url": "https://github.com/kartik-v/bootstrap-star-rating.git",
1092 - "reference": "2443b49d33139a59e6e40aa60872bfb4fd76fa59" 1060 + "reference": "3d0ac4b92f85333f42169c4299026d18a0845668"
1093 }, 1061 },
1094 "dist": { 1062 "dist": {
1095 "type": "zip", 1063 "type": "zip",
1096 - "url": "https://api.github.com/repos/kartik-v/bootstrap-star-rating/zipball/2443b49d33139a59e6e40aa60872bfb4fd76fa59",  
1097 - "reference": "2443b49d33139a59e6e40aa60872bfb4fd76fa59", 1064 + "url": "https://api.github.com/repos/kartik-v/bootstrap-star-rating/zipball/3d0ac4b92f85333f42169c4299026d18a0845668",
  1065 + "reference": "3d0ac4b92f85333f42169c4299026d18a0845668",
1098 "shasum": "" 1066 "shasum": ""
1099 }, 1067 },
1100 "type": "library", 1068 "type": "library",
@@ -1125,7 +1093,7 @@ @@ -1125,7 +1093,7 @@
1125 "star", 1093 "star",
1126 "svg" 1094 "svg"
1127 ], 1095 ],
1128 - "time": "2016-03-22 14:58:18" 1096 + "time": "2016-05-12 17:37:56"
1129 }, 1097 },
1130 { 1098 {
1131 "name": "kartik-v/yii2-krajee-base", 1099 "name": "kartik-v/yii2-krajee-base",
@@ -1133,12 +1101,12 @@ @@ -1133,12 +1101,12 @@
1133 "source": { 1101 "source": {
1134 "type": "git", 1102 "type": "git",
1135 "url": "https://github.com/kartik-v/yii2-krajee-base.git", 1103 "url": "https://github.com/kartik-v/yii2-krajee-base.git",
1136 - "reference": "314f3b31990870856dbdf5f9bf5192ee683a386a" 1104 + "reference": "7f7a45ffe193fe673f72b9effc01b08499f2a454"
1137 }, 1105 },
1138 "dist": { 1106 "dist": {
1139 "type": "zip", 1107 "type": "zip",
1140 - "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/314f3b31990870856dbdf5f9bf5192ee683a386a",  
1141 - "reference": "314f3b31990870856dbdf5f9bf5192ee683a386a", 1108 + "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/7f7a45ffe193fe673f72b9effc01b08499f2a454",
  1109 + "reference": "7f7a45ffe193fe673f72b9effc01b08499f2a454",
1142 "shasum": "" 1110 "shasum": ""
1143 }, 1111 },
1144 "require": { 1112 "require": {
@@ -1176,7 +1144,7 @@ @@ -1176,7 +1144,7 @@
1176 "widget", 1144 "widget",
1177 "yii2" 1145 "yii2"
1178 ], 1146 ],
1179 - "time": "2016-04-28 03:01:32" 1147 + "time": "2016-05-07 19:45:52"
1180 }, 1148 },
1181 { 1149 {
1182 "name": "kartik-v/yii2-widget-colorinput", 1150 "name": "kartik-v/yii2-widget-colorinput",
@@ -1238,12 +1206,12 @@ @@ -1238,12 +1206,12 @@
1238 "source": { 1206 "source": {
1239 "type": "git", 1207 "type": "git",
1240 "url": "https://github.com/kartik-v/yii2-widget-rating.git", 1208 "url": "https://github.com/kartik-v/yii2-widget-rating.git",
1241 - "reference": "e3110576b60ecb6098bc8389efb5ef3a402b6e61" 1209 + "reference": "3327e9cecf1f1fec2c614afbdb6545091a87fc56"
1242 }, 1210 },
1243 "dist": { 1211 "dist": {
1244 "type": "zip", 1212 "type": "zip",
1245 - "url": "https://api.github.com/repos/kartik-v/yii2-widget-rating/zipball/e3110576b60ecb6098bc8389efb5ef3a402b6e61",  
1246 - "reference": "e3110576b60ecb6098bc8389efb5ef3a402b6e61", 1213 + "url": "https://api.github.com/repos/kartik-v/yii2-widget-rating/zipball/3327e9cecf1f1fec2c614afbdb6545091a87fc56",
  1214 + "reference": "3327e9cecf1f1fec2c614afbdb6545091a87fc56",
1247 "shasum": "" 1215 "shasum": ""
1248 }, 1216 },
1249 "require": { 1217 "require": {
@@ -1286,7 +1254,7 @@ @@ -1286,7 +1254,7 @@
1286 "widget", 1254 "widget",
1287 "yii2" 1255 "yii2"
1288 ], 1256 ],
1289 - "time": "2016-04-27 19:26:00" 1257 + "time": "2016-05-13 03:22:54"
1290 }, 1258 },
1291 { 1259 {
1292 "name": "kartik-v/yii2-widget-select2", 1260 "name": "kartik-v/yii2-widget-select2",
@@ -1456,19 +1424,20 @@ @@ -1456,19 +1424,20 @@
1456 }, 1424 },
1457 { 1425 {
1458 "name": "mihaildev/yii2-elfinder", 1426 "name": "mihaildev/yii2-elfinder",
1459 - "version": "1.1.3", 1427 + "version": "1.2.0",
1460 "source": { 1428 "source": {
1461 "type": "git", 1429 "type": "git",
1462 "url": "https://github.com/MihailDev/yii2-elfinder.git", 1430 "url": "https://github.com/MihailDev/yii2-elfinder.git",
1463 - "reference": "64b42572dec94e5c2d0d1630bce8292848a98f4b" 1431 + "reference": "bfb35ff2951ee162bd56b36335329847763531d5"
1464 }, 1432 },
1465 "dist": { 1433 "dist": {
1466 "type": "zip", 1434 "type": "zip",
1467 - "url": "https://api.github.com/repos/MihailDev/yii2-elfinder/zipball/64b42572dec94e5c2d0d1630bce8292848a98f4b",  
1468 - "reference": "64b42572dec94e5c2d0d1630bce8292848a98f4b", 1435 + "url": "https://api.github.com/repos/MihailDev/yii2-elfinder/zipball/bfb35ff2951ee162bd56b36335329847763531d5",
  1436 + "reference": "bfb35ff2951ee162bd56b36335329847763531d5",
1469 "shasum": "" 1437 "shasum": ""
1470 }, 1438 },
1471 "require": { 1439 "require": {
  1440 + "studio-42/elfinder": "^2.1.10",
1472 "yiisoft/yii2-jui": "*" 1441 "yiisoft/yii2-jui": "*"
1473 }, 1442 },
1474 "type": "yii2-extension", 1443 "type": "yii2-extension",
@@ -1502,7 +1471,49 @@ @@ -1502,7 +1471,49 @@
1502 "filemanager", 1471 "filemanager",
1503 "yii" 1472 "yii"
1504 ], 1473 ],
1505 - "time": "2015-07-03 07:08:52" 1474 + "time": "2016-05-11 14:20:43"
  1475 + },
  1476 + {
  1477 + "name": "myclabs/deep-copy",
  1478 + "version": "1.5.1",
  1479 + "source": {
  1480 + "type": "git",
  1481 + "url": "https://github.com/myclabs/DeepCopy.git",
  1482 + "reference": "a8773992b362b58498eed24bf85005f363c34771"
  1483 + },
  1484 + "dist": {
  1485 + "type": "zip",
  1486 + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/a8773992b362b58498eed24bf85005f363c34771",
  1487 + "reference": "a8773992b362b58498eed24bf85005f363c34771",
  1488 + "shasum": ""
  1489 + },
  1490 + "require": {
  1491 + "php": ">=5.4.0"
  1492 + },
  1493 + "require-dev": {
  1494 + "doctrine/collections": "1.*",
  1495 + "phpunit/phpunit": "~4.1"
  1496 + },
  1497 + "type": "library",
  1498 + "autoload": {
  1499 + "psr-4": {
  1500 + "DeepCopy\\": "src/DeepCopy/"
  1501 + }
  1502 + },
  1503 + "notification-url": "https://packagist.org/downloads/",
  1504 + "license": [
  1505 + "MIT"
  1506 + ],
  1507 + "description": "Create deep copies (clones) of your objects",
  1508 + "homepage": "https://github.com/myclabs/DeepCopy",
  1509 + "keywords": [
  1510 + "clone",
  1511 + "copy",
  1512 + "duplicate",
  1513 + "object",
  1514 + "object graph"
  1515 + ],
  1516 + "time": "2015-11-20 12:04:31"
1506 }, 1517 },
1507 { 1518 {
1508 "name": "nodge/lightopenid", 1519 "name": "nodge/lightopenid",
@@ -1658,12 +1669,12 @@ @@ -1658,12 +1669,12 @@
1658 "source": { 1669 "source": {
1659 "type": "git", 1670 "type": "git",
1660 "url": "https://github.com/phpspec/prophecy.git", 1671 "url": "https://github.com/phpspec/prophecy.git",
1661 - "reference": "b02221e42163be673f9b44a0bc92a8b4907a7c6d" 1672 + "reference": "f9a8140d6cf86514a64fb3b637e716008e1885d0"
1662 }, 1673 },
1663 "dist": { 1674 "dist": {
1664 "type": "zip", 1675 "type": "zip",
1665 - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b02221e42163be673f9b44a0bc92a8b4907a7c6d",  
1666 - "reference": "b02221e42163be673f9b44a0bc92a8b4907a7c6d", 1676 + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f9a8140d6cf86514a64fb3b637e716008e1885d0",
  1677 + "reference": "f9a8140d6cf86514a64fb3b637e716008e1885d0",
1667 "shasum": "" 1678 "shasum": ""
1668 }, 1679 },
1669 "require": { 1680 "require": {
@@ -1712,43 +1723,44 @@ @@ -1712,43 +1723,44 @@
1712 "spy", 1723 "spy",
1713 "stub" 1724 "stub"
1714 ], 1725 ],
1715 - "time": "2016-02-21 17:41:21" 1726 + "time": "2016-05-27 08:33:35"
1716 }, 1727 },
1717 { 1728 {
1718 "name": "phpunit/php-code-coverage", 1729 "name": "phpunit/php-code-coverage",
1719 - "version": "2.2.x-dev", 1730 + "version": "dev-master",
1720 "source": { 1731 "source": {
1721 "type": "git", 1732 "type": "git",
1722 "url": "https://github.com/sebastianbergmann/php-code-coverage.git", 1733 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
1723 - "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979" 1734 + "reference": "844ec6eabee15768f1e34a8871f6fddfc3d5f602"
1724 }, 1735 },
1725 "dist": { 1736 "dist": {
1726 "type": "zip", 1737 "type": "zip",
1727 - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",  
1728 - "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979", 1738 + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/844ec6eabee15768f1e34a8871f6fddfc3d5f602",
  1739 + "reference": "844ec6eabee15768f1e34a8871f6fddfc3d5f602",
1729 "shasum": "" 1740 "shasum": ""
1730 }, 1741 },
1731 "require": { 1742 "require": {
1732 - "php": ">=5.3.3", 1743 + "php": "^5.6 || ^7.0",
1733 "phpunit/php-file-iterator": "~1.3", 1744 "phpunit/php-file-iterator": "~1.3",
1734 "phpunit/php-text-template": "~1.2", 1745 "phpunit/php-text-template": "~1.2",
1735 - "phpunit/php-token-stream": "~1.3", 1746 + "phpunit/php-token-stream": "^1.4.2",
  1747 + "sebastian/code-unit-reverse-lookup": "~1.0",
1736 "sebastian/environment": "^1.3.2", 1748 "sebastian/environment": "^1.3.2",
1737 - "sebastian/version": "~1.0" 1749 + "sebastian/version": "~1.0|~2.0"
1738 }, 1750 },
1739 "require-dev": { 1751 "require-dev": {
1740 "ext-xdebug": ">=2.1.4", 1752 "ext-xdebug": ">=2.1.4",
1741 - "phpunit/phpunit": "~4" 1753 + "phpunit/phpunit": "^5.4"
1742 }, 1754 },
1743 "suggest": { 1755 "suggest": {
1744 "ext-dom": "*", 1756 "ext-dom": "*",
1745 - "ext-xdebug": ">=2.2.1", 1757 + "ext-xdebug": ">=2.4.0",
1746 "ext-xmlwriter": "*" 1758 "ext-xmlwriter": "*"
1747 }, 1759 },
1748 "type": "library", 1760 "type": "library",
1749 "extra": { 1761 "extra": {
1750 "branch-alias": { 1762 "branch-alias": {
1751 - "dev-master": "2.2.x-dev" 1763 + "dev-master": "4.0.x-dev"
1752 } 1764 }
1753 }, 1765 },
1754 "autoload": { 1766 "autoload": {
@@ -1774,7 +1786,7 @@ @@ -1774,7 +1786,7 @@
1774 "testing", 1786 "testing",
1775 "xunit" 1787 "xunit"
1776 ], 1788 ],
1777 - "time": "2015-10-06 15:47:00" 1789 + "time": "2016-05-27 16:21:40"
1778 }, 1790 },
1779 { 1791 {
1780 "name": "phpunit/php-file-iterator", 1792 "name": "phpunit/php-file-iterator",
@@ -1866,21 +1878,24 @@ @@ -1866,21 +1878,24 @@
1866 }, 1878 },
1867 { 1879 {
1868 "name": "phpunit/php-timer", 1880 "name": "phpunit/php-timer",
1869 - "version": "1.0.7", 1881 + "version": "1.0.8",
1870 "source": { 1882 "source": {
1871 "type": "git", 1883 "type": "git",
1872 "url": "https://github.com/sebastianbergmann/php-timer.git", 1884 "url": "https://github.com/sebastianbergmann/php-timer.git",
1873 - "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b" 1885 + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
1874 }, 1886 },
1875 "dist": { 1887 "dist": {
1876 "type": "zip", 1888 "type": "zip",
1877 - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",  
1878 - "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b", 1889 + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
  1890 + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
1879 "shasum": "" 1891 "shasum": ""
1880 }, 1892 },
1881 "require": { 1893 "require": {
1882 "php": ">=5.3.3" 1894 "php": ">=5.3.3"
1883 }, 1895 },
  1896 + "require-dev": {
  1897 + "phpunit/phpunit": "~4|~5"
  1898 + },
1884 "type": "library", 1899 "type": "library",
1885 "autoload": { 1900 "autoload": {
1886 "classmap": [ 1901 "classmap": [
@@ -1903,7 +1918,7 @@ @@ -1903,7 +1918,7 @@
1903 "keywords": [ 1918 "keywords": [
1904 "timer" 1919 "timer"
1905 ], 1920 ],
1906 - "time": "2015-06-21 08:01:12" 1921 + "time": "2016-05-12 18:03:57"
1907 }, 1922 },
1908 { 1923 {
1909 "name": "phpunit/php-token-stream", 1924 "name": "phpunit/php-token-stream",
@@ -1956,16 +1971,16 @@ @@ -1956,16 +1971,16 @@
1956 }, 1971 },
1957 { 1972 {
1958 "name": "phpunit/phpunit", 1973 "name": "phpunit/phpunit",
1959 - "version": "4.8.x-dev", 1974 + "version": "dev-master",
1960 "source": { 1975 "source": {
1961 "type": "git", 1976 "type": "git",
1962 "url": "https://github.com/sebastianbergmann/phpunit.git", 1977 "url": "https://github.com/sebastianbergmann/phpunit.git",
1963 - "reference": "3c4becbce99732549949904c47b76ffe602a7595" 1978 + "reference": "4789e42043079d81f2cb77ea859036689dbb91ee"
1964 }, 1979 },
1965 "dist": { 1980 "dist": {
1966 "type": "zip", 1981 "type": "zip",
1967 - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3c4becbce99732549949904c47b76ffe602a7595",  
1968 - "reference": "3c4becbce99732549949904c47b76ffe602a7595", 1982 + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4789e42043079d81f2cb77ea859036689dbb91ee",
  1983 + "reference": "4789e42043079d81f2cb77ea859036689dbb91ee",
1969 "shasum": "" 1984 "shasum": ""
1970 }, 1985 },
1971 "require": { 1986 "require": {
@@ -1974,19 +1989,22 @@ @@ -1974,19 +1989,22 @@
1974 "ext-pcre": "*", 1989 "ext-pcre": "*",
1975 "ext-reflection": "*", 1990 "ext-reflection": "*",
1976 "ext-spl": "*", 1991 "ext-spl": "*",
1977 - "php": ">=5.3.3", 1992 + "myclabs/deep-copy": "~1.3",
  1993 + "php": "^5.6 || ^7.0",
1978 "phpspec/prophecy": "^1.3.1", 1994 "phpspec/prophecy": "^1.3.1",
1979 - "phpunit/php-code-coverage": "~2.1", 1995 + "phpunit/php-code-coverage": "^4.0",
1980 "phpunit/php-file-iterator": "~1.4", 1996 "phpunit/php-file-iterator": "~1.4",
1981 "phpunit/php-text-template": "~1.2", 1997 "phpunit/php-text-template": "~1.2",
1982 "phpunit/php-timer": "^1.0.6", 1998 "phpunit/php-timer": "^1.0.6",
1983 - "phpunit/phpunit-mock-objects": "~2.3", 1999 + "phpunit/phpunit-mock-objects": "^3.2",
1984 "sebastian/comparator": "~1.1", 2000 "sebastian/comparator": "~1.1",
1985 "sebastian/diff": "~1.2", 2001 "sebastian/diff": "~1.2",
1986 "sebastian/environment": "~1.3", 2002 "sebastian/environment": "~1.3",
1987 "sebastian/exporter": "~1.2", 2003 "sebastian/exporter": "~1.2",
1988 "sebastian/global-state": "~1.0", 2004 "sebastian/global-state": "~1.0",
1989 - "sebastian/version": "~1.0", 2005 + "sebastian/object-enumerator": "~1.0",
  2006 + "sebastian/resource-operations": "~1.0",
  2007 + "sebastian/version": "~1.0|~2.0",
1990 "symfony/yaml": "~2.1|~3.0" 2008 "symfony/yaml": "~2.1|~3.0"
1991 }, 2009 },
1992 "suggest": { 2010 "suggest": {
@@ -1998,7 +2016,7 @@ @@ -1998,7 +2016,7 @@
1998 "type": "library", 2016 "type": "library",
1999 "extra": { 2017 "extra": {
2000 "branch-alias": { 2018 "branch-alias": {
2001 - "dev-master": "4.8.x-dev" 2019 + "dev-master": "5.4.x-dev"
2002 } 2020 }
2003 }, 2021 },
2004 "autoload": { 2022 "autoload": {
@@ -2024,30 +2042,30 @@ @@ -2024,30 +2042,30 @@
2024 "testing", 2042 "testing",
2025 "xunit" 2043 "xunit"
2026 ], 2044 ],
2027 - "time": "2016-04-25 09:17:33" 2045 + "time": "2016-05-29 16:55:46"
2028 }, 2046 },
2029 { 2047 {
2030 "name": "phpunit/phpunit-mock-objects", 2048 "name": "phpunit/phpunit-mock-objects",
2031 - "version": "2.3.x-dev", 2049 + "version": "dev-master",
2032 "source": { 2050 "source": {
2033 "type": "git", 2051 "type": "git",
2034 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", 2052 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
2035 - "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983" 2053 + "reference": "5bf0ba29dd683ec4f2e5d4fb212ad31827501012"
2036 }, 2054 },
2037 "dist": { 2055 "dist": {
2038 "type": "zip", 2056 "type": "zip",
2039 - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",  
2040 - "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983", 2057 + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5bf0ba29dd683ec4f2e5d4fb212ad31827501012",
  2058 + "reference": "5bf0ba29dd683ec4f2e5d4fb212ad31827501012",
2041 "shasum": "" 2059 "shasum": ""
2042 }, 2060 },
2043 "require": { 2061 "require": {
2044 "doctrine/instantiator": "^1.0.2", 2062 "doctrine/instantiator": "^1.0.2",
2045 - "php": ">=5.3.3",  
2046 - "phpunit/php-text-template": "~1.2",  
2047 - "sebastian/exporter": "~1.2" 2063 + "php": "^5.6 || ^7.0",
  2064 + "phpunit/php-text-template": "^1.2",
  2065 + "sebastian/exporter": "^1.2"
2048 }, 2066 },
2049 "require-dev": { 2067 "require-dev": {
2050 - "phpunit/phpunit": "~4.4" 2068 + "phpunit/phpunit": "^5.4"
2051 }, 2069 },
2052 "suggest": { 2070 "suggest": {
2053 "ext-soap": "*" 2071 "ext-soap": "*"
@@ -2055,7 +2073,7 @@ @@ -2055,7 +2073,7 @@
2055 "type": "library", 2073 "type": "library",
2056 "extra": { 2074 "extra": {
2057 "branch-alias": { 2075 "branch-alias": {
2058 - "dev-master": "2.3.x-dev" 2076 + "dev-master": "3.2.x-dev"
2059 } 2077 }
2060 }, 2078 },
2061 "autoload": { 2079 "autoload": {
@@ -2080,7 +2098,62 @@ @@ -2080,7 +2098,62 @@
2080 "mock", 2098 "mock",
2081 "xunit" 2099 "xunit"
2082 ], 2100 ],
2083 - "time": "2015-10-02 06:51:40" 2101 + "time": "2016-05-26 06:15:46"
  2102 + },
  2103 + {
  2104 + "name": "predis/predis",
  2105 + "version": "dev-master",
  2106 + "source": {
  2107 + "type": "git",
  2108 + "url": "https://github.com/nrk/predis.git",
  2109 + "reference": "5850029f893cefe9aeeeb046ea18a5866f890cc5"
  2110 + },
  2111 + "dist": {
  2112 + "type": "zip",
  2113 + "url": "https://api.github.com/repos/nrk/predis/zipball/5850029f893cefe9aeeeb046ea18a5866f890cc5",
  2114 + "reference": "5850029f893cefe9aeeeb046ea18a5866f890cc5",
  2115 + "shasum": ""
  2116 + },
  2117 + "require": {
  2118 + "php": ">=5.3.9"
  2119 + },
  2120 + "require-dev": {
  2121 + "phpunit/phpunit": "~4.8"
  2122 + },
  2123 + "suggest": {
  2124 + "ext-curl": "Allows access to Webdis when paired with phpiredis",
  2125 + "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol"
  2126 + },
  2127 + "type": "library",
  2128 + "extra": {
  2129 + "branch-alias": {
  2130 + "dev-master": "1.1-dev"
  2131 + }
  2132 + },
  2133 + "autoload": {
  2134 + "psr-4": {
  2135 + "Predis\\": "src/"
  2136 + }
  2137 + },
  2138 + "notification-url": "https://packagist.org/downloads/",
  2139 + "license": [
  2140 + "MIT"
  2141 + ],
  2142 + "authors": [
  2143 + {
  2144 + "name": "Daniele Alessandri",
  2145 + "email": "suppakilla@gmail.com",
  2146 + "homepage": "http://clorophilla.net"
  2147 + }
  2148 + ],
  2149 + "description": "Flexible and feature-complete Redis client for PHP and HHVM",
  2150 + "homepage": "http://github.com/nrk/predis",
  2151 + "keywords": [
  2152 + "nosql",
  2153 + "predis",
  2154 + "redis"
  2155 + ],
  2156 + "time": "2016-05-28 18:28:18"
2084 }, 2157 },
2085 { 2158 {
2086 "name": "psr/http-message", 2159 "name": "psr/http-message",
@@ -2133,16 +2206,16 @@ @@ -2133,16 +2206,16 @@
2133 }, 2206 },
2134 { 2207 {
2135 "name": "rmrevin/yii2-comments", 2208 "name": "rmrevin/yii2-comments",
2136 - "version": "1.4.2", 2209 + "version": "1.4.3",
2137 "source": { 2210 "source": {
2138 "type": "git", 2211 "type": "git",
2139 "url": "https://github.com/rmrevin/yii2-comments.git", 2212 "url": "https://github.com/rmrevin/yii2-comments.git",
2140 - "reference": "c68ddf276fe24ece0173781a8f7391a2cf7e6a12" 2213 + "reference": "3ab2ab67925e9e0f2baf50d2f79dd3248f1ad850"
2141 }, 2214 },
2142 "dist": { 2215 "dist": {
2143 "type": "zip", 2216 "type": "zip",
2144 - "url": "https://api.github.com/repos/rmrevin/yii2-comments/zipball/c68ddf276fe24ece0173781a8f7391a2cf7e6a12",  
2145 - "reference": "c68ddf276fe24ece0173781a8f7391a2cf7e6a12", 2217 + "url": "https://api.github.com/repos/rmrevin/yii2-comments/zipball/3ab2ab67925e9e0f2baf50d2f79dd3248f1ad850",
  2218 + "reference": "3ab2ab67925e9e0f2baf50d2f79dd3248f1ad850",
2146 "shasum": "" 2219 "shasum": ""
2147 }, 2220 },
2148 "require": { 2221 "require": {
@@ -2180,24 +2253,23 @@ @@ -2180,24 +2253,23 @@
2180 "widget", 2253 "widget",
2181 "yii" 2254 "yii"
2182 ], 2255 ],
2183 - "time": "2016-03-01 13:18:41" 2256 + "time": "2016-04-28 13:14:57"
2184 }, 2257 },
2185 { 2258 {
2186 "name": "rmrevin/yii2-fontawesome", 2259 "name": "rmrevin/yii2-fontawesome",
2187 - "version": "2.14.0", 2260 + "version": "2.15.1",
2188 "source": { 2261 "source": {
2189 "type": "git", 2262 "type": "git",
2190 "url": "https://github.com/rmrevin/yii2-fontawesome.git", 2263 "url": "https://github.com/rmrevin/yii2-fontawesome.git",
2191 - "reference": "baac28412963974940cbfb6b83940b3aa179b0ee" 2264 + "reference": "d2777130bc926bc670a4e50c2f504a0fb782efb1"
2192 }, 2265 },
2193 "dist": { 2266 "dist": {
2194 "type": "zip", 2267 "type": "zip",
2195 - "url": "https://api.github.com/repos/rmrevin/yii2-fontawesome/zipball/baac28412963974940cbfb6b83940b3aa179b0ee",  
2196 - "reference": "baac28412963974940cbfb6b83940b3aa179b0ee", 2268 + "url": "https://api.github.com/repos/rmrevin/yii2-fontawesome/zipball/d2777130bc926bc670a4e50c2f504a0fb782efb1",
  2269 + "reference": "d2777130bc926bc670a4e50c2f504a0fb782efb1",
2197 "shasum": "" 2270 "shasum": ""
2198 }, 2271 },
2199 "require": { 2272 "require": {
2200 - "bower-asset/fontawesome": "4.6.*",  
2201 "php": ">=5.4.0", 2273 "php": ">=5.4.0",
2202 "yiisoft/yii2": "2.0.*" 2274 "yiisoft/yii2": "2.0.*"
2203 }, 2275 },
@@ -2232,7 +2304,52 @@ @@ -2232,7 +2304,52 @@
2232 "font", 2304 "font",
2233 "yii" 2305 "yii"
2234 ], 2306 ],
2235 - "time": "2016-04-21 11:55:25" 2307 + "time": "2016-05-28 21:18:32"
  2308 + },
  2309 + {
  2310 + "name": "sebastian/code-unit-reverse-lookup",
  2311 + "version": "dev-master",
  2312 + "source": {
  2313 + "type": "git",
  2314 + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
  2315 + "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe"
  2316 + },
  2317 + "dist": {
  2318 + "type": "zip",
  2319 + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
  2320 + "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
  2321 + "shasum": ""
  2322 + },
  2323 + "require": {
  2324 + "php": ">=5.6"
  2325 + },
  2326 + "require-dev": {
  2327 + "phpunit/phpunit": "~5"
  2328 + },
  2329 + "type": "library",
  2330 + "extra": {
  2331 + "branch-alias": {
  2332 + "dev-master": "1.0.x-dev"
  2333 + }
  2334 + },
  2335 + "autoload": {
  2336 + "classmap": [
  2337 + "src/"
  2338 + ]
  2339 + },
  2340 + "notification-url": "https://packagist.org/downloads/",
  2341 + "license": [
  2342 + "BSD-3-Clause"
  2343 + ],
  2344 + "authors": [
  2345 + {
  2346 + "name": "Sebastian Bergmann",
  2347 + "email": "sebastian@phpunit.de"
  2348 + }
  2349 + ],
  2350 + "description": "Looks up which function or method a line of code belongs to",
  2351 + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
  2352 + "time": "2016-02-13 06:45:14"
2236 }, 2353 },
2237 { 2354 {
2238 "name": "sebastian/comparator", 2355 "name": "sebastian/comparator",
@@ -2356,12 +2473,12 @@ @@ -2356,12 +2473,12 @@
2356 "source": { 2473 "source": {
2357 "type": "git", 2474 "type": "git",
2358 "url": "https://github.com/sebastianbergmann/environment.git", 2475 "url": "https://github.com/sebastianbergmann/environment.git",
2359 - "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf" 2476 + "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716"
2360 }, 2477 },
2361 "dist": { 2478 "dist": {
2362 "type": "zip", 2479 "type": "zip",
2363 - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf",  
2364 - "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", 2480 + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716",
  2481 + "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
2365 "shasum": "" 2482 "shasum": ""
2366 }, 2483 },
2367 "require": { 2484 "require": {
@@ -2398,7 +2515,7 @@ @@ -2398,7 +2515,7 @@
2398 "environment", 2515 "environment",
2399 "hhvm" 2516 "hhvm"
2400 ], 2517 ],
2401 - "time": "2016-02-26 18:40:46" 2518 + "time": "2016-05-17 03:18:57"
2402 }, 2519 },
2403 { 2520 {
2404 "name": "sebastian/exporter", 2521 "name": "sebastian/exporter",
@@ -2519,6 +2636,52 @@ @@ -2519,6 +2636,52 @@
2519 "time": "2015-10-12 03:26:01" 2636 "time": "2015-10-12 03:26:01"
2520 }, 2637 },
2521 { 2638 {
  2639 + "name": "sebastian/object-enumerator",
  2640 + "version": "dev-master",
  2641 + "source": {
  2642 + "type": "git",
  2643 + "url": "https://github.com/sebastianbergmann/object-enumerator.git",
  2644 + "reference": "d4ca2fb70344987502567bc50081c03e6192fb26"
  2645 + },
  2646 + "dist": {
  2647 + "type": "zip",
  2648 + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/d4ca2fb70344987502567bc50081c03e6192fb26",
  2649 + "reference": "d4ca2fb70344987502567bc50081c03e6192fb26",
  2650 + "shasum": ""
  2651 + },
  2652 + "require": {
  2653 + "php": ">=5.6",
  2654 + "sebastian/recursion-context": "~1.0"
  2655 + },
  2656 + "require-dev": {
  2657 + "phpunit/phpunit": "~5"
  2658 + },
  2659 + "type": "library",
  2660 + "extra": {
  2661 + "branch-alias": {
  2662 + "dev-master": "1.0.x-dev"
  2663 + }
  2664 + },
  2665 + "autoload": {
  2666 + "classmap": [
  2667 + "src/"
  2668 + ]
  2669 + },
  2670 + "notification-url": "https://packagist.org/downloads/",
  2671 + "license": [
  2672 + "BSD-3-Clause"
  2673 + ],
  2674 + "authors": [
  2675 + {
  2676 + "name": "Sebastian Bergmann",
  2677 + "email": "sebastian@phpunit.de"
  2678 + }
  2679 + ],
  2680 + "description": "Traverses array structures and object graphs to enumerate all referenced objects",
  2681 + "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
  2682 + "time": "2016-01-28 13:25:10"
  2683 + },
  2684 + {
2522 "name": "sebastian/recursion-context", 2685 "name": "sebastian/recursion-context",
2523 "version": "dev-master", 2686 "version": "dev-master",
2524 "source": { 2687 "source": {
@@ -2572,20 +2735,70 @@ @@ -2572,20 +2735,70 @@
2572 "time": "2016-01-28 05:39:29" 2735 "time": "2016-01-28 05:39:29"
2573 }, 2736 },
2574 { 2737 {
  2738 + "name": "sebastian/resource-operations",
  2739 + "version": "dev-master",
  2740 + "source": {
  2741 + "type": "git",
  2742 + "url": "https://github.com/sebastianbergmann/resource-operations.git",
  2743 + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
  2744 + },
  2745 + "dist": {
  2746 + "type": "zip",
  2747 + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
  2748 + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
  2749 + "shasum": ""
  2750 + },
  2751 + "require": {
  2752 + "php": ">=5.6.0"
  2753 + },
  2754 + "type": "library",
  2755 + "extra": {
  2756 + "branch-alias": {
  2757 + "dev-master": "1.0.x-dev"
  2758 + }
  2759 + },
  2760 + "autoload": {
  2761 + "classmap": [
  2762 + "src/"
  2763 + ]
  2764 + },
  2765 + "notification-url": "https://packagist.org/downloads/",
  2766 + "license": [
  2767 + "BSD-3-Clause"
  2768 + ],
  2769 + "authors": [
  2770 + {
  2771 + "name": "Sebastian Bergmann",
  2772 + "email": "sebastian@phpunit.de"
  2773 + }
  2774 + ],
  2775 + "description": "Provides a list of PHP built-in functions that operate on resources",
  2776 + "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
  2777 + "time": "2015-07-28 20:34:47"
  2778 + },
  2779 + {
2575 "name": "sebastian/version", 2780 "name": "sebastian/version",
2576 - "version": "1.0.6", 2781 + "version": "dev-master",
2577 "source": { 2782 "source": {
2578 "type": "git", 2783 "type": "git",
2579 "url": "https://github.com/sebastianbergmann/version.git", 2784 "url": "https://github.com/sebastianbergmann/version.git",
2580 - "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" 2785 + "reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5"
2581 }, 2786 },
2582 "dist": { 2787 "dist": {
2583 "type": "zip", 2788 "type": "zip",
2584 - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",  
2585 - "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", 2789 + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5",
  2790 + "reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5",
2586 "shasum": "" 2791 "shasum": ""
2587 }, 2792 },
  2793 + "require": {
  2794 + "php": ">=5.6"
  2795 + },
2588 "type": "library", 2796 "type": "library",
  2797 + "extra": {
  2798 + "branch-alias": {
  2799 + "dev-master": "2.0.x-dev"
  2800 + }
  2801 + },
2589 "autoload": { 2802 "autoload": {
2590 "classmap": [ 2803 "classmap": [
2591 "src/" 2804 "src/"
@@ -2604,7 +2817,65 @@ @@ -2604,7 +2817,65 @@
2604 ], 2817 ],
2605 "description": "Library that helps with managing the version number of Git-hosted PHP projects", 2818 "description": "Library that helps with managing the version number of Git-hosted PHP projects",
2606 "homepage": "https://github.com/sebastianbergmann/version", 2819 "homepage": "https://github.com/sebastianbergmann/version",
2607 - "time": "2015-06-21 13:59:46" 2820 + "time": "2016-02-04 12:56:52"
  2821 + },
  2822 + {
  2823 + "name": "studio-42/elfinder",
  2824 + "version": "2.1.x-dev",
  2825 + "source": {
  2826 + "type": "git",
  2827 + "url": "https://github.com/Studio-42/elFinder.git",
  2828 + "reference": "2ec345f7044052184a7d9faf1dc15ad82b503e9f"
  2829 + },
  2830 + "dist": {
  2831 + "type": "zip",
  2832 + "url": "https://api.github.com/repos/Studio-42/elFinder/zipball/2ec345f7044052184a7d9faf1dc15ad82b503e9f",
  2833 + "reference": "2ec345f7044052184a7d9faf1dc15ad82b503e9f",
  2834 + "shasum": ""
  2835 + },
  2836 + "require": {
  2837 + "php": ">=5.2"
  2838 + },
  2839 + "suggest": {
  2840 + "barryvdh/elfinder-flysystem-driver": "VolumeDriver for elFinder to use Flysystem as a root.",
  2841 + "dropbox-php/dropbox-php": "elFinder Volume driver `Dropbox` require `dropbox-php/dropbox-php`.",
  2842 + "nao-pon/flysystem-google-drive": "require in GoogleDrive network volume mounting.",
  2843 + "pear/http_oauth": "dropbox-php require `pear/http_oauth` or `PHP OAuth extension`."
  2844 + },
  2845 + "type": "library",
  2846 + "autoload": {
  2847 + "classmap": [
  2848 + "php"
  2849 + ]
  2850 + },
  2851 + "notification-url": "https://packagist.org/downloads/",
  2852 + "license": [
  2853 + "BSD-3-Clause"
  2854 + ],
  2855 + "authors": [
  2856 + {
  2857 + "name": "Dmitry Levashov",
  2858 + "email": "dio@std42.ru",
  2859 + "homepage": "http://std42.ru"
  2860 + },
  2861 + {
  2862 + "name": "Troex Nevelin",
  2863 + "email": "troex@fury.scancode.ru",
  2864 + "homepage": "http://std42.ru"
  2865 + },
  2866 + {
  2867 + "name": "Naoki Sawada",
  2868 + "email": "hypweb@gmail.com",
  2869 + "homepage": "http://xoops.hypweb.net"
  2870 + },
  2871 + {
  2872 + "name": "Community contributions",
  2873 + "homepage": "https://github.com/Studio-42/elFinder/contributors"
  2874 + }
  2875 + ],
  2876 + "description": "File manager for web",
  2877 + "homepage": "http://elfinder.org",
  2878 + "time": "2016-05-30 08:20:52"
2608 }, 2879 },
2609 { 2880 {
2610 "name": "swiftmailer/swiftmailer", 2881 "name": "swiftmailer/swiftmailer",
@@ -2612,12 +2883,12 @@ @@ -2612,12 +2883,12 @@
2612 "source": { 2883 "source": {
2613 "type": "git", 2884 "type": "git",
2614 "url": "https://github.com/swiftmailer/swiftmailer.git", 2885 "url": "https://github.com/swiftmailer/swiftmailer.git",
2615 - "reference": "fffbc0e2a7e376dbb0a4b5f2ff6847330f20ccf9" 2886 + "reference": "1460e98b53d2f916f1b4123069c96c90844a1a4d"
2616 }, 2887 },
2617 "dist": { 2888 "dist": {
2618 "type": "zip", 2889 "type": "zip",
2619 - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/fffbc0e2a7e376dbb0a4b5f2ff6847330f20ccf9",  
2620 - "reference": "fffbc0e2a7e376dbb0a4b5f2ff6847330f20ccf9", 2890 + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/1460e98b53d2f916f1b4123069c96c90844a1a4d",
  2891 + "reference": "1460e98b53d2f916f1b4123069c96c90844a1a4d",
2621 "shasum": "" 2892 "shasum": ""
2622 }, 2893 },
2623 "require": { 2894 "require": {
@@ -2657,7 +2928,7 @@ @@ -2657,7 +2928,7 @@
2657 "mail", 2928 "mail",
2658 "mailer" 2929 "mailer"
2659 ], 2930 ],
2660 - "time": "2016-01-03 15:42:47" 2931 + "time": "2016-05-11 12:36:48"
2661 }, 2932 },
2662 { 2933 {
2663 "name": "symfony/browser-kit", 2934 "name": "symfony/browser-kit",
@@ -2722,12 +2993,12 @@ @@ -2722,12 +2993,12 @@
2722 "source": { 2993 "source": {
2723 "type": "git", 2994 "type": "git",
2724 "url": "https://github.com/symfony/console.git", 2995 "url": "https://github.com/symfony/console.git",
2725 - "reference": "8e6292db6e77aa7fec40aaf12ae4bdee6b5b8007" 2996 + "reference": "30beaa1b3ccdc0074baaf910a17cdae80df1e32d"
2726 }, 2997 },
2727 "dist": { 2998 "dist": {
2728 "type": "zip", 2999 "type": "zip",
2729 - "url": "https://api.github.com/repos/symfony/console/zipball/8e6292db6e77aa7fec40aaf12ae4bdee6b5b8007",  
2730 - "reference": "8e6292db6e77aa7fec40aaf12ae4bdee6b5b8007", 3000 + "url": "https://api.github.com/repos/symfony/console/zipball/30beaa1b3ccdc0074baaf910a17cdae80df1e32d",
  3001 + "reference": "30beaa1b3ccdc0074baaf910a17cdae80df1e32d",
2731 "shasum": "" 3002 "shasum": ""
2732 }, 3003 },
2733 "require": { 3004 "require": {
@@ -2774,7 +3045,7 @@ @@ -2774,7 +3045,7 @@
2774 ], 3045 ],
2775 "description": "Symfony Console Component", 3046 "description": "Symfony Console Component",
2776 "homepage": "https://symfony.com", 3047 "homepage": "https://symfony.com",
2777 - "time": "2016-04-20 18:53:54" 3048 + "time": "2016-05-30 06:58:27"
2778 }, 3049 },
2779 { 3050 {
2780 "name": "symfony/css-selector", 3051 "name": "symfony/css-selector",
@@ -2891,12 +3162,12 @@ @@ -2891,12 +3162,12 @@
2891 "source": { 3162 "source": {
2892 "type": "git", 3163 "type": "git",
2893 "url": "https://github.com/symfony/event-dispatcher.git", 3164 "url": "https://github.com/symfony/event-dispatcher.git",
2894 - "reference": "17b04e6b1ede45b57d3ad5146abe50df6c3968b4" 3165 + "reference": "807dde98589f9b2b00624dca326740380d78dbbc"
2895 }, 3166 },
2896 "dist": { 3167 "dist": {
2897 "type": "zip", 3168 "type": "zip",
2898 - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/17b04e6b1ede45b57d3ad5146abe50df6c3968b4",  
2899 - "reference": "17b04e6b1ede45b57d3ad5146abe50df6c3968b4", 3169 + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/807dde98589f9b2b00624dca326740380d78dbbc",
  3170 + "reference": "807dde98589f9b2b00624dca326740380d78dbbc",
2900 "shasum": "" 3171 "shasum": ""
2901 }, 3172 },
2902 "require": { 3173 "require": {
@@ -2943,7 +3214,7 @@ @@ -2943,7 +3214,7 @@
2943 ], 3214 ],
2944 "description": "Symfony EventDispatcher Component", 3215 "description": "Symfony EventDispatcher Component",
2945 "homepage": "https://symfony.com", 3216 "homepage": "https://symfony.com",
2946 - "time": "2016-04-12 18:09:53" 3217 + "time": "2016-05-05 06:56:13"
2947 }, 3218 },
2948 { 3219 {
2949 "name": "symfony/finder", 3220 "name": "symfony/finder",
@@ -2951,12 +3222,12 @@ @@ -2951,12 +3222,12 @@
2951 "source": { 3222 "source": {
2952 "type": "git", 3223 "type": "git",
2953 "url": "https://github.com/symfony/finder.git", 3224 "url": "https://github.com/symfony/finder.git",
2954 - "reference": "c54e407b35bc098916704e9fd090da21da4c4f52" 3225 + "reference": "39e5f3d533d07b5416b9d7aad53a27f939d4f811"
2955 }, 3226 },
2956 "dist": { 3227 "dist": {
2957 "type": "zip", 3228 "type": "zip",
2958 - "url": "https://api.github.com/repos/symfony/finder/zipball/c54e407b35bc098916704e9fd090da21da4c4f52",  
2959 - "reference": "c54e407b35bc098916704e9fd090da21da4c4f52", 3229 + "url": "https://api.github.com/repos/symfony/finder/zipball/39e5f3d533d07b5416b9d7aad53a27f939d4f811",
  3230 + "reference": "39e5f3d533d07b5416b9d7aad53a27f939d4f811",
2960 "shasum": "" 3231 "shasum": ""
2961 }, 3232 },
2962 "require": { 3233 "require": {
@@ -2992,7 +3263,7 @@ @@ -2992,7 +3263,7 @@
2992 ], 3263 ],
2993 "description": "Symfony Finder Component", 3264 "description": "Symfony Finder Component",
2994 "homepage": "https://symfony.com", 3265 "homepage": "https://symfony.com",
2995 - "time": "2016-03-10 11:13:05" 3266 + "time": "2016-05-13 18:03:36"
2996 }, 3267 },
2997 { 3268 {
2998 "name": "symfony/polyfill-mbstring", 3269 "name": "symfony/polyfill-mbstring",
@@ -3000,12 +3271,12 @@ @@ -3000,12 +3271,12 @@
3000 "source": { 3271 "source": {
3001 "type": "git", 3272 "type": "git",
3002 "url": "https://github.com/symfony/polyfill-mbstring.git", 3273 "url": "https://github.com/symfony/polyfill-mbstring.git",
3003 - "reference": "6bab34bbffa5f5ac079fdc4a68e143f158e87b7d" 3274 + "reference": "67f0d2b927796648c5c38cedb7a2c8f1cf14e7dc"
3004 }, 3275 },
3005 "dist": { 3276 "dist": {
3006 "type": "zip", 3277 "type": "zip",
3007 - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6bab34bbffa5f5ac079fdc4a68e143f158e87b7d",  
3008 - "reference": "6bab34bbffa5f5ac079fdc4a68e143f158e87b7d", 3278 + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/67f0d2b927796648c5c38cedb7a2c8f1cf14e7dc",
  3279 + "reference": "67f0d2b927796648c5c38cedb7a2c8f1cf14e7dc",
3009 "shasum": "" 3280 "shasum": ""
3010 }, 3281 },
3011 "require": { 3282 "require": {
@@ -3017,7 +3288,7 @@ @@ -3017,7 +3288,7 @@
3017 "type": "library", 3288 "type": "library",
3018 "extra": { 3289 "extra": {
3019 "branch-alias": { 3290 "branch-alias": {
3020 - "dev-master": "1.1-dev" 3291 + "dev-master": "1.2-dev"
3021 } 3292 }
3022 }, 3293 },
3023 "autoload": { 3294 "autoload": {
@@ -3051,7 +3322,7 @@ @@ -3051,7 +3322,7 @@
3051 "portable", 3322 "portable",
3052 "shim" 3323 "shim"
3053 ], 3324 ],
3054 - "time": "2016-04-15 07:04:29" 3325 + "time": "2016-05-26 01:13:28"
3055 }, 3326 },
3056 { 3327 {
3057 "name": "symfony/yaml", 3328 "name": "symfony/yaml",
@@ -3059,12 +3330,12 @@ @@ -3059,12 +3330,12 @@
3059 "source": { 3330 "source": {
3060 "type": "git", 3331 "type": "git",
3061 "url": "https://github.com/symfony/yaml.git", 3332 "url": "https://github.com/symfony/yaml.git",
3062 - "reference": "0047c8366744a16de7516622c5b7355336afae96" 3333 + "reference": "06766b41126fbe4e4a24943cdd366eb24a1b6d17"
3063 }, 3334 },
3064 "dist": { 3335 "dist": {
3065 "type": "zip", 3336 "type": "zip",
3066 - "url": "https://api.github.com/repos/symfony/yaml/zipball/0047c8366744a16de7516622c5b7355336afae96",  
3067 - "reference": "0047c8366744a16de7516622c5b7355336afae96", 3337 + "url": "https://api.github.com/repos/symfony/yaml/zipball/06766b41126fbe4e4a24943cdd366eb24a1b6d17",
  3338 + "reference": "06766b41126fbe4e4a24943cdd366eb24a1b6d17",
3068 "shasum": "" 3339 "shasum": ""
3069 }, 3340 },
3070 "require": { 3341 "require": {
@@ -3100,7 +3371,7 @@ @@ -3100,7 +3371,7 @@
3100 ], 3371 ],
3101 "description": "Symfony Yaml Component", 3372 "description": "Symfony Yaml Component",
3102 "homepage": "https://symfony.com", 3373 "homepage": "https://symfony.com",
3103 - "time": "2016-03-04 07:55:57" 3374 + "time": "2016-05-24 10:03:10"
3104 }, 3375 },
3105 { 3376 {
3106 "name": "yiisoft/yii2", 3377 "name": "yiisoft/yii2",
@@ -3108,12 +3379,12 @@ @@ -3108,12 +3379,12 @@
3108 "source": { 3379 "source": {
3109 "type": "git", 3380 "type": "git",
3110 "url": "https://github.com/yiisoft/yii2-framework.git", 3381 "url": "https://github.com/yiisoft/yii2-framework.git",
3111 - "reference": "a1bd20682516fa5a6f2f0518f15197cf6437998a" 3382 + "reference": "e9cc989c9c3de3326892f9205bfc17e61347fcdc"
3112 }, 3383 },
3113 "dist": { 3384 "dist": {
3114 "type": "zip", 3385 "type": "zip",
3115 - "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/a1bd20682516fa5a6f2f0518f15197cf6437998a",  
3116 - "reference": "a1bd20682516fa5a6f2f0518f15197cf6437998a", 3386 + "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/e9cc989c9c3de3326892f9205bfc17e61347fcdc",
  3387 + "reference": "e9cc989c9c3de3326892f9205bfc17e61347fcdc",
3117 "shasum": "" 3388 "shasum": ""
3118 }, 3389 },
3119 "require": { 3390 "require": {
@@ -3194,7 +3465,7 @@ @@ -3194,7 +3465,7 @@
3194 "framework", 3465 "framework",
3195 "yii2" 3466 "yii2"
3196 ], 3467 ],
3197 - "time": "2016-04-28 01:02:17" 3468 + "time": "2016-05-26 21:41:47"
3198 }, 3469 },
3199 { 3470 {
3200 "name": "yiisoft/yii2-bootstrap", 3471 "name": "yiisoft/yii2-bootstrap",
@@ -3521,12 +3792,12 @@ @@ -3521,12 +3792,12 @@
3521 "source": { 3792 "source": {
3522 "type": "git", 3793 "type": "git",
3523 "url": "https://github.com/fzaninotto/Faker.git", 3794 "url": "https://github.com/fzaninotto/Faker.git",
3524 - "reference": "6abfc0cec5648e6ccc6a8053533383ecaf4dbdb4" 3795 + "reference": "df56110269ffaaea78295290c74d0bd1b3ac176f"
3525 }, 3796 },
3526 "dist": { 3797 "dist": {
3527 "type": "zip", 3798 "type": "zip",
3528 - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/6abfc0cec5648e6ccc6a8053533383ecaf4dbdb4",  
3529 - "reference": "6abfc0cec5648e6ccc6a8053533383ecaf4dbdb4", 3799 + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/df56110269ffaaea78295290c74d0bd1b3ac176f",
  3800 + "reference": "df56110269ffaaea78295290c74d0bd1b3ac176f",
3530 "shasum": "" 3801 "shasum": ""
3531 }, 3802 },
3532 "require": { 3803 "require": {
@@ -3563,7 +3834,7 @@ @@ -3563,7 +3834,7 @@
3563 "faker", 3834 "faker",
3564 "fixtures" 3835 "fixtures"
3565 ], 3836 ],
3566 - "time": "2016-04-28 06:53:57" 3837 + "time": "2016-05-19 20:16:37"
3567 }, 3838 },
3568 { 3839 {
3569 "name": "phpspec/php-diff", 3840 "name": "phpspec/php-diff",
@@ -3703,12 +3974,12 @@ @@ -3703,12 +3974,12 @@
3703 "source": { 3974 "source": {
3704 "type": "git", 3975 "type": "git",
3705 "url": "https://github.com/yiisoft/yii2-gii.git", 3976 "url": "https://github.com/yiisoft/yii2-gii.git",
3706 - "reference": "62eddfcbf377353777742b3ceaf2b75dc81178e3" 3977 + "reference": "ad215b7f8c679e11e70ff3dc29c7306f28cef576"
3707 }, 3978 },
3708 "dist": { 3979 "dist": {
3709 "type": "zip", 3980 "type": "zip",
3710 - "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/62eddfcbf377353777742b3ceaf2b75dc81178e3",  
3711 - "reference": "62eddfcbf377353777742b3ceaf2b75dc81178e3", 3981 + "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/ad215b7f8c679e11e70ff3dc29c7306f28cef576",
  3982 + "reference": "ad215b7f8c679e11e70ff3dc29c7306f28cef576",
3712 "shasum": "" 3983 "shasum": ""
3713 }, 3984 },
3714 "require": { 3985 "require": {
@@ -3748,7 +4019,7 @@ @@ -3748,7 +4019,7 @@
3748 "gii", 4019 "gii",
3749 "yii2" 4020 "yii2"
3750 ], 4021 ],
3751 - "time": "2016-04-21 13:19:47" 4022 + "time": "2016-05-12 20:54:42"
3752 } 4023 }
3753 ], 4024 ],
3754 "aliases": [], 4025 "aliases": [],
frontend/controllers/CompanyController.php
  Show/Hide comments   View file @5224698
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
35 35
36 public function afterAction($action, $result) 36 public function afterAction($action, $result)
37 { 37 {
  38 + $result = parent::afterAction($action, $result);
38 if(!empty( $action->controller->actionParams[ 'company_id' ] )) { 39 if(!empty( $action->controller->actionParams[ 'company_id' ] )) {
39 $company_id = $action->controller->actionParams[ 'company_id' ]; 40 $company_id = $action->controller->actionParams[ 'company_id' ];
40 $user = User::findOne($company_id); 41 $user = User::findOne($company_id);
@@ -52,10 +53,12 @@ @@ -52,10 +53,12 @@
52 } 53 }
53 } 54 }
54 } 55 }
55 - $user->userInfo->updateCounters([ 'view_count' => 1 ]); 56 + if($user->id != \Yii::$app->user->id) {
  57 + $user->userInfo->updateCounters([ 'view_count' => 1 ]);
  58 + }
56 } 59 }
57 } 60 }
58 - return parent::afterAction($action, $result); 61 + return $result;
59 } 62 }
60 63
61 /** 64 /**
frontend/controllers/PerformerController.php
  Show/Hide comments   View file @5224698
@@ -269,7 +269,7 @@ @@ -269,7 +269,7 @@
269 $blog = new ActiveDataProvider([ 269 $blog = new ActiveDataProvider([
270 'query' => $user->getBlog(), 270 'query' => $user->getBlog(),
271 'pagination' => new Pagination([ 271 'pagination' => new Pagination([
272 - 'pageSize' => 1, 272 + 'pageSize' => 5,
273 ]), 273 ]),
274 'sort' => new Sort([ 274 'sort' => new Sort([
275 'defaultOrder' => [ 275 'defaultOrder' => [
frontend/controllers/TenderController.php
  Show/Hide comments   View file @5224698
@@ -6,26 +6,10 @@ @@ -6,26 +6,10 @@
6 use common\models\Project; 6 use common\models\Project;
7 use common\modules\comment\models\CommentProject; 7 use common\modules\comment\models\CommentProject;
8 use Yii; 8 use Yii;
9 - use common\models\LoginForm;  
10 - use frontend\models\PasswordResetRequestForm;  
11 - use frontend\models\ResetPasswordForm;  
12 - use frontend\models\SignupForm;  
13 - use frontend\models\ContactForm;  
14 - use frontend\models\Options;  
15 - use frontend\models\OptionValues;  
16 - use yii\base\InvalidParamException;  
17 use yii\helpers\Html; 9 use yii\helpers\Html;
18 - use yii\web\BadRequestHttpException;  
19 use yii\web\Controller; 10 use yii\web\Controller;
20 - use yii\filters\VerbFilter;  
21 use yii\filters\AccessControl; 11 use yii\filters\AccessControl;
22 - use frontend\models\OptionsToValues;  
23 - use yii\validators\EmailValidator;  
24 use common\models\User; 12 use common\models\User;
25 - use yii\helpers\VarDumper;  
26 - use common\models\Page;  
27 - use frontend\models\Option;  
28 - use common\models\Social;  
29 use yii\web\NotFoundHttpException; 13 use yii\web\NotFoundHttpException;
30 14
31 /** 15 /**
frontend/models/SearchPerformerForm.php
  Show/Hide comments   View file @5224698
@@ -242,18 +242,18 @@ @@ -242,18 +242,18 @@
242 'or', 242 'or',
243 [ 243 [
244 'like', 244 'like',
245 - 'user.firstname',  
246 - $this->search, 245 + 'LOWER("user"."firstname")',
  246 + mb_strtolower($this->search),
247 ], 247 ],
248 [ 248 [
249 'like', 249 'like',
250 - 'user.lastname',  
251 - $this->search, 250 + 'LOWER("user"."lastname")',
  251 + mb_strtolower($this->search),
252 ], 252 ],
253 [ 253 [
254 'like', 254 'like',
255 - 'company_info.name',  
256 - $this->search, 255 + 'LOWER("company_info"."name")',
  256 + mb_strtolower($this->search),
257 ], 257 ],
258 ]); 258 ]);
259 } 259 }
frontend/views/accounts/_blog_form.php
  Show/Hide comments   View file @5224698
@@ -38,6 +38,7 @@ use yii\helpers\Html; @@ -38,6 +38,7 @@ use yii\helpers\Html;
38 'editorOptions' => ElFinder::ckeditorOptions('elfinder',[ 38 'editorOptions' => ElFinder::ckeditorOptions('elfinder',[
39 'preset' => 'full', //разработанны стандартные настройки basic, standard, full данную возможность не обязательно использовать 39 'preset' => 'full', //разработанны стандартные настройки basic, standard, full данную возможность не обязательно использовать
40 'inline' => false, //по умолчанию false]), 40 'inline' => false, //по умолчанию false]),
  41 + 'allowedContent' => true,
41 'filebrowserUploadUrl'=>Yii::$app->getUrlManager()->createUrl('file/uploader/images-upload') 42 'filebrowserUploadUrl'=>Yii::$app->getUrlManager()->createUrl('file/uploader/images-upload')
42 ] 43 ]
43 ) 44 )
frontend/views/accounts/_job_form.php
  Show/Hide comments   View file @5224698
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 * @var integer $index 3 * @var integer $index
4 */ 4 */
5 use common\models\Job; 5 use common\models\Job;
  6 + use mihaildev\ckeditor\CKEditor;
6 use yii\helpers\Html; 7 use yii\helpers\Html;
7 use yii\jui\DatePicker; 8 use yii\jui\DatePicker;
8 use yii\widgets\ActiveForm; 9 use yii\widgets\ActiveForm;
@@ -72,6 +73,14 @@ @@ -72,6 +73,14 @@
72 </div> 73 </div>
73 </div> 74 </div>
74 75
  76 + <div class="input-blocks-wrapper">
  77 + <div class="input-blocks">
  78 + <?= $form->field($model, '[' . $index . ']achievement')
  79 + ->label('Достижения')
  80 + ->widget(CKEditor::className(), [ 'editorOptions' => [ 'preset' => 'basic' ] ]); ?>
  81 + </div>
  82 + </div>
  83 +
75 <div class="input-blocks-wrapper admin-quantity-project"> 84 <div class="input-blocks-wrapper admin-quantity-project">
76 <div class="input-blocks"> 85 <div class="input-blocks">
77 <?= $form->field($model, '[' . $index . ']total_count') 86 <?= $form->field($model, '[' . $index . ']total_count')
frontend/views/accounts/general.php
  Show/Hide comments   View file @5224698
@@ -235,7 +235,7 @@ @@ -235,7 +235,7 @@
235 </div> 235 </div>
236 236
237 237
238 - <div class="style border-general"> 238 + <div class="style border-general general_avatar-wr">
239 <div class="input-blocks-wrapper admin-avatar"> 239 <div class="input-blocks-wrapper admin-avatar">
240 <div class="gen-admin-title">Аватар</div> 240 <div class="gen-admin-title">Аватар</div>
241 <div class="file-help-1"> 241 <div class="file-help-1">
@@ -274,6 +274,7 @@ @@ -274,6 +274,7 @@
274 'height' => 380, 274 'height' => 380,
275 ], 275 ],
276 ], 276 ],
  277 + 'remover' => true,
277 'multi' => false, 278 'multi' => false,
278 'gallery' => $user_info->poster, 279 'gallery' => $user_info->poster,
279 'name' => 'Выбрать файл', 280 'name' => 'Выбрать файл',
frontend/views/chat/message.php
  Show/Hide comments   View file @5224698
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 ]); 38 ]);
39 ?> 39 ?>
40 </div> 40 </div>
41 - <div class="cab-mes-read-cont-com"><?= count($chat->interlocutor->comments) ?> отзывов</div> 41 + <div class="cab-mes-read-cont-com"><?= count($chat->interlocutor->comments) ?> мнений</div>
42 <div class="cab-mes-read-cont-soc"> 42 <div class="cab-mes-read-cont-soc">
43 <?= Html::a(Html::img('/images/ico-fb.png'), "{$chat->interlocutor->userInfo->social_fb}", [ 'target' => '_blank' ]) ?> 43 <?= Html::a(Html::img('/images/ico-fb.png'), "{$chat->interlocutor->userInfo->social_fb}", [ 'target' => '_blank' ]) ?>
44 44
frontend/views/company/_company_common_review.php
  Show/Hide comments   View file @5224698
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 } 22 }
23 ?> 23 ?>
24 <div class="company-performer-comments-autor"> 24 <div class="company-performer-comments-autor">
25 - Отзыв от: 25 + Мнение от:
26 <?php 26 <?php
27 $model->getAuthor(' (Гость)'); 27 $model->getAuthor(' (Гость)');
28 ?> 28 ?>
frontend/views/company/_company_team_review.php
  Show/Hide comments   View file @5224698
@@ -29,11 +29,11 @@ @@ -29,11 +29,11 @@
29 <?php 29 <?php
30 if(!empty( $model->user_id )) { 30 if(!empty( $model->user_id )) {
31 ?> 31 ?>
32 - <div class="company-performer-comments-autor">Отзыв от: <?= $model->author ?></div> 32 + <div class="company-performer-comments-autor">Мнение от: <?= $model->author ?></div>
33 <?php 33 <?php
34 } else { 34 } else {
35 ?> 35 ?>
36 - <div class="company-performer-comments-autor">Отзыв от: <?= $model->user_name ?></div> 36 + <div class="company-performer-comments-autor">Мнение от: <?= $model->user_name ?></div>
37 <?php 37 <?php
38 } 38 }
39 ?> 39 ?>
frontend/views/company/common.php
  Show/Hide comments   View file @5224698
@@ -258,7 +258,7 @@ @@ -258,7 +258,7 @@
258 <div class="section-box-19"> 258 <div class="section-box-19">
259 <div class="box-wr"> 259 <div class="box-wr">
260 <div class="box-all"> 260 <div class="box-all">
261 - <div class="company-performer-comm-title style">Отзывов: <?= $commentProvider->totalCount ?></div> 261 + <div class="company-performer-comm-title style">Мнений: <?= $commentProvider->totalCount ?></div>
262 <?php 262 <?php
263 echo ListView::widget([ 263 echo ListView::widget([
264 'dataProvider' => $commentProvider, 264 'dataProvider' => $commentProvider,
@@ -273,7 +273,7 @@ @@ -273,7 +273,7 @@
273 ]); 273 ]);
274 ?> 274 ?>
275 <div class="company-performer-comm-see-all-butt style"> 275 <div class="company-performer-comm-see-all-butt style">
276 - <?= Html::a('Читать все отзывы', [ 276 + <?= Html::a('Читать все мнения', [
277 'company/review', 277 'company/review',
278 'company_id' => $company->id, 278 'company_id' => $company->id,
279 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL, 279 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
frontend/views/company/team.php
  Show/Hide comments   View file @5224698
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <div class="section-box-19"> 37 <div class="section-box-19">
38 <div class="box-wr"> 38 <div class="box-wr">
39 <div class="box-all"> 39 <div class="box-all">
40 - <div class="company-performer-comm-title style">Отзывов: <?= $comments->totalCount ?></div> 40 + <div class="company-performer-comm-title style">Мнений: <?= $comments->totalCount ?></div>
41 <?= ListView::widget([ 41 <?= ListView::widget([
42 'dataProvider' => $comments, 42 'dataProvider' => $comments,
43 'itemView' => '_company_team_review', 43 'itemView' => '_company_team_review',
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 ], 50 ],
51 ]) ?> 51 ]) ?>
52 <div class="company-performer-comm-see-all-butt style"> 52 <div class="company-performer-comm-see-all-butt style">
53 - <?= Html::a('Читать все отзывы', [ 53 + <?= Html::a('Читать все мнения', [
54 'company/review', 54 'company/review',
55 'company_id' => $company->id, 55 'company_id' => $company->id,
56 ]) ?> 56 ]) ?>
frontend/views/layouts/performer.php
  Show/Hide comments   View file @5224698
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL, 80 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
81 ], 81 ],
82 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false, 82 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false,
83 - 'active' => preg_match('/^portfolio.*$/', $this->context->action->id) ? true : false, 83 + 'active' => preg_match('/^portfolio.*$/', $this->context->action->id) ? true : false,
84 ], 84 ],
85 [ 85 [
86 'label' => 'Заказанные работы', 86 'label' => 'Заказанные работы',
@@ -90,15 +90,16 @@ @@ -90,15 +90,16 @@
90 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL, 90 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
91 ], 91 ],
92 'visible' => ( !empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer' ) ? true : false, 92 'visible' => ( !empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer' ) ? true : false,
93 - 'active' => preg_match('/^projects.*$/', $this->context->action->id) ? true : false, 93 + 'active' => preg_match('/^projects.*$/', $this->context->action->id) ? true : false,
94 ], 94 ],
95 [ 95 [
96 - 'label' => 'Блог',  
97 - 'url' => [ 96 + 'label' => 'Блог',
  97 + 'url' => [
98 'performer/blog-list', 98 'performer/blog-list',
99 'performer_id' => $this->params[ 'user' ]->id, 99 'performer_id' => $this->params[ 'user' ]->id,
100 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL, 100 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
101 ], 101 ],
  102 + 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false,
102 'active' => preg_match('/^blog.*$/', $this->context->action->id) ? true : false, 103 'active' => preg_match('/^blog.*$/', $this->context->action->id) ? true : false,
103 ], 104 ],
104 [ 105 [
@@ -116,6 +117,7 @@ @@ -116,6 +117,7 @@
116 'performer_id' => $this->params[ 'user' ]->id, 117 'performer_id' => $this->params[ 'user' ]->id,
117 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL, 118 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
118 ], 119 ],
  120 + 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false,
119 ], 121 ],
120 [ 122 [
121 'label' => 'Галерея', 123 'label' => 'Галерея',
@@ -124,6 +126,7 @@ @@ -124,6 +126,7 @@
124 'performer_id' => $this->params[ 'user' ]->id, 126 'performer_id' => $this->params[ 'user' ]->id,
125 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL, 127 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
126 ], 128 ],
  129 + 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false,
127 ], 130 ],
128 ], 131 ],
129 ]); 132 ]);
@@ -143,7 +146,7 @@ @@ -143,7 +146,7 @@
143 <li class="activejob"> 146 <li class="activejob">
144 <?php 147 <?php
145 if($this->params[ 'user' ]->userInfo->is_freelancer xor $this->params[ 'user' ]->userInfo->is_customer) { 148 if($this->params[ 'user' ]->userInfo->is_freelancer xor $this->params[ 'user' ]->userInfo->is_customer) {
146 - if(!empty($this->params[ 'type' ]) && $this->params[ 'type' ] == 'customer') { 149 + if(!empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer') {
147 echo Html::tag('span', 'Заказчик', [ 'class' => 'activejob_span' ]); 150 echo Html::tag('span', 'Заказчик', [ 'class' => 'activejob_span' ]);
148 } else { 151 } else {
149 echo Html::tag('span', 'Исполнитель', [ 'class' => 'activejob_span' ]); 152 echo Html::tag('span', 'Исполнитель', [ 'class' => 'activejob_span' ]);
@@ -248,19 +251,21 @@ @@ -248,19 +251,21 @@
248 ?> 251 ?>
249 </div> 252 </div>
250 </li> 253 </li>
251 - <li>  
252 - <img src="/images/sidebar-ico/ico-10.png" alt=""/>  
253 - <div class="sidebarvievstxt">  
254 - <span class="sidebar-views-txt">Трудовой стаж:<br/></span>  
255 - <?php  
256 - if(!empty( $this->params[ 'user' ]->userInfo->experience )) {  
257 - echo 'С ' . $this->params[ 'user' ]->userInfo->experience . ' года';  
258 - } else {  
259 - echo 'Не указано';  
260 - } 254 + <?php
  255 + if(!empty( $this->params[ 'user' ]->userInfo->experience )) {
261 ?> 256 ?>
262 - </div>  
263 - </li> 257 + <li>
  258 + <img src="/images/sidebar-ico/ico-10.png" alt=""/>
  259 + <div class="sidebarvievstxt">
  260 + <span class="sidebar-views-txt">Трудовой стаж:<br/></span>
  261 + <?php
  262 + echo 'С ' . $this->params[ 'user' ]->userInfo->experience . ' года';
  263 + ?>
  264 + </div>
  265 + </li>
  266 + <?php
  267 + }
  268 + ?>
264 <?php 269 <?php
265 // Predefined in DB variable rank will be used further 270 // Predefined in DB variable rank will be used further
266 if(!empty( $this->params[ 'user' ]->userInfo->member )) { 271 if(!empty( $this->params[ 'user' ]->userInfo->member )) {
frontend/views/patrial/show_site.php
  Show/Hide comments   View file @5224698
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div class="style"> 3 <div class="style">
4 <div class="profile-site"> 4 <div class="profile-site">
5 <img src="/images/ico-site.png" alt=""/> 5 <img src="/images/ico-site.png" alt=""/>
6 - <a href="http://<?= $site['site']?>" target="_blank"><?= $site['site']?></a> 6 + <a href="<?= $site['site']?>" target="_blank"><?= $site['site']?></a>
7 </div> 7 </div>
8 </div> 8 </div>
9 <?php endif; ?> 9 <?php endif; ?>
frontend/views/performer/common.php
  Show/Hide comments   View file @5224698
@@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
2 2
3 use common\models\User; 3 use common\models\User;
4 use kartik\rating\StarRating; 4 use kartik\rating\StarRating;
5 - use yii\helpers\ArrayHelper;  
6 use \yii\helpers\Html; 5 use \yii\helpers\Html;
7 6
8 /* @var yii\web\View $this 7 /* @var yii\web\View $this
frontend/views/performer/workplace.php
  Show/Hide comments   View file @5224698
@@ -30,6 +30,10 @@ @@ -30,6 +30,10 @@
30 ?> 30 ?>
31 </div> 31 </div>
32 <div class="workplace-experience-post-vacancy"><?= $job->position ?></div> 32 <div class="workplace-experience-post-vacancy"><?= $job->position ?></div>
  33 + <div class="workplace-experience-post-vacancy">
  34 + <span>Достижения:</span>
  35 + <p><?=$job->achievement?></p>
  36 + </div>
33 </div> 37 </div>
34 <?php endforeach; ?> 38 <?php endforeach; ?>
35 </div> 39 </div>
frontend/views/search/_customer_list_view.php
  Show/Hide comments   View file @5224698
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 ?> 60 ?>
61 61
62 <div class="search_perform-stars-txt"> 62 <div class="search_perform-stars-txt">
63 - <?= count($model->comments) ?> отзывов 63 + <?= count($model->comments) ?> мнений
64 <?php 64 <?php
65 if(!empty( $model->userInfo->city )) { 65 if(!empty( $model->userInfo->city )) {
66 echo ", {$model->userInfo->city}"; 66 echo ", {$model->userInfo->city}";
frontend/views/search/_performer_list_view.php
  Show/Hide comments   View file @5224698
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 ]); 73 ]);
74 ?> 74 ?>
75 </div> 75 </div>
76 - <div class="search-worker-blocks-atr">30 отзывов, <?= $model->userInfo->city ?></div> 76 + <div class="search-worker-blocks-atr"><?=count($model->comments)?> мнений, <?= $model->userInfo->city ?></div>
77 </div> 77 </div>
78 <div class="search-worker-blocks-title-wr"> 78 <div class="search-worker-blocks-title-wr">
79 <div class="search-worker-blocks-status"> 79 <div class="search-worker-blocks-status">
frontend/views/search/customer.php
  Show/Hide comments   View file @5224698
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 ->widget(SliderInput::className(), [ 72 ->widget(SliderInput::className(), [
73 'clientOptions' => [ 73 'clientOptions' => [
74 'min' => 0, 74 'min' => 0,
75 - 'max' => 5, 75 + 'max' => 10,
76 'step' => 0.5, 76 'step' => 0.5,
77 ], 77 ],
78 'clientEvents' => [ 78 'clientEvents' => [
frontend/views/search/performer.php
  Show/Hide comments   View file @5224698
@@ -133,7 +133,7 @@ @@ -133,7 +133,7 @@
133 <?= $form->field($model, 'additional_parameters') 133 <?= $form->field($model, 'additional_parameters')
134 ->checkboxList([ 134 ->checkboxList([
135 'with_portfolio' => 'Только с портфолио', 135 'with_portfolio' => 'Только с портфолио',
136 - 'with_comments' => 'Только с отзывами', 136 + 'with_comments' => 'Только с мнениями',
137 'only_free' => 'Только свободные', 137 'only_free' => 'Только свободные',
138 ], [ 138 ], [
139 'item' => function($index, $label, $name, $checked, $value) { 139 'item' => function($index, $label, $name, $checked, $value) {
frontend/views/site/forms-modal-fav.php
  Show/Hide comments   View file @5224698
@@ -18,6 +18,6 @@ @@ -18,6 +18,6 @@
18 <img src="/images/sidebar-ico/ico-16.png" alt=""/><span>Добавлен</span></div> 18 <img src="/images/sidebar-ico/ico-16.png" alt=""/><span>Добавлен</span></div>
19 </div> 19 </div>
20 <div class="res_form_line"></div> 20 <div class="res_form_line"></div>
21 - <div class="page-favorite"><?= Html::a('Перейти на страницу закладок', [ '/accounts/bookmarks' ]) ?></div> 21 + <div class="page-favorite"><?= Html::a('Перейти на страницу закладок', [ '/bookmarks' ]) ?></div>
22 </div> 22 </div>
23 </div> 23 </div>
24 \ No newline at end of file 24 \ No newline at end of file
frontend/views/site/index.php
  Show/Hide comments   View file @5224698
@@ -115,19 +115,19 @@ @@ -115,19 +115,19 @@
115 <div class="federation-home-blocks"> 115 <div class="federation-home-blocks">
116 <div class="federation-home-ico"><img src="/images/ico-fed-1.png" alt=""/> 116 <div class="federation-home-ico"><img src="/images/ico-fed-1.png" alt=""/>
117 </div> 117 </div>
118 - <div class="federation-home-text">Описания рейтингов</div> 118 +<!-- <div class="federation-home-text">Описания рейтингов</div>-->
119 <div class="federation-home-text-two">Для поиска лучших Команд или Проектантов </div> 119 <div class="federation-home-text-two">Для поиска лучших Команд или Проектантов </div>
120 </div> 120 </div>
121 <div class="federation-home-blocks"> 121 <div class="federation-home-blocks">
122 <div class="federation-home-ico"><img src="/images/ico-fed-2.png" alt=""/> 122 <div class="federation-home-ico"><img src="/images/ico-fed-2.png" alt=""/>
123 </div> 123 </div>
124 - <div class="federation-home-text">Вы получаете лучшую цену</div> 124 +<!-- <div class="federation-home-text">Вы получаете лучшую цену</div>-->
125 <div class="federation-home-text-two">Для понимания специализации Компании или Проектанта, с которой работает или будет работать</div> 125 <div class="federation-home-text-two">Для понимания специализации Компании или Проектанта, с которой работает или будет работать</div>
126 </div> 126 </div>
127 <div class="federation-home-blocks"> 127 <div class="federation-home-blocks">
128 <div class="federation-home-ico"><img src="/images/ico-fed-3.png" alt=""/> 128 <div class="federation-home-ico"><img src="/images/ico-fed-3.png" alt=""/>
129 </div> 129 </div>
130 - <div class="federation-home-text">Гарантии получения проекта в срок</div> 130 +<!-- <div class="federation-home-text">Гарантии получения проекта в срок</div>-->
131 <div class="federation-home-text-two">Для оценки рисков при выборе исполнителя</div> 131 <div class="federation-home-text-two">Для оценки рисков при выборе исполнителя</div>
132 </div> 132 </div>
133 </div> 133 </div>
@@ -136,19 +136,19 @@ @@ -136,19 +136,19 @@
136 <div class="federation-home-blocks"> 136 <div class="federation-home-blocks">
137 <div class="federation-home-ico"><img src="/images/ico-fed-1.png" alt=""/> 137 <div class="federation-home-ico"><img src="/images/ico-fed-1.png" alt=""/>
138 </div> 138 </div>
139 - <div class="federation-home-text">2Описания рейтингов</div> 139 +<!-- <div class="federation-home-text">2Описания рейтингов</div>-->
140 <div class="federation-home-text-two">Формирование имиджа Компании и узнаваемости Заказчиками и ведущими Проектантами</div> 140 <div class="federation-home-text-two">Формирование имиджа Компании и узнаваемости Заказчиками и ведущими Проектантами</div>
141 </div> 141 </div>
142 <div class="federation-home-blocks"> 142 <div class="federation-home-blocks">
143 <div class="federation-home-ico"><img src="/images/ico-fed-2.png" alt=""/> 143 <div class="federation-home-ico"><img src="/images/ico-fed-2.png" alt=""/>
144 </div> 144 </div>
145 - <div class="federation-home-text">2Вы получаете лучшую цену</div> 145 +<!-- <div class="federation-home-text">2Вы получаете лучшую цену</div>-->
146 <div class="federation-home-text-two">Для синергии с партнерами и поиска лучших Проектантов в Команду</div> 146 <div class="federation-home-text-two">Для синергии с партнерами и поиска лучших Проектантов в Команду</div>
147 </div> 147 </div>
148 <div class="federation-home-blocks"> 148 <div class="federation-home-blocks">
149 <div class="federation-home-ico"><img src="/images/ico-fed-3.png" alt=""/> 149 <div class="federation-home-ico"><img src="/images/ico-fed-3.png" alt=""/>
150 </div> 150 </div>
151 - <div class="federation-home-text">2Гарантии получения проекта в срок</div> 151 +<!-- <div class="federation-home-text">2Гарантии получения проекта в срок</div>-->
152 <div class="federation-home-text-two">Формирования Лучшей Команды за Проектантами которой прейдут Заказчики</div> 152 <div class="federation-home-text-two">Формирования Лучшей Команды за Проектантами которой прейдут Заказчики</div>
153 </div> 153 </div>
154 </div> 154 </div>
@@ -157,19 +157,19 @@ @@ -157,19 +157,19 @@
157 <div class="federation-home-blocks"> 157 <div class="federation-home-blocks">
158 <div class="federation-home-ico"><img src="/images/ico-fed-1.png" alt=""/> 158 <div class="federation-home-ico"><img src="/images/ico-fed-1.png" alt=""/>
159 </div> 159 </div>
160 - <div class="federation-home-text">3Описания рейтингов</div> 160 +<!-- <div class="federation-home-text">3Описания рейтингов</div>-->
161 <div class="federation-home-text-two">Для оценки уровня Опыта в специализации</div> 161 <div class="federation-home-text-two">Для оценки уровня Опыта в специализации</div>
162 </div> 162 </div>
163 <div class="federation-home-blocks"> 163 <div class="federation-home-blocks">
164 <div class="federation-home-ico"><img src="/images/ico-fed-2.png" alt=""/> 164 <div class="federation-home-ico"><img src="/images/ico-fed-2.png" alt=""/>
165 </div> 165 </div>
166 - <div class="federation-home-text">3Вы получаете лучшую цену</div> 166 +<!-- <div class="federation-home-text">3Вы получаете лучшую цену</div>-->
167 <div class="federation-home-text-two">Для представления себя Рынку как профессионала в определенной области</div> 167 <div class="federation-home-text-two">Для представления себя Рынку как профессионала в определенной области</div>
168 </div> 168 </div>
169 <div class="federation-home-blocks"> 169 <div class="federation-home-blocks">
170 <div class="federation-home-ico"><img src="/images/ico-fed-3.png" alt=""/> 170 <div class="federation-home-ico"><img src="/images/ico-fed-3.png" alt=""/>
171 </div> 171 </div>
172 - <div class="federation-home-text">3Гарантии получения проекта в срок</div> 172 +<!-- <div class="federation-home-text">3Гарантии получения проекта в срок</div>-->
173 <div class="federation-home-text-two">Для поиска Проектов в которых можно реализовать себя</div> 173 <div class="federation-home-text-two">Для поиска Проектов в которых можно реализовать себя</div>
174 </div> 174 </div>
175 </div> 175 </div>
@@ -178,19 +178,19 @@ @@ -178,19 +178,19 @@
178 <div class="federation-home-blocks"> 178 <div class="federation-home-blocks">
179 <div class="federation-home-ico"><img src="/images/ico-fed-1.png" alt=""/> 179 <div class="federation-home-ico"><img src="/images/ico-fed-1.png" alt=""/>
180 </div> 180 </div>
181 - <div class="federation-home-text">4Описания рейтингов</div> 181 +<!-- <div class="federation-home-text">4Описания рейтингов</div>-->
182 <div class="federation-home-text-two">Качество. Чем профессиональней будут исполнители, тем лучше будут приняты решения для проекта</div> 182 <div class="federation-home-text-two">Качество. Чем профессиональней будут исполнители, тем лучше будут приняты решения для проекта</div>
183 </div> 183 </div>
184 <div class="federation-home-blocks"> 184 <div class="federation-home-blocks">
185 <div class="federation-home-ico"><img src="/images/ico-fed-2.png" alt=""/> 185 <div class="federation-home-ico"><img src="/images/ico-fed-2.png" alt=""/>
186 </div> 186 </div>
187 - <div class="federation-home-text">4Вы получаете лучшую цену</div> 187 +<!-- <div class="federation-home-text">4Вы получаете лучшую цену</div>-->
188 <div class="federation-home-text-two">Цена. Чем меньше будет ошибок, тем более рентабельным будет Проект и окажется цена</div> 188 <div class="federation-home-text-two">Цена. Чем меньше будет ошибок, тем более рентабельным будет Проект и окажется цена</div>
189 </div> 189 </div>
190 <div class="federation-home-blocks"> 190 <div class="federation-home-blocks">
191 <div class="federation-home-ico"><img src="/images/ico-fed-3.png" alt=""/> 191 <div class="federation-home-ico"><img src="/images/ico-fed-3.png" alt=""/>
192 </div> 192 </div>
193 - <div class="federation-home-text">4Гарантии получения проекта в срок</div> 193 +<!-- <div class="federation-home-text">4Гарантии получения проекта в срок</div>-->
194 <div class="federation-home-text-two">Скорость. Чем слаженней будет командная работа профессионалов, тем выше будет скорость</div> 194 <div class="federation-home-text-two">Скорость. Чем слаженней будет командная работа профессионалов, тем выше будет скорость</div>
195 </div> 195 </div>
196 </div> 196 </div>
frontend/views/tender/view.php
  Show/Hide comments   View file @5224698
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 ]); 74 ]);
75 ?> 75 ?>
76 </div> 76 </div>
77 - <div class="cab-mes-read-cont-com"><?= count($model->user->comments) ?> отзывов</div> 77 + <div class="cab-mes-read-cont-com"><?= count($model->user->comments) ?> мнений</div>
78 <div class="cab-mes-read-cont-soc"> 78 <div class="cab-mes-read-cont-soc">
79 <?= Html::a(Html::img('/images/ico-fb.png'), "{$model->user->userInfo->social_fb}", [ 'target' => '_blank' ]) ?> 79 <?= Html::a(Html::img('/images/ico-fb.png'), "{$model->user->userInfo->social_fb}", [ 'target' => '_blank' ]) ?>
80 <?= Html::a(Html::img('/images/ico-tw.png'), "{$model->user->userInfo->social_t}", [ 'target' => '_blank' ]) ?> 80 <?= Html::a(Html::img('/images/ico-tw.png'), "{$model->user->userInfo->social_t}", [ 'target' => '_blank' ]) ?>
frontend/web/css/style.css
  Show/Hide comments   View file @5224698
@@ -2488,9 +2488,15 @@ input[type=file]::-webkit-file-upload-button { @@ -2488,9 +2488,15 @@ input[type=file]::-webkit-file-upload-button {
2488 } 2488 }
2489 2489
2490 .performance-vacancy-sidebar-stars { 2490 .performance-vacancy-sidebar-stars {
2491 - /*margin-top: 24px;*/ 2491 + margin-top: 24px;
  2492 +}
  2493 +.gallery-page-sidebar .performance-vacancy-sidebar-stars {
2492 margin-top: -5px; 2494 margin-top: -5px;
  2495 + }
  2496 +.gallery-page-sidebar .performer-vacancy-sidebar-img {
  2497 + margin-bottom: 10px;
2493 } 2498 }
  2499 +.gallery-performer-margin .empty {margin-left: 33px;}
2494 .performance-vacancy-sidebar-stars .rating-container {height: 19px} 2500 .performance-vacancy-sidebar-stars .rating-container {height: 19px}
2495 /****perform-vacancy-page****/ 2501 /****perform-vacancy-page****/
2496 .performer-vacancy-list { 2502 .performer-vacancy-list {
@@ -2750,9 +2756,9 @@ input[type=file]::-webkit-file-upload-button { @@ -2750,9 +2756,9 @@ input[type=file]::-webkit-file-upload-button {
2750 margin-top: 27px; 2756 margin-top: 27px;
2751 } 2757 }
2752 2758
2753 -.blog-post-wr:first-child {  
2754 - margin-top: -1px  
2755 -} 2759 +/*.blog-post-wr:first-child {*/
  2760 + /*margin-top: -1px*/
  2761 +/*}*/
2756 2762
2757 .blog-post-title p { 2763 .blog-post-title p {
2758 font-size: 18px; 2764 font-size: 18px;
@@ -7257,7 +7263,8 @@ ul.download-list-files li:hover .download-link { @@ -7257,7 +7263,8 @@ ul.download-list-files li:hover .download-link {
7257 } 7263 }
7258 7264
7259 .section-box-233 { 7265 .section-box-233 {
7260 - margin-top: 36px 7266 + margin-top: 36px;
  7267 + margin-bottom: 40px;
7261 } 7268 }
7262 7269
7263 .table-team-left { 7270 .table-team-left {
@@ -8843,10 +8850,14 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last- @@ -8843,10 +8850,14 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
8843 text-align: center; 8850 text-align: center;
8844 } 8851 }
8845 8852
8846 -.admin-avatar-pattern .remover_image { 8853 +.admin-avatar-pattern .remover_image#image_remove_img {
8847 left: 180px !important; 8854 left: 180px !important;
8848 } 8855 }
8849 8856
  8857 +.admin-avatar-pattern .remover_image#poster_remove_img {
  8858 + left: 700px !important;
  8859 +}
  8860 +
8850 .admin-pattern .file-help-1 { 8861 .admin-pattern .file-help-1 {
8851 display: none 8862 display: none
8852 } 8863 }
@@ -12379,6 +12390,7 @@ li.active-menu-admin:hover a .ico_num { @@ -12379,6 +12390,7 @@ li.active-menu-admin:hover a .ico_num {
12379 .fix_onions .comments-name{ 12390 .fix_onions .comments-name{
12380 font-weight: 700; 12391 font-weight: 700;
12381 } 12392 }
  12393 +
12382 .empty, .left-proektant-cabinet .summary { 12394 .empty, .left-proektant-cabinet .summary {
12383 width: 100%; 12395 width: 100%;
12384 float: left; 12396 float: left;
@@ -12429,4 +12441,10 @@ li.active-menu-admin:hover a .ico_num { @@ -12429,4 +12441,10 @@ li.active-menu-admin:hover a .ico_num {
12429 padding-left: 0 !important; 12441 padding-left: 0 !important;
12430 } 12442 }
12431 #modal_form_contacts .fileloader-item-remove:before {display:none;} 12443 #modal_form_contacts .fileloader-item-remove:before {display:none;}
12432 -.command-block-name {height: 50px;overflow: hidden; font-size: 16px;}  
12433 \ No newline at end of file 12444 \ No newline at end of file
  12445 +.command-block-name {height: 50px;overflow: hidden; font-size: 16px;}
  12446 +.general_avatar-wr #image_remove_img {
  12447 + left: auto !important;
  12448 + right: -13px;
  12449 + top: 50%;
  12450 + margin-top: -9px;
  12451 +}
12434 \ No newline at end of file 12452 \ No newline at end of file
frontend/web/images/ico-fed-1.png
View file @5224698

1.17 KB | W: | H:

1.79 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
frontend/web/images/ico-fed-2.png
View file @5224698

1.38 KB | W: | H:

1.88 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
frontend/web/images/ico-fed-3.png
View file @5224698

1.13 KB | W: | H:

1.88 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
frontend/web/js/myGallery_min.js
  Show/Hide comments   View file @5224698
1 -$(document).ready(function(){  
2 - if( $('.gallery-box').length ){  
3 - function l(l){function i(){var l=$(".gallery-show-min img").length;$(".gallery-show-min").css({width:c*l-t})}function a(){var l=$(".gallery-show-big tr");$(".gallery-show-big tr").css({display:"none"}),$(l[s]).fadeIn(100);var i=$(l[s]).find("img"),a=i.attr("data-link");i.attr("src",a)}$(".gallery-show-wr .gallery-show-min, .gallery-show-wr .gallery-show-big").empty();var s=$(l).index();$(".gallery-show-min").css({marginLeft:0});for(var e=$(l).parent().find(".gallery-box-preview span"),r=$(l).parent().find(".gallery-box-big span"),g=0;g<e.length;g++){var n=$(e[g]).attr("data-link");$(".gallery-show-min").append('<img src="'+n+'"/>')}$(".gallery-show-min img:first-child").addClass("gallery-active-pic"),$(".gallery-show-min img:last-child").css({marginRight:0}),$(".gallery-show-min").append('<div class="border-gallery"></div>');for(var o=0;o<r.length;o++){var y=$(r[o]).attr("data-link");$(".gallery-show-big").append('<tr><td><img data-link="'+y+'"/></td></tr>')}var d=$(".gallery-show-big tr:first-child").find("img"),h=d.attr("data-link");d.attr("src",h);var p=m,f=$(window).height();$(".gallery-page");755>f&&($(".gallery-show-big-wrp, .gallery-show-big, .gallery-show-big tr td").css({height:f/p+"px"}),$(".gallery-show-big img").css({height:f/p+"px"})),i();var v=$(".gallery-show-min img");$(v).removeClass("gallery-active-pic"),$(v[s]).addClass("gallery-active-pic"),$(".border-gallery").css({left:c*s}),a(),0==s?$(".gallery-big-left").css({display:"none"}):$(".gallery-big-left").css({display:"block"})}function i(){var l=$(".gallery-show-min img"),i=$(".gallery-show-min img").length;n>=i?$(".gallery-min-left, .gallery-min-right, .copy-gallery-min-left, .copy-gallery-min-right").css({display:"none"}):($(".gallery-min-right, .copy-gallery-min-left, .copy-gallery-min-right").css({display:"block"}),$(".gallery-min-left").css({display:"none"})),$(".gallery-show-min img").on("click",function(){function a(){var l=$(".gallery-show-big tr");$(".gallery-show-big tr").css({display:"none"}),$(l[g]).fadeIn(100);var i=$(l[g]).find("img"),a=i.attr("data-link");i.attr("src",a)}var s=l,e=$(".gallery-show-min").offset().left;s=$(s[2]).offset().left-e,$(".gallery-show-min img").removeClass("gallery-active-pic"),$(this).addClass("gallery-active-pic");var r=$(".gallery-active-pic").offset().left-e,g=$(".gallery-active-pic").index(),t=i-(g+1);2>=g&&(a(),$(".border-gallery").css({left:r}),$(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".gallery-min-left").css({display:"none"})),2==g&&(a(),$(".gallery-show-min").stop().animate({marginLeft:-(r-s)},o),$(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list")),n-1>=g&&(a(),$(".border-gallery").css({left:r}),g>3&&$(".gallery-show-min").stop().animate({marginLeft:-(r-s)},o)),g>=n-1&&($(".gallery-min-left").css({display:"block"}),i==n&&g==n-1&&($(".border-gallery").css({left:r}),$(".gallery-show-min").stop().animate({marginLeft:0},o)),0==t&&(a(),$(".border-gallery").css({left:r}),$(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().prev().prev().addClass("act-list"),setTimeout(function(){$(".gallery-min-right").css({display:"none"})},o)),1==t&&(a(),$(".gallery-show-min").stop().animate({marginLeft:-(r-s-c)},o,function(){$(".gallery-min-right").css({display:"none"})}),$(".border-gallery").css({left:r}),$(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().prev().addClass("act-list")),2==t&&(a(),$(".border-gallery").css({left:r}),$(".gallery-show-min").stop().animate({marginLeft:-(r-s)},o,function(){$(".gallery-min-right").css({display:"none"})}),$(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().addClass("act-list")),t>2&&(console.log(">2"),a(),$(".border-gallery").css({left:r}),$(".gallery-show-min").stop().animate({marginLeft:-(r-s)},o,function(){$(".gallery-min-right").css({display:"block"})}),$(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().addClass("act-list")),n>=i&&$(".gallery-min-left").css({display:"none"})),i>n&&t>2&&$(".gallery-min-right").css({display:"block"}),3==g&&($(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:-(r-s)},o),$(l[1]).click(function(){$(".gallery-show-min").stop().animate({marginLeft:0},o)}),n>=i?$(".gallery-show-min").stop().animate({marginLeft:0},o):$(".gallery-min-left").attr("style",'disply:"block"')),g>=1&&i-1>g&&$(".gallery-big-left, .gallery-big-right").css({display:"block"}),g==i-1&&$(".gallery-big-right").css({display:"none"}),0==g&&$(".gallery-big-left").css({display:"none"})})}function a(){var l=$(".gallery-show-min img");$(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".gallery-min-right").on("click",function(){var i=$(".act-list"),a=i.index()+1,s=$(".gallery-show-min img").length,e=s-a;if($(this).css("display","none"),e>=2*n-1&&($(".gallery-show-min img").removeClass("act-list"),$(l[a+(n-1)]).addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:-((a+(n-1))*c)},o,function(){$(".gallery-min-right").css("display","block"),2*n>e&&$(".gallery-min-right").css("display","none")})),2*n-1>e){var r=s-(a+4);r=a+r-1,$(".gallery-show-min img").removeClass("act-list"),$(l[r]).addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:-(r*c)},o,function(){})}a>0&&setTimeout(function(){$(".gallery-min-left").css({display:"block"})},o)})}function s(){var l=$(".gallery-show-min img");$(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".gallery-min-left").on("click",function(){var i=$(".act-list"),a=i.index()+1,s=a-1;s>0&&($(this).css("display","none"),n-1>=s&&($(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:0},o,function(){n+1>=a?$(".gallery-min-right").css({display:"block"}):$(".gallery-min-left").css("display","block")})),s>n-1&&($(".gallery-show-min img").removeClass("act-list"),$(l[a-(n+1)]).addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:-((a-(n+1))*c)},o,function(){n+1>=a||($(".gallery-min-right").css("display","block"),$(".gallery-min-left").css("display","block"))})))})}function e(){var l=$(".gallery-show-min img").length,i=$(".gallery-show-min img"),a=3*c;$(".gallery-big-right").on("click",function(){function s(){var l=$(".gallery-show-big tr");$(".gallery-show-big tr").css({display:"none"}),$(l[g]).fadeIn(100);var i=$(l[g]).find("img"),a=i.attr("data-link");i.attr("src",a)}var e=$(".gallery-active-pic"),r=e.index()+1,g=r;2>=r&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[r]).addClass("gallery-active-pic"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".border-gallery").css({left:c*r}),s(),$(".gallery-show-min").stop().animate({marginLeft:0},o)),l-r>0&&r>2&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[r]).addClass("gallery-active-pic"),$(i[r]).prev().prev().addClass("act-list"),s(),$(".border-gallery").css({left:c*r}),l-r>2&&$(".gallery-show-min").stop().animate({marginLeft:-(r*c-a+c)},o),r>=n-2&&r>l&&setTimeout(function(){$(".gallery-min-left").css({display:"block"})},o),r>=l-3&&$(".gallery-min-right").css({display:"none"}),r>=3&&l-4>=r&&$(".gallery-min-right").css({display:"block"})),r>=1&&($(".gallery-big-left").css({display:"block"}),l>n&&r>2&&$(".gallery-min-left").css({display:"block"})),r+1>=l&&$(".gallery-big-right").css({display:"none"})})}function r(){var l=$(".gallery-show-min img").length,i=$(".gallery-show-min img"),a=3*c;$(".gallery-big-left").on("click",function(){function s(){var l=$(".gallery-show-big tr");$(".gallery-show-big tr").css({display:"none"}),$(l[g]).fadeIn(100);var i=$(l[g]).find("img"),a=i.attr("data-link");i.attr("src",a)}var e=$(".gallery-active-pic"),r=e.index()-1,g=r;2>=r&&(r>0&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[r]).addClass("gallery-active-pic"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".border-gallery").css({left:c*r}),s(),$(".gallery-show-min").stop().animate({marginLeft:0},o)),0==r&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[0]).addClass("gallery-active-pic"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".border-gallery").css({left:c*r}),s())),3>r&&setTimeout(function(){$(".gallery-min-left").css({display:"none"})},o),l-r>0&&r>2&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[r]).addClass("gallery-active-pic"),$(i[r]).prev().prev().addClass("act-list"),s(),$(".border-gallery").css({left:c*r}),l-r>2&&$(".gallery-show-min").stop().animate({marginLeft:-(r*c-a+c)},o),r>=3&&l-4>=r&&$(".gallery-min-right").css({display:"block"})),1>r&&$(".gallery-big-left").css({display:"none"}),l-2>=r&&$(".gallery-big-right").css({display:"block"})})}$("body").append('<div id="overlay"></div><div class="gallery-page"><div class="closed-form gallery-closed"></div> <div class="gallery-show-wr"><div class="gallery-show-big-wrp"><table align="center" class="gallery-show-big" width="840" height="560" cellpadding="0" cellspacing="0" border="0"></table><div class="gallery-big-left"></div><div class="gallery-big-right"></div> <div class="copy-gallery-big-left"></div> <div class="copy-gallery-big-right"></div></div><div class="galley-show-min-wrapper"><div class="gallery-show-min"></div></div><div class="gallery-min-left"></div><div class="gallery-min-right"></div><div class="copy-gallery-min-left"></div><div class="copy-gallery-min-right"></div></div></div>');var g=152,t=20,n=5,o=500,c=g+t,y=$(".gallery-page"),m=1.68;$(".gallery-box-min").click(function(g){g.preventDefault();var t=$(this).parent().find(".gallery-box-hidden");if($(t).hasClass("gallery-box-hidden")){var n=m,o=$(window).height(),c=$(".gallery-page");if(755>o)$("#overlay").fadeIn(400,function(){$(".gallery-page").css({display:"block",marginTop:-(y/2)}).animate({opacity:1,top:"50%"},200)}),c.css({height:o/n+148+"px",marginTop:-((o/n+148)/2)+"px"});else{var y=$(".gallery-show-big-wrp").height()+$(".galley-show-min-wrapper").height();$("#overlay").fadeIn(400,function(){$(".gallery-page").css({display:"block",marginTop:-(y/2)}).animate({opacity:1,top:"50%"},200)})}l(this),i(),$(".gallery-min-right").unbind("click"),$(".gallery-min-left").unbind("click"),$(".gallery-min-right").bind("click",a()),$(".gallery-min-left").bind("click",s()),$(".gallery-big-right").unbind("click"),$(".gallery-big-left").unbind("click"),$(".gallery-big-right").bind("click",e()),$(".gallery-big-left").bind("click",r())}}),$(".closed-form, #overlay").click(function(){$(".gallery-page").animate({opacity:0,top:255},200,function(){$(this).css("display","none"),$("#overlay").fadeOut(400)}),$(".gallery-big-left, .gallery-big-right").attr("style",""),$(".gallery-show-wr .gallery-show-min, .gallery-show-wr .gallery-show-big").empty()});var d=m;$(window).resize(function(){var l=$(window).height();755>l?($(".gallery-show-big-wrp, .gallery-show-big, .gallery-show-big tr td").css({height:l/d+"px"}),$(".gallery-show-big img").css({height:l/d+"px"}),y.css({height:l/d+148+"px",marginTop:-((l/d+148)/2)+"px"})):($(".gallery-show-big-wrp, .gallery-show-big, .gallery-show-big tr td, .gallery-show-big img").css({height:560}),y.css({height:710,marginTop:"-355px"}))})  
4 - }  
5 -});  
6 \ No newline at end of file 1 \ No newline at end of file
  2 +$(document).ready(function(){function l(l){function i(){var l=$(".gallery-show-min img").length;$(".gallery-show-min").css({width:c*l-g})}function a(){var l=$(".gallery-show-big tr");$(".gallery-show-big tr").css({display:"none"}),$(l[e]).fadeIn(100);var i=$(l[e]).find("img"),a=i.attr("data-link");i.attr("src",a)}$(".gallery-show-wr .gallery-show-min, .gallery-show-wr .gallery-show-big").empty();var e=$(l).index();$(".gallery-show-min").css({marginLeft:0});for(var s=$(l).parent().find(".gallery-box-preview span"),r=$(l).parent().find(".gallery-box-big span"),t=0;t<s.length;t++){var n=$(s[t]).attr("data-link");$(".gallery-show-min").append('<img src="'+n+'"/>')}$(".gallery-show-min img:first-child").addClass("gallery-active-pic"),$(".gallery-show-min img:last-child").css({marginRight:0}),$(".gallery-show-min").append('<div class="border-gallery"></div>');for(var o=0;o<r.length;o++){var y=$(r[o]).attr("data-link");$(".gallery-show-big").append('<tr><td><img data-link="'+y+'"/></td></tr>')}var d=$(".gallery-show-big tr:first-child").find("img"),h=d.attr("data-link");d.attr("src",h);var p=m,f=$(window).height();$(".gallery-page"),755>f&&($(".gallery-show-big-wrp, .gallery-show-big, .gallery-show-big tr td").css({height:f/p+"px"}),$(".gallery-show-big img").css({height:f/p+"px"})),i();var v=$(".gallery-show-min img");$(v).removeClass("gallery-active-pic"),$(v[e]).addClass("gallery-active-pic"),$(".border-gallery").css({left:c*e}),a(),0==e?$(".gallery-big-left").css({display:"none"}):$(".gallery-big-left").css({display:"block"})}function i(){var l=$(".gallery-show-min img"),i=$(".gallery-show-min img").length;n>=i?$(".gallery-min-left, .gallery-min-right, .copy-gallery-min-left, .copy-gallery-min-right").css({display:"none"}):($(".gallery-min-right, .copy-gallery-min-left, .copy-gallery-min-right").css({display:"block"}),$(".gallery-min-left").css({display:"none"})),$(".gallery-show-min img").on("click",function(){function a(){var l=$(".gallery-show-big tr");$(".gallery-show-big tr").css({display:"none"}),$(l[t]).fadeIn(100);var i=$(l[t]).find("img"),a=i.attr("data-link");i.attr("src",a)}var e=l,s=$(".gallery-show-min").offset().left;e=$(e[2]).offset().left-s,$(".gallery-show-min img").removeClass("gallery-active-pic"),$(this).addClass("gallery-active-pic");var r=$(".gallery-active-pic").offset().left-s,t=$(".gallery-active-pic").index(),g=i-(t+1);2>=t&&(a(),$(".border-gallery").css({left:r}),$(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".gallery-min-left").css({display:"none"})),2==t&&(a(),$(".gallery-show-min").stop().animate({marginLeft:-(r-e)},o),$(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list")),n-1>=t&&(a(),$(".border-gallery").css({left:r}),t>3&&$(".gallery-show-min").stop().animate({marginLeft:-(r-e)},o)),t>=n-1&&($(".gallery-min-left").css({display:"block"}),i==n&&t==n-1&&($(".border-gallery").css({left:r}),$(".gallery-show-min").stop().animate({marginLeft:0},o)),0==g&&(a(),$(".border-gallery").css({left:r}),$(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().prev().prev().addClass("act-list"),setTimeout(function(){$(".gallery-min-right").css({display:"none"})},o)),1==g&&(a(),$(".gallery-show-min").stop().animate({marginLeft:-(r-e-c)},o,function(){$(".gallery-min-right").css({display:"none"})}),$(".border-gallery").css({left:r}),$(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().prev().addClass("act-list")),2==g&&(a(),$(".border-gallery").css({left:r}),$(".gallery-show-min").stop().animate({marginLeft:-(r-e)},o,function(){$(".gallery-min-right").css({display:"none"})}),$(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().addClass("act-list")),g>2&&(console.log(">2"),a(),$(".border-gallery").css({left:r}),$(".gallery-show-min").stop().animate({marginLeft:-(r-e)},o,function(){$(".gallery-min-right").css({display:"block"})}),$(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().addClass("act-list")),n>=i&&$(".gallery-min-left").css({display:"none"})),i>n&&g>2&&$(".gallery-min-right").css({display:"block"}),3==t&&($(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:-(r-e)},o),$(l[1]).click(function(){$(".gallery-show-min").stop().animate({marginLeft:0},o)}),n>=i?$(".gallery-show-min").stop().animate({marginLeft:0},o):$(".gallery-min-left").attr("style",'disply:"block"')),t>=1&&i-1>t&&$(".gallery-big-left, .gallery-big-right").css({display:"block"}),t==i-1&&$(".gallery-big-right").css({display:"none"}),0==t&&$(".gallery-big-left").css({display:"none"})})}function a(){var l=$(".gallery-show-min img");$(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".gallery-min-right").on("click",function(){var i=$(".act-list"),a=i.index()+1,e=$(".gallery-show-min img").length,s=e-a;if($(this).css("display","none"),s>=2*n-1&&($(".gallery-show-min img").removeClass("act-list"),$(l[a+(n-1)]).addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:-((a+(n-1))*c)},o,function(){$(".gallery-min-right").css("display","block"),2*n>s&&$(".gallery-min-right").css("display","none")})),2*n-1>s){var r=e-(a+4);r=a+r-1,$(".gallery-show-min img").removeClass("act-list"),$(l[r]).addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:-(r*c)},o,function(){})}a>0&&setTimeout(function(){$(".gallery-min-left").css({display:"block"})},o)})}function e(){var l=$(".gallery-show-min img");$(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".gallery-min-left").on("click",function(){var i=$(".act-list"),a=i.index()+1,e=a-1;e>0&&($(this).css("display","none"),n-1>=e&&($(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:0},o,function(){n+1>=a?$(".gallery-min-right").css({display:"block"}):$(".gallery-min-left").css("display","block")})),e>n-1&&($(".gallery-show-min img").removeClass("act-list"),$(l[a-(n+1)]).addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:-((a-(n+1))*c)},o,function(){n+1>=a||($(".gallery-min-right").css("display","block"),$(".gallery-min-left").css("display","block"))})))})}function s(){var l=$(".gallery-show-min img").length,i=$(".gallery-show-min img"),a=3*c;$(".gallery-big-right").on("click",function(){function e(){var l=$(".gallery-show-big tr");$(".gallery-show-big tr").css({display:"none"}),$(l[t]).fadeIn(100);var i=$(l[t]).find("img"),a=i.attr("data-link");i.attr("src",a)}var s=$(".gallery-active-pic"),r=s.index()+1,t=r;2>=r&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[r]).addClass("gallery-active-pic"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".border-gallery").css({left:c*r}),e(),$(".gallery-show-min").stop().animate({marginLeft:0},o)),l-r>0&&r>2&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[r]).addClass("gallery-active-pic"),$(i[r]).prev().prev().addClass("act-list"),e(),$(".border-gallery").css({left:c*r}),l-r>2&&$(".gallery-show-min").stop().animate({marginLeft:-(r*c-a+c)},o),r>=n-2&&r>l&&setTimeout(function(){$(".gallery-min-left").css({display:"block"})},o),r>=l-3&&$(".gallery-min-right").css({display:"none"}),r>=3&&l-4>=r&&$(".gallery-min-right").css({display:"block"})),r>=1&&($(".gallery-big-left").css({display:"block"}),l>n&&r>2&&$(".gallery-min-left").css({display:"block"})),r+1>=l&&$(".gallery-big-right").css({display:"none"})})}function r(){var l=$(".gallery-show-min img").length,i=$(".gallery-show-min img"),a=3*c;$(".gallery-big-left").on("click",function(){function e(){var l=$(".gallery-show-big tr");$(".gallery-show-big tr").css({display:"none"}),$(l[t]).fadeIn(100);var i=$(l[t]).find("img"),a=i.attr("data-link");i.attr("src",a)}var s=$(".gallery-active-pic"),r=s.index()-1,t=r;2>=r&&(r>0&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[r]).addClass("gallery-active-pic"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".border-gallery").css({left:c*r}),e(),$(".gallery-show-min").stop().animate({marginLeft:0},o)),0==r&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[0]).addClass("gallery-active-pic"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".border-gallery").css({left:c*r}),e())),3>r&&setTimeout(function(){$(".gallery-min-left").css({display:"none"})},o),l-r>0&&r>2&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[r]).addClass("gallery-active-pic"),$(i[r]).prev().prev().addClass("act-list"),e(),$(".border-gallery").css({left:c*r}),l-r>2&&$(".gallery-show-min").stop().animate({marginLeft:-(r*c-a+c)},o),r>=3&&l-4>=r&&$(".gallery-min-right").css({display:"block"})),1>r&&$(".gallery-big-left").css({display:"none"}),l-2>=r&&$(".gallery-big-right").css({display:"block"})})}if($(".gallery-box").length){$("body").append('<div id="overlay"></div><div class="gallery-page"><div class="closed-form gallery-closed"></div> <div class="gallery-show-wr"><div class="gallery-show-big-wrp"><table align="center" class="gallery-show-big" width="840" height="560" cellpadding="0" cellspacing="0" border="0"></table><div class="gallery-big-left"></div><div class="gallery-big-right"></div> <div class="copy-gallery-big-left"></div> <div class="copy-gallery-big-right"></div></div><div class="galley-show-min-wrapper"><div class="gallery-show-min"></div></div><div class="gallery-min-left"></div><div class="gallery-min-right"></div><div class="copy-gallery-min-left"></div><div class="copy-gallery-min-right"></div></div></div>');var t=152,g=20,n=5,o=500,c=t+g,y=$(".gallery-page"),m=1.68;$(".gallery-box-min").click(function(t){t.preventDefault(),$("body").append('<div class="tqtst" style="position: fixed;width: 100%;height: 100%;z-index: 9999"></div>'),setTimeout(function(){$(".tqtst").remove()},400);var g=$(this).parent().find(".gallery-box-hidden");if($(g).hasClass("gallery-box-hidden")){var n=m,o=$(window).height(),c=$(".gallery-page");if(755>o)$("#overlay").fadeIn(400,function(){$(".gallery-page").css({display:"block",marginTop:-(y/2)}).animate({opacity:1,top:"50%"},200)}),c.css({height:o/n+148+"px",marginTop:-((o/n+148)/2)+"px"});else{var y=$(".gallery-show-big-wrp").height()+$(".galley-show-min-wrapper").height();$("#overlay").fadeIn(400,function(){$(".gallery-page").css({display:"block",marginTop:-(y/2)}).animate({opacity:1,top:"50%"},200)})}l(this),i(),$(".gallery-min-right").unbind("click"),$(".gallery-min-left").unbind("click"),$(".gallery-min-right").bind("click",a()),$(".gallery-min-left").bind("click",e()),$(".gallery-big-right").unbind("click"),$(".gallery-big-left").unbind("click"),$(".gallery-big-right").bind("click",s()),$(".gallery-big-left").bind("click",r())}}),$(".closed-form, #overlay").click(function(){$(".gallery-page").animate({opacity:0,top:255},200,function(){$(this).css("display","none"),$("#overlay").fadeOut(400)}),$(".gallery-big-left, .gallery-big-right").attr("style",""),$(".gallery-show-wr .gallery-show-min, .gallery-show-wr .gallery-show-big").empty()});var d=m;$(window).resize(function(){var l=$(window).height();755>l?($(".gallery-show-big-wrp, .gallery-show-big, .gallery-show-big tr td").css({height:l/d+"px"}),$(".gallery-show-big img").css({height:l/d+"px"}),y.css({height:l/d+148+"px",marginTop:-((l/d+148)/2)+"px"})):($(".gallery-show-big-wrp, .gallery-show-big, .gallery-show-big tr td, .gallery-show-big img").css({height:560}),y.css({height:710,marginTop:"-355px"}))})}});
7 \ No newline at end of file 3 \ No newline at end of file
frontend/web/js/script.js
  Show/Hide comments   View file @5224698
@@ -1082,6 +1082,12 @@ $(document).ready( @@ -1082,6 +1082,12 @@ $(document).ready(
1082 var radiusLenght = (newRadius.length)-1 1082 var radiusLenght = (newRadius.length)-1
1083 $(newRadius[radiusLenght]).addClass('_fix_radius_') 1083 $(newRadius[radiusLenght]).addClass('_fix_radius_')
1084 } 1084 }
  1085 +
  1086 + fixBlog()
  1087 + function fixBlog() {
  1088 + var firstPost = $('.blog-post-wr');
  1089 + $(firstPost[0]).css({marginTop:-1})
  1090 + }
1085 1091
1086 } 1092 }
1087 ); 1093 );
1088 \ No newline at end of file 1094 \ No newline at end of file