diff --git a/ground/classes/Image.php b/ground/classes/Image.php index 7377bb3..d82c6f8 100644 --- a/ground/classes/Image.php +++ b/ground/classes/Image.php @@ -54,6 +54,16 @@ class Image return TRUE; // o_O } + public static function createCustomSize($imgFullName, $x, $y) + { + self::imgResize( + $imgFullName, + null, + $x, + $y + ); + } + /** * Функция img_resize(): генерация thumbnails * Параметры: @@ -111,7 +121,13 @@ class Image } //$iofunct = "image".$format; //$iofunct($idest, $dest, $quality); - imagejpeg($idest, $dest, $quality); + if ($dest) { + imagejpeg($idest, $dest, $quality); + } else { + header('Content-Type: image/jpeg'); + imagejpeg($idest); + die; + } imagedestroy($isrc); imagedestroy($idest); diff --git a/ground/controllers/ImagesController.php b/ground/controllers/ImagesController.php new file mode 100644 index 0000000..615967c --- /dev/null +++ b/ground/controllers/ImagesController.php @@ -0,0 +1,48 @@ + 200) { + $width = 200; + } + + if ($height <= 0 || $height > 200) { + $height = 200; + } + + if (!$pointId) { + App::error404(); + } + + $point = Point::model()->getByPK($pointId); + + if (!$point) { + App::error404(); + } + + $photos = $point->photos; + $img = array_shift($photos); + + + if ($img) { + $photo = $photo = App::getBasedir().'../public/'.'photos/'.$img->name; + } else { + $photo = $photo = App::getBasedir().'../public/'.'img/noPhoto.png'; + } + + if (!file_exists($photo)) { + $photo = $photo = App::getBasedir().'../public/'.'img/noPhoto.png'; + } + + Image::createCustomSize($photo, $width, $height); +// print $photo; + } + +} diff --git a/public/img/noPhoto.png b/public/img/noPhoto.png new file mode 100644 index 0000000..dee5c6b Binary files /dev/null and b/public/img/noPhoto.png differ diff --git a/source/icons.svg b/source/icons.svg new file mode 100644 index 0000000..0775f7d --- /dev/null +++ b/source/icons.svg @@ -0,0 +1,385 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/logo.svg b/source/logo.svg new file mode 100644 index 0000000..b54d420 --- /dev/null +++ b/source/logo.svg @@ -0,0 +1,64 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/source/wikipoints.svg b/source/wikipoints.svg index 8407c69..1c9440e 100644 --- a/source/wikipoints.svg +++ b/source/wikipoints.svg @@ -120,9 +120,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.24999999" - inkscape:cx="371.18961" - inkscape:cy="775.85575" + inkscape:zoom="0.40351059" + inkscape:cx="849.60265" + inkscape:cy="-613.68848" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -1650,5 +1650,17 @@ inkscape:export-filename="/home/web/poi/ground/watermarks/middle.png" inkscape:export-xdpi="14.48" inkscape:export-ydpi="14.48" /> + +