diff --git a/public/css/style.css b/public/css/style.css index 252e2ab..fc595f8 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -26,6 +26,12 @@ div.add {cursor: pointer;} #addPointModal .extraImage .input-group-addon.type.button {border-left: 0px;} div.leaflet-popup-content div.control {margin-top: 7px;} +div.leaflet-popup-content div.control a {min-width: 150px; color: #333; font-size: 14px; font-weight: normal;} +div.leaflet-popup-content div.control a span.label {display: inline; font-size: 12px; font-weight: normal; color: #333;} +div.leaflet-popup-content div.control:hover a {min-width: 40px;} +div.leaflet-popup-content div.control:hover a span.label {display: none;} +div.leaflet-popup-content div.control:hover a:hover {min-width: 150px;} +div.leaflet-popup-content div.control:hover a:hover span.label {display: inline;} div.leaflet-popup-content button span.label {display: none; font-size: 90%; font-weight: normal; color: #333;} div.leaflet-popup-content button:hover {min-width: 150px;} div.leaflet-popup-content button:hover span.label {display: inline;} diff --git a/public/hit (копия).gif b/public/hit (копия).gif deleted file mode 100644 index 730a38d..0000000 Binary files a/public/hit (копия).gif and /dev/null differ diff --git a/public/hit0.gif b/public/hit0.gif deleted file mode 100644 index 66734e3..0000000 Binary files a/public/hit0.gif and /dev/null differ diff --git a/public/hit1.gif b/public/hit1.gif deleted file mode 100644 index fd9fab9..0000000 Binary files a/public/hit1.gif and /dev/null differ diff --git a/public/hit2.gif b/public/hit2.gif deleted file mode 100644 index 34d9c82..0000000 Binary files a/public/hit2.gif and /dev/null differ diff --git a/public/img.php b/public/img.php deleted file mode 100644 index 14961c8..0000000 --- a/public/img.php +++ /dev/null @@ -1,59 +0,0 @@ - array($b,$b,$b,$w,$b,$b), - 1 => array($w,$w,$w,$b,$w,$w), - 2 => array($b,$w,$b,$b,$b,$w), - 3 => array($b,$w,$b,$b,$w,$b), - 4 => array($w,$b,$b,$b,$w,$b), - 5 => array($b,$b,$w,$b,$w,$b), - 6 => array($b,$b,$w,$b,$b,$b), - 7 => array($b,$w,$b,$w,$w,$b), - 8 => array($b,$b,$b,$b,$b,$b), - 9 => array($b,$b,$b,$b,$w,$b), - ); - - if($im) - { - for ($index = 0; $index < 10; $index++) { - $block = 0; - if ($index >= 3) $block++; - if ($index >= 6) $block++; - if ($index >= 9) $block++; - - $x = 78 - 5*$index - 2*$block; - $y = 72; - - $digit = array( - imagecolorat($im, $x+1, $y), - imagecolorat($im, $x, $y+1), - imagecolorat($im, $x+3, $y+1), - imagecolorat($im, $x+2, $y+2), - imagecolorat($im, $x, $y+3), - imagecolorat($im, $x+3, $y+3), - ); - - $d = array_search($digit, $digits); - - if ($d !== false) { - $res[] = array_search($digit, $digits); - } - } - } - - return implode('', array_reverse($res)); -} - -for ($index = 0; $index <= 2; $index++) { - print loadGif('/home/web/poi/public/hit'.$index.'.gif'); - print '
'; -} - diff --git a/public/js/map.js b/public/js/map.js index c6e1f42..0df5c68 100644 --- a/public/js/map.js +++ b/public/js/map.js @@ -193,31 +193,26 @@ function showInfo(id) photos = ''; } - description = '
' + - '

' + data.name + '

' + - photos; - - description = description + data.descriptionHtml; - //description = description + ' Подробнее...'; + description = '
' + '

' + data.name + '

' + photos; + description += data.descriptionHtml; + description += '
'; + description += '
'; if (data.source.length > 11) { - description = description + ' Подробнее...'; + description += ' Подробнее'; } - - description = description + '
'; - - description = description + '
'; - description = description + ''; -// description = description + ''; -// description = description + ''; - description = description + ''; +// description += ' Подробнее'; + description += ''; +// description += ''; +// description += ''; + description += ''; if (isAdmin == '1') { - description = description + ''; + description += ''; } - description = description + '
'; + description += '
'; marker.options.description = description; marker.bindPopup(marker.options.description, {maxWidth: 500, maxHeight: 300});