- {_geotag}: {$post->getGeo()->name ?? tr("admin_open")}
+ 
{_poll}
- 
- Гео-метка
+ {_geo_place}
diff --git a/Web/routes.yml b/Web/routes.yml
index 4157acb7..7fd0cfe7 100644
--- a/Web/routes.yml
+++ b/Web/routes.yml
@@ -145,8 +145,6 @@ routes:
handler: "Wall->decline"
- url: "/{text}/{num}_{num}/likes"
handler: "Wall->likers"
- - url: "/wall{num}_{num}/nearest"
- handler: "Wall->nearest"
- url: "/blob_{text}/{?path}.{text}"
handler: "Blob->file"
placeholders:
diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index 8f465432..6d03daa5 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -851,6 +851,11 @@ h4 {
margin-bottom: 2px;
}
+.post-geo {
+ margin: 1px 0px;
+ padding: 0 4px;
+}
+
.post-signature span {
color: grey;
}
@@ -3911,3 +3916,9 @@ hr {
top: 3px;
font-size: 15px;
}
+
+.map_svg_icon {
+ display: inline-block;
+ margin-bottom: -2px;
+ fill: #7d7d7d;
+}
diff --git a/Web/static/img/geo.svg b/Web/static/img/geo.svg
deleted file mode 100755
index 6357697d..00000000
--- a/Web/static/img/geo.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 0706b11a..d7f36f9d 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -2588,153 +2588,183 @@ async function changeStatus() {
document.status_popup_form.submit.disabled = false;
}
-async function initGeo(tid) {
- MessageBox(tr("attach_geotag"), "", ["Прикрепить", tr("cancel")], [(function () {
- let marker = {
- lat: currentMarker._latlng.lat,
- lng: currentMarker._latlng.lng,
- name: $(`#geo-name-input-${tid}`).val() ? $(`#geo-name-input-${tid}`).val() : $(`#geo-name-${tid}`).text()
- };
- $(`#post-buttons${tid} #geo`).val(JSON.stringify(marker));
- $(`#post-buttons${tid} .post-has-geo`).text(`${tr("geotag")}: ${marker.name}`);
- $(`#post-buttons${tid} .post-has-geo`).show();
- }), Function.noop]);
+const tplMapIcon = ``
- const element = document.getElementById('osm-map');
- element.style = 'height: 600px;';
+u(document).on('click', "#__geoAttacher", async (e) => {
+ const form = u(e.target).closest('#write')
+ const buttons = form.find('.post-buttons')
- let markerLayers = L.layerGroup();
+ let current_coords = [54.51331, 36.2732]
+ let currentMarker = null
+ const getCoords = async () => {
+ const pos = await new Promise((resolve, reject) => {
+ navigator.geolocation.getCurrentPosition((position) => {
+ resolve([position.coords.latitude, position.coords.longitude])
+ }, () => {
+ resolve([54.51331, 36.2732])
+ },
+ {
+ enableHighAccuracy: true,
+ timeout: 5000,
+ maximumAge: 0,
+ })
+ })
- let map = L.map(element, {
- center: [55.322978, 38.673362],
+ return pos
+ }
+
+ current_coords = await getCoords()
+
+ const geo_msg = new CMessageBox({
+ title: tr('attach_geotag'),
+ body: ``,
+ buttons: [tr('attach'), tr('cancel')],
+ callbacks: [() => {
+ if(!currentMarker) {
+ return
+ }
+
+ const geo_name = $(`#geo-name`).html()
+ if(geo_name == '') {
+ return
+ }
+
+ const marker = {
+ lat: currentMarker._latlng.lat,
+ lng: currentMarker._latlng.lng,
+ name: escapeHtml(geo_name)
+ }
+ buttons.find(`input[name='geo']`).nodes[0].value = JSON.stringify(marker)
+ buttons.find(`.post-has-geo`).html(`
+ ${tplMapIcon}
+ 
` : ""}
- ${post.owner.writes}
- ${post.preview}
+
+
+ ${escapeHtml(post.message)}
-
${tr("geotag")}: ${post.geo.name ?? tr("admin_open")}
+
+ ${tplMapIcon}
+ ${escapeHtml(post.geo.name)}
+