From a15c92d99e714661a1d516437b6094c9ecb7e44b Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Mon, 6 Oct 2014 21:38:26 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D1=80=D0=BE=D0=B1=D0=BD?= =?UTF-8?q?=D0=B5=D0=B5=20-=20=D0=BD=D0=BE=D0=B2=D0=B0=D1=8F=20=D0=BA?= =?UTF-8?q?=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0.=20=D0=98=20=D1=83=D0=B1=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=20=D0=BC=D1=83=D1=81=D0=BE=D1=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 6 ++++ public/hit (копия).gif | Bin 916 -> 0 bytes public/hit0.gif | Bin 595 -> 0 bytes public/hit1.gif | Bin 917 -> 0 bytes public/hit2.gif | Bin 852 -> 0 bytes public/img.php | 59 ------------------------------------ public/js/map.js | 29 ++++++++---------- 7 files changed, 18 insertions(+), 76 deletions(-) delete mode 100644 public/hit (копия).gif delete mode 100644 public/hit0.gif delete mode 100644 public/hit1.gif delete mode 100644 public/hit2.gif delete mode 100644 public/img.php 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 730a38d6cbec63304bc0a494910cb7f8ce249f33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 916 zcmV;F18e+8Nk%w1VORio0FeLy00028va>HAukT%4en!`8cl>yt(&y&|=t8(5 zc37yQCq$RGsP-3mG)W1kcxhy*sl(Yx^Z8;znz*$zQ@Z7Ym|2EM#40NTORI-=+xobP z+WV-A>*X7~D{5FP+lUjpEQHKFr;K?@-3SaBjXkRkTIt#y$`vpkAVAJRUY>5Ap-z>Z zeO)ULzfs^;HZJ)53G~-ao`HrEJyG+hh@>!b zrGoi%l|hNSq&N*2P@2H4CAnFJ84v8%7F4xP841v=HIdJlhSGK|>d1>mSFqINRwjVV?e!;T9*a%?>KSz5yH&=P*M7&1SXfBSxPV^PfI(8a`k^tU)Q zV~r#aLQ^}|B<6FPRkrNRxkO=XyJ^)m7YaHQ_=Q zM%Gwrf{{4LMB`ngi&@hxCEaxS4X0d?LYB893O@pOq+UrfGD|A;#MNRQ2NhJ+VYWp1 z29egtH&mvIfN*taZL>YpuD)3JR5QUFT{ibf~BmT2-pKXhw&+P!tlId|U|Y|Qu*6ynInVPPp qmA0ENlU+%RWxg_o8>e5Go;hEN)B^c1k`XI8YsD5{j4=cS0029WYQ5S3 diff --git a/public/hit0.gif b/public/hit0.gif deleted file mode 100644 index 66734e3fde140da36008975d2d7281b7a192fcad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 595 zcmV-Z0<8T>HAukT%4en!`8cl>yt(&y&|=t8(5 zc37yQCq$RGsP-3mG)W1kcxhy*sl(Yx^9c$gI%=3{8j6}qy2^U``0D8@8^{%a8z7L& zk*n*woAEnZq$}KeY(F&+GkeOnFfOO5+&-n>{^JHp-` z@(%BKQEz|WC_i69yC2{0k6xpIi~tgpVep_Eg(&nLbV%ZyvxE$vjgu&>S~C8P;37SX z*3p~DZXnm)0@+OD#bF&yKJun5CQFvf)D^Ob5nMTRyH-w&#n2r^g%AVcJBl>I!k|Kd zGG#IJVN`-e{Z-v}bzW9@TibQ5g>xoJWE`t0hM(QNaCjaSm>(>hlQ2CjSHQ>adt^K0%LQRC@ImqvfC z{JM1L+9!kZ-U>HAukT%4en!`8cl>yt(&y&|=t8(5 zc37yQCq$RGsP-3mG)W1kcxhy*sl(Yx^Z8;znz*$zQ@Z7Ym|2EM#40NTORI-=+xobP z+WV-A>*X7~D{5FP+lUjpEQHKFr;K?@-3SaBjXkRkTIt#y$`vpkAVAJRUY>5Ap-z>Z zeO)ULzfs^;HZJ)53G~-ao`HrEJyG+hh@>!b zrGoi%l|hNSq&N*2P@2H4CAnFJ84v8%7F4xP841v=HIdJlhSGK|>d1>mSFqINRwjVV?e!;T9*a%?>KSz5yH&=P*M7&1SXfBSxPV^PfI(8a`k^tU)Q zV~r#aLQ^}|B<6FPRkrNRxkO=XyJ^+zLaI{+qVVSrc_XxM-qg2q~8jV;)qGZC_Kkc5^gM%!nO zah4f)9>SHKE@n-)lyuYOH=J@l{#YK4DDVgzk$M@)$SkSU6PIi^ruSMztvxs)d|>RR zqY44d@s*ppj z*(0k(0tst!%&D5Am9)-!E1gg70V$0Hf<#{-bf~zYK++)TX$gnAP!tlfeAv<+GRL}V z$9&_FRhq52I?L03{$(U;g5qB4M5Lr}n(A$pj=SKvHgH8Ax*&e4?zi=di0Q90;fa}_ r_p;+X1}90$X`G7M)&JQXli>aw>e2{Q>+$WjB&;h6aWA_2>Hb= diff --git a/public/hit2.gif b/public/hit2.gif deleted file mode 100644 index 34d9c82b14ba75ee0766aa1122ea883bc265c252..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 852 zcmV-a1FQT;Nk%w1VORio0FeLy00028va>HAukT%4en!`8cl>yt(&y&|=t8(5 zc37yQCq$RGsP-3mG)W1kcxhy*sl(Yx^I4g=wKQXb>Lm(>LxtE{Lga&(iAAaxbqk40 z`?%N03p*<#3)=`;cWS!)m|E()3Tjv@9m*Ae9Uzd+k*)2$o$)<#?2M-Te6D(^E#B?k z?j9cR_$qrW+{zm~*9b1Jq1`ub;QqNXhHTg_X64ugd^c}{z;F}~4l8G`7_t6*GYbCm zHV_-dko0<`$pMUE!j;v^P;2=j8q5H@7~c_{O}0{qjD;;byszWObQjK6MqD`1tbU$ZbcDBH7-oo%OAkG z6Z=Zs%foJ$rA-??n)om=$!&5=vQT++pQ^ly|5o-}IWWS=TrDOvSP|q%#v(z7FschB zWwk!>v9^)+^<$j0Yd>%!ds^AtUt3_$i|4X6z;WH!;8vSCq?>W_?F1Nvt-TM zT&vx$V5xdHS@-zw-n+*;I^5XuVvlDTaZPQC`pI61l~Q zaqr=Un`3i5gqb`FqHqoi*~!NifC|zl;DYWI@f}Cina3S(A?9XVi6)9=9)ur`H==AU zcE{9a%8?ZuCBZ;*(T&c5a*A`(8CK(STPc(rZan7llXNS+$QqMsb@X3I0gB^RUj(jI zR9G}7wpToeeR+GZr8rzt8Tr6gJ!6?_OH)g(e?M%t2Cs)1TfkP+%fsx+cb zma3${xk{d1^AMOGW*A~J-93kn2Bx6Ah6%@>81-3NmB1DRDC|xhQh1r2x7s>dC51T$ eEw8ousqD0^!pbSP=LPBQqvDQBZn+T@0029xOPam_ 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});