From 4975eca28ed4c8c6a45a4db615822a7e672b6b27 Mon Sep 17 00:00:00 2001 From: themohooks <81331307+themohooks@users.noreply.github.com> Date: Sat, 6 Jul 2024 08:26:29 +0300 Subject: [PATCH] some fixes --- static/css/photo.css | 2 +- static/js/core_lk.js | 9 -- static/js/photo.js | 2 +- views/pages/Photo.php | 125 ++++++++++++++++------------ views/pages/Profile/UploadPhoto.php | 7 +- 5 files changed, 76 insertions(+), 69 deletions(-) diff --git a/static/css/photo.css b/static/css/photo.css index bfe3605..ab3451e 100644 --- a/static/css/photo.css +++ b/static/css/photo.css @@ -1,7 +1,7 @@ #photobar { margin:0 -20px; position:relative; background-color:#333; } #underphoto_frame { display:inline-block; } -#ph { max-width:100%; cursor:zoom-in; } +#ph { max-width:70%; cursor:zoom-in; } #ph.v-zoom { max-height:calc(100vh - 30px); } #ph.zoomed { max-width:none; max-height:none; cursor:zoom-out; } #ph.nozoom { cursor:default; } diff --git a/static/js/core_lk.js b/static/js/core_lk.js index 7fabb83..3417d72 100644 --- a/static/js/core_lk.js +++ b/static/js/core_lk.js @@ -321,16 +321,7 @@ function setDate(d, m, y) -document.onclick = function(e) -{ - e = e || window.event; - E = e.target || e.srcElement; - if (E.id != 'phint' && E.parentNode.id != 'phint' && E != _getID('mform').place) $('#phint').slideUp(); - if (E.className != 'searchVehiclesBtn' && E.id != 'vlist_table' && E.className != 'num' && $('#vlist').css('display') == 'block') $('#vlist').hide().html(''); - - if ($(E).closest('#views-selector').length == 0) $('#views-selector').hide(); -}; diff --git a/static/js/photo.js b/static/js/photo.js index e524280..6820b17 100644 --- a/static/js/photo.js +++ b/static/js/photo.js @@ -54,7 +54,7 @@ $(document).ready(function() { var vote = $(this).attr('vote'); if (vote != 0 && vote != 1) return false; - if (vote && subscr_pro) $('.toggle').attr('class', 'toggle on'); + if (vote) $('.toggle').attr('class', 'toggle on'); var pid = $(this).closest('.vote').attr('pid'); diff --git a/views/pages/Photo.php b/views/pages/Photo.php index 0f21c6e..cec12d0 100644 --- a/views/pages/Photo.php +++ b/views/pages/Photo.php @@ -21,62 +21,38 @@ $photouser = new \App\Models\User($photo->i('user_id'));
+ + + +
- -
- -
- -
+ +
@@ -84,7 +60,7 @@ $photouser = new \App\Models\User($photo->i('user_id'));
- +
@@ -156,7 +132,8 @@ $photouser = new \App\Models\User($photo->i('user_id'));
Рейтинг:
- Интересная фотография!Мне не нравится + Интересная фотография! + Мне не нравится
@@ -230,6 +207,46 @@ $photouser = new \App\Models\User($photo->i('user_id'));
+ content('lat') != null && $photo->content('lng') != null) { ?> +
+ +

Место на карте

+
+ + +
+
+ + + +
+
+
+ +

Комментарии · 1

diff --git a/views/pages/Profile/UploadPhoto.php b/views/pages/Profile/UploadPhoto.php index e6aa4ee..2b56829 100644 --- a/views/pages/Profile/UploadPhoto.php +++ b/views/pages/Profile/UploadPhoto.php @@ -285,9 +285,10 @@ $user = new User(Auth::userid());
- - + + + @@ -622,8 +623,6 @@ $user = new User(Auth::userid());
- -