diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index 4d9da64..a89f8a0 100755 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -117,6 +117,13 @@ ->orderBy('sort') ->limit(3) ->all(); + $doctors = Doctor::find() + ->where(['status' => true]) + ->orderBy([ + 'sort' => SORT_ASC, + 'id' => SORT_ASC + ]) + ->all(); $settings = Settings::getInstance(); return $this->render( 'index', @@ -126,6 +133,7 @@ 'comments' => $comments, 'settings' => $settings, 'package' => $package, + 'docs' => $doctors ] ); } diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php index cf08bb8..87e4cf1 100755 --- a/frontend/views/site/index.php +++ b/frontend/views/site/index.php @@ -125,6 +125,127 @@ JS; + + + + + + + language->name); + $docName = ($docFio[0]) ?? ''; + $docSurname = ($docFio[1]) ?? ''; + $docPosition = $doc->language->position; + $docDescription = $doc->language->description; + $img1 = ''; + $img2 = ''; + if (isset($doc->image)) { + $img1 = ImageHelper::set(($doc->image) ? $doc->image->getPath() : null) + ->cropResize(340, 440) + ->quality(84) + ->renderImage(); + $img2 = ImageHelper::set(($doc->image) ? $doc->image->getPath() : null) + ->cropResize(165, 165) + ->quality(84) + ->renderImage(); + + } + #die(var_dump(htmlspecialchars($img1))); + # $docImg1 = (isset($doc->image->fileName)) ? "/images/" . $doc->image->fileName : "/images/no-image.png"; + $docImg2 = (isset($doc->image->fileName)) ? "/images/" . $doc->image->fileName : "/images/no-image.png"; + $docImg3 = (isset($doc->image->fileName)) ? "/images/" . $doc->image->fileName : "/images/no-image.png"; + + + $first .= ' + + + ' . $img1 . ' + + '; + + + $second .= ' + + + ' . $img1 . ' + + + + ' . $docName . ' + ' . $docSurname . ' + ' . $docPosition . ' + + + ' . $docDescription . ' + + + + Записаться на прием + + + + + + + '; + + + $third .= ' + + + + + ' . $img2 . ' + + + + ' . $docName . ' + ' . $docSurname . ' + ' . $docPosition . ' + + + ' . $docDescription . ' + + + + Записаться на прием + + + + '; + ++$counter; + } + } ?> + + + = $first; ?> + + + + = $second; ?> + + + + + + + text)){?> diff --git a/frontend/web/favicon.ico b/frontend/web/favicon.ico index ed64b6c..9b534c7 100755 Binary files a/frontend/web/favicon.ico and b/frontend/web/favicon.ico differ diff --git a/frontend/web/images/favicon.ico b/frontend/web/images/favicon.ico deleted file mode 100644 index ed64b6c..0000000 Binary files a/frontend/web/images/favicon.ico and /dev/null differ diff --git a/frontend/web/images/map/marker-1.png b/frontend/web/images/map/marker-1.png index e528ed6..5b4fe96 100644 Binary files a/frontend/web/images/map/marker-1.png and b/frontend/web/images/map/marker-1.png differ diff --git a/frontend/web/js/map.js b/frontend/web/js/map.js index 4aa24ed..bfabc35 100644 --- a/frontend/web/js/map.js +++ b/frontend/web/js/map.js @@ -80,7 +80,7 @@ function initialize() { } ; var map = new google.maps.Map(document.getElementById("map_canvas"), settings); - var image1 = new google.maps.MarkerImage('/images/markers/marker-we-1.png', new google.maps.Size(68, 80), new google.maps.Point(0, 0), new google.maps.Point(16, 35)); + var image1 = new google.maps.MarkerImage('/images/markers/marker-we-1-new.png', new google.maps.Size(68, 80), new google.maps.Point(0, 0), new google.maps.Point(16, 35)); var markers = []; $('.adress-map span') .each(function() { -- libgit2 0.21.4
+ ' . $docDescription . ' +