From 77fe2fb63e91e077324b2c3d014bfd65e010dc13 Mon Sep 17 00:00:00 2001 From: lalka2016 <99399973+lalka2016@users.noreply.github.com> Date: Sun, 20 Aug 2023 15:38:21 +0300 Subject: [PATCH] aiaks --- ServiceAPI/Wall.php | 1 + Web/Presenters/templates/@layout.xml | 2 +- Web/Presenters/templates/Group/View.xml | 4 +- Web/Presenters/templates/components/wall.xml | 3 + Web/static/css/main.css | 8 ++ Web/static/js/al_wall.js | 87 ++++++++++++++++++-- 6 files changed, 97 insertions(+), 8 deletions(-) diff --git a/ServiceAPI/Wall.php b/ServiceAPI/Wall.php index e6133497..7f594e1d 100644 --- a/ServiceAPI/Wall.php +++ b/ServiceAPI/Wall.php @@ -146,6 +146,7 @@ class Wall implements Handler $post->setSuggested(0); $post->setCreated(time()); + $post->setApi_Source_Name(NULL); $post->setFlags($flags); if(mb_strlen($content) > 0) diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index d962253d..c8730dde 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -231,7 +231,7 @@
- {$club->getName()} + {ovk_proc_strtr($club->getName(), 14)} diff --git a/Web/Presenters/templates/Group/View.xml b/Web/Presenters/templates/Group/View.xml index 00e4f193..d5fb2dfb 100644 --- a/Web/Presenters/templates/Group/View.xml +++ b/Web/Presenters/templates/Group/View.xml @@ -92,11 +92,11 @@
- {tr("suggested_by_you", $suggestedPostsCountByUser)} + {tr("suggested_by_you", $suggestedPostsCountByUser)}
- {tr("suggested_by_everyone", $suggestedPostsCountByEveryone)} + {tr("suggested_by_everyone", $suggestedPostsCountByEveryone)}
{presenter "openvk!Wall->wallEmbedded", -$club->getId()} diff --git a/Web/Presenters/templates/components/wall.xml b/Web/Presenters/templates/components/wall.xml index 7d205781..99d9604b 100644 --- a/Web/Presenters/templates/components/wall.xml +++ b/Web/Presenters/templates/components/wall.xml @@ -7,6 +7,8 @@
+
+
{include "../components/textArea.xml", route => "/wall$owner/makePost", graffiti => true, polls => true, notes => true}
@@ -24,6 +26,7 @@ {/if}
+ {if isset($thisUser) && $thisUser->hasMicroblogEnabled()} diff --git a/Web/static/css/main.css b/Web/static/css/main.css index cdaf83d7..6ff56e8d 100644 --- a/Web/static/css/main.css +++ b/Web/static/css/main.css @@ -2727,3 +2727,11 @@ body.article .floating_sidebar, body.article .page_content { padding: 16px 40px 6px 4px !important; } } + +.sugglist a:hover { + text-decoration: underline; +} + +.sugglist a[data-toogled="true"] { + color:black; +} diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js index b1ca6117..639603d1 100644 --- a/Web/static/js/al_wall.js +++ b/Web/static/js/al_wall.js @@ -307,7 +307,12 @@ $(document).on("click", "#publish_post", async (e) => { } NewNotification(tr("suggestion_succefully_published"), tr("suggestion_press_to_go"), null, () => {window.location.assign("/wall" + post.id)}); - document.getElementById("cound").innerHTML = tr("suggested_posts_in_group", post.new_count) + + if(document.getElementById("cound") != null) { + document.getElementById("cound").innerHTML = tr("suggested_posts_in_group", post.new_count) + } else { + document.getElementById("cound_r").innerHTML = tr("suggested_by_everyone", post.new_count) + } if(document.querySelector("object a[href='"+location.pathname+"'] b") != null) { document.querySelector("object a[href='"+location.pathname+"'] b").innerHTML = post.new_count @@ -323,7 +328,7 @@ $(document).on("click", "#publish_post", async (e) => { e.currentTarget.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.outerHTML = "" } - if(document.querySelectorAll(".post").length < 1 && post.new_count > 0 && document.querySelector(".paginator") != null) { + if(document.querySelectorAll("#postz .post").length < 1 && post.new_count > 0 && document.querySelector(".paginator") != null) { loadMoreSuggestedPosts() } }), Function.noop]); @@ -374,7 +379,11 @@ $(document).on("click", "#decline_post", async (e) => { e.currentTarget.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.outerHTML = "" } - document.getElementById("cound").innerHTML = tr("suggested_posts_in_group", post) + if(document.getElementById("cound") != null) { + document.getElementById("cound").innerHTML = tr("suggested_posts_in_group", post) + } else { + document.getElementById("cound_r").innerHTML = tr("suggested_by_everyone", post) + } if(document.querySelector("object a[href='"+location.pathname+"'] b") != null) { document.querySelector("object a[href='"+location.pathname+"'] b").innerHTML = post @@ -384,7 +393,7 @@ $(document).on("click", "#decline_post", async (e) => { } } - if(document.querySelectorAll(".post").length < 1 && post > 0 && document.querySelector(".paginator") != null) { + if(document.querySelectorAll("#postz .post").length < 1 && post > 0 && document.querySelector(".paginator") != null) { loadMoreSuggestedPosts() } }) @@ -392,7 +401,13 @@ $(document).on("click", "#decline_post", async (e) => { function loadMoreSuggestedPosts() { let xhr = new XMLHttpRequest - xhr.open("GET", location.href) + let link = location.href + + if(!link.includes("/suggested")) { + link += "/suggested" + } + + xhr.open("GET", link) xhr.onloadstart = () => { document.getElementById("postz").innerHTML = `` @@ -425,3 +440,65 @@ function loadMoreSuggestedPosts() xhr.send() } + +// нажатие на "x предложенных записей" +$(document).on("click", ".sugglist a", (e) => { + e.preventDefault() + + if(e.currentTarget.getAttribute("data-toogled") == null || e.currentTarget.getAttribute("data-toogled") == "false") { + e.currentTarget.setAttribute("data-toogled", "true") + document.getElementById("underHeader").style.display = "none" + document.querySelector(".insertThere").style.display = "block" + history.pushState({}, "", e.currentTarget.href) + + // если ещё ничего не подгружалось + if(document.querySelector(".insertThere").innerHTML == "") { + let xhr = new XMLHttpRequest + xhr.open("GET", e.currentTarget.href) + + xhr.onloadstart = () => { + // лоадер + document.querySelector(".insertThere").insertAdjacentHTML("afterbegin", ``) + } + + xhr.onload = () => { + let parser = new DOMParser + let result = parser.parseFromString(xhr.responseText, 'text/html').querySelector(".infContainer") + // парсинг результата и вставка постов + document.querySelector(".insertThere").innerHTML = result.innerHTML + } + + xhr.send() + } + } else { + // переключение на нормальную стену + e.currentTarget.setAttribute("data-toogled", "false") + document.getElementById("underHeader").style.display = "block" + document.querySelector(".insertThere").style.display = "none" + history.pushState({}, "", e.currentTarget.href.replace("/suggested", "")) + } +}) + +// нажатие на пагинатор у постов пъедложки +$(document).on("click", "#postz .paginator a", (e) => { + e.preventDefault() + + let xhr = new XMLHttpRequest + xhr.open("GET", e.currentTarget.href) + + xhr.onloadstart = () => { + window.scrollTo({top: 0,behavior: "smooth"}) + // после того как долистали наверх, добавляем лоадер + setTimeout(() => {document.querySelector("#postz").innerHTML = ``}, 500) + } + + xhr.onload = () => { + // опять парс + let result = (new DOMParser).parseFromString(xhr.responseText, "text/html").querySelector(".infContainer") + // опять вставка + document.getElementById("postz").innerHTML = result.innerHTML + history.pushState({}, "", e.currentTarget.href) + } + + xhr.send() +}) \ No newline at end of file